mirror of
https://github.com/Palakis/obs-websocket.git
synced 2024-08-30 18:12:16 +00:00
requesthandler: Fix compiler warnings with latest OBS master
OBS has deprecated the `_addref` functions, so the new norm is to use `_get_ref`.
This commit is contained in:
parent
bc0b499944
commit
13c7b83c34
@ -232,8 +232,9 @@ RequestResult RequestHandler::DuplicateSceneItem(const Request& request)
|
||||
if (!destinationScene)
|
||||
return RequestResult::Error(statusCode, comment);
|
||||
} else {
|
||||
destinationScene = obs_sceneitem_get_scene(sceneItem);
|
||||
obs_scene_addref(destinationScene);
|
||||
destinationScene = obs_scene_get_ref(obs_sceneitem_get_scene(sceneItem));
|
||||
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) {
|
||||
|
@ -264,18 +264,14 @@ obs_scene_t *Request::ValidateScene2(const std::string &keyName, RequestStatus::
|
||||
comment = "The specified source is not a scene. (Is group)";
|
||||
return nullptr;
|
||||
}
|
||||
OBSScene ret = obs_group_from_source(sceneSource);
|
||||
obs_scene_addref(ret);
|
||||
return ret;
|
||||
return obs_scene_get_ref(obs_group_from_source(sceneSource));
|
||||
} else {
|
||||
if (filter == OBS_WEBSOCKET_SCENE_FILTER_GROUP_ONLY) {
|
||||
statusCode = RequestStatus::InvalidResourceType;
|
||||
comment = "The specified source is not a group. (Is scene)";
|
||||
return nullptr;
|
||||
}
|
||||
OBSScene ret = obs_scene_from_source(sceneSource);
|
||||
obs_scene_addref(ret);
|
||||
return ret;
|
||||
return obs_scene_get_ref(obs_scene_from_source(sceneSource));
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user