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

requesthandler: Fix compiler warnings with latest OBS master

Browse Source 
OBS has deprecated the `_addref` functions, so the new norm is to use
`_get_ref`.
This commit is contained in:
tt2468 2022-01-26 17:40:45 -08:00
parent bc0b499944
commit 13c7b83c34
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/requesthandler/RequestHandler_SceneItems.cpp
View File

@ -232,8 +232,9 @@ RequestResult RequestHandler::DuplicateSceneItem(const Request& request)
if (!destinationScene) if (!destinationScene)
return RequestResult::Error(statusCode, comment); return RequestResult::Error(statusCode, comment);
} else { } else {
destinationScene = obs_sceneitem_get_scene(sceneItem); destinationScene = obs_scene_get_ref(obs_sceneitem_get_scene(sceneItem));
obs_scene_addref(destinationScene); if (!destinationScene)
return RequestResult::Error(RequestStatus::RequestProcessingFailed, "Internal error: Failed to get ref for scene of scene item.");
} }
if (obs_sceneitem_is_group(sceneItem) && obs_sceneitem_get_scene(sceneItem) == destinationScene) { if (obs_sceneitem_is_group(sceneItem) && obs_sceneitem_get_scene(sceneItem) == destinationScene) {

8
src/requesthandler/rpc/Request.cpp
View File

@ -264,18 +264,14 @@ obs_scene_t *Request::ValidateScene2(const std::string &keyName, RequestStatus::
comment = "The specified source is not a scene. (Is group)"; comment = "The specified source is not a scene. (Is group)";
return nullptr; return nullptr;
} }
OBSScene ret = obs_group_from_source(sceneSource); return obs_scene_get_ref(obs_group_from_source(sceneSource));
obs_scene_addref(ret);
return ret;
} else { } else {
if (filter == OBS_WEBSOCKET_SCENE_FILTER_GROUP_ONLY) { if (filter == OBS_WEBSOCKET_SCENE_FILTER_GROUP_ONLY) {
statusCode = RequestStatus::InvalidResourceType; statusCode = RequestStatus::InvalidResourceType;
comment = "The specified source is not a group. (Is scene)"; comment = "The specified source is not a group. (Is scene)";
return nullptr; return nullptr;
} }
OBSScene ret = obs_scene_from_source(sceneSource); return obs_scene_get_ref(obs_scene_from_source(sceneSource));
obs_scene_addref(ret);
return ret;
} }
} }