Mirrored_Repos/obs-websocket
1
0
Fork 0
mirror of https://github.com/Palakis/obs-websocket.git synced 2024-08-30 18:12:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.x-current' into handler-protocol-refactor

Browse Source
This commit is contained in:
Stéphane Lepin 2020-01-29 12:30:24 +01:00
commit f5277e4931
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/WSEvents.cpp
View File

@ -828,7 +828,9 @@ void WSEvents::Heartbeat() {
pulse = !pulse; pulse = !pulse;
obs_data_set_bool(data, "pulse", pulse); obs_data_set_bool(data, "pulse", pulse);
obs_data_set_string(data, "current-profile", obs_frontend_get_current_profile()); char* currentProfile = obs_frontend_get_current_profile();
obs_data_set_string(data, "current-profile", currentProfile);
bfree(currentProfile);
OBSSourceAutoRelease currentScene = obs_frontend_get_current_scene(); OBSSourceAutoRelease currentScene = obs_frontend_get_current_scene();
obs_data_set_string(data, "current-scene", obs_source_get_name(currentScene)); obs_data_set_string(data, "current-scene", obs_source_get_name(currentScene));

4
src/WSRequestHandler_Profiles.cpp
View File

@ -39,7 +39,9 @@ RpcResponse WSRequestHandler::SetCurrentProfile(const RpcRequest& request) {
*/ */
RpcResponse WSRequestHandler::GetCurrentProfile(const RpcRequest& request) { RpcResponse WSRequestHandler::GetCurrentProfile(const RpcRequest& request) {
OBSDataAutoRelease response = obs_data_create(); OBSDataAutoRelease response = obs_data_create();
obs_data_set_string(response, "profile-name", obs_frontend_get_current_profile()); char* currentProfile = obs_frontend_get_current_profile();
obs_data_set_string(response, "profile-name", currentProfile);
bfree(currentProfile);
return request.success(response); return request.success(response);
} }

6
src/WSRequestHandler_SceneCollections.cpp
View File

@ -39,8 +39,10 @@ RpcResponse WSRequestHandler::SetCurrentSceneCollection(const RpcRequest& reques
*/ */
RpcResponse WSRequestHandler::GetCurrentSceneCollection(const RpcRequest& request) { RpcResponse WSRequestHandler::GetCurrentSceneCollection(const RpcRequest& request) {
OBSDataAutoRelease response = obs_data_create(); OBSDataAutoRelease response = obs_data_create();
obs_data_set_string(response, "sc-name",
obs_frontend_get_current_scene_collection()); char* sceneCollection = obs_frontend_get_current_scene_collection();
obs_data_set_string(response, "sc-name", sceneCollection);
bfree(sceneCollection);
return request.success(response); return request.success(response);
} }