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

requests(GetSceneItemList): fallback to current scene if sceneName is not specified

Browse Source
This commit is contained in:
Stéphane Lepin 2020-09-29 19:37:28 +02:00
parent f61f45fa23
commit 46f624e3b9
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/WSRequestHandler_SceneItems.cpp
View File

@ -31,12 +31,15 @@ void AddSourceHelper(void *_data, obs_scene_t *scene) {
* @since unreleased * @since unreleased
*/ */
RpcResponse WSRequestHandler::GetSceneItemList(const RpcRequest& request) { RpcResponse WSRequestHandler::GetSceneItemList(const RpcRequest& request) {
if (!request.hasField("sceneName")) { const char* sceneName = obs_data_get_string(request.parameters(), "sceneName");
return request.failed("missing request parameters");
OBSSourceAutoRelease sceneSource;
if (sceneName) {
sceneSource = obs_get_source_by_name(sceneName);
} else {
sceneSource = obs_frontend_get_current_scene();
} }
const char* sceneName = obs_data_get_string(request.parameters(), "sceneName");
OBSSourceAutoRelease sceneSource = obs_get_source_by_name(sceneName);
OBSScene scene = obs_scene_from_source(sceneSource); OBSScene scene = obs_scene_from_source(sceneSource);
if (!scene) { if (!scene) {
return request.failed("requested scene is invalid or doesnt exist"); return request.failed("requested scene is invalid or doesnt exist");