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

WSRequesthandler(Scenes): fixes

Browse Source
This commit is contained in:
Stéphane Lepin 2019-11-15 20:29:22 +01:00
parent 9323e1cf59
commit c9d6d10995
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/WSRequestHandler_Scenes.cpp
View File

@ -18,19 +18,19 @@
* @category scenes * @category scenes
* @since 0.3 * @since 0.3
*/ */
HandlerResponse WSRequestHandler::HandleSetCurrentScene(WSRequestHandler* req) { RpcResponse WSRequestHandler::SetCurrentScene(const RpcRequest& request) {
if (!req->hasField("scene-name")) { if (!request.hasField("scene-name")) {
return req->SendErrorResponse("missing request parameters"); return request.failed("missing request parameters");
} }
const char* sceneName = obs_data_get_string(req->data, "scene-name"); const char* sceneName = obs_data_get_string(request.parameters(), "scene-name");
OBSSourceAutoRelease source = obs_get_source_by_name(sceneName); OBSSourceAutoRelease source = obs_get_source_by_name(sceneName);
if (source) { if (source) {
obs_frontend_set_current_scene(source); obs_frontend_set_current_scene(source);
return req->SendOKResponse(); return request.success();
} else { } else {
return req->SendErrorResponse("requested scene does not exist"); return request.failed("requested scene does not exist");
} }
} }
@ -45,7 +45,7 @@ HandlerResponse WSRequestHandler::HandleSetCurrentScene(WSRequestHandler* req) {
* @category scenes * @category scenes
* @since 0.3 * @since 0.3
*/ */
HandlerResponse WSRequestHandler::HandleGetCurrentScene(WSRequestHandler* req) { RpcResponse WSRequestHandler::GetCurrentScene(const RpcRequest& request) {
OBSSourceAutoRelease currentScene = obs_frontend_get_current_scene(); OBSSourceAutoRelease currentScene = obs_frontend_get_current_scene();
OBSDataArrayAutoRelease sceneItems = Utils::GetSceneItems(currentScene); OBSDataArrayAutoRelease sceneItems = Utils::GetSceneItems(currentScene);
@ -53,7 +53,7 @@ HandlerResponse WSRequestHandler::HandleGetCurrentScene(WSRequestHandler* req) {
obs_data_set_string(data, "name", obs_source_get_name(currentScene)); obs_data_set_string(data, "name", obs_source_get_name(currentScene));
obs_data_set_array(data, "sources", sceneItems); obs_data_set_array(data, "sources", sceneItems);
return req->SendOKResponse(data); return request.success(data);
} }
/** /**
@ -67,7 +67,7 @@ HandlerResponse WSRequestHandler::HandleGetCurrentScene(WSRequestHandler* req) {
* @category scenes * @category scenes
* @since 0.3 * @since 0.3
*/ */
HandlerResponse WSRequestHandler::HandleGetSceneList(WSRequestHandler* req) { RpcResponse WSRequestHandler::GetSceneList(const RpcRequest& request) {
OBSSourceAutoRelease currentScene = obs_frontend_get_current_scene(); OBSSourceAutoRelease currentScene = obs_frontend_get_current_scene();
OBSDataArrayAutoRelease scenes = Utils::GetScenes(); OBSDataArrayAutoRelease scenes = Utils::GetScenes();
@ -76,7 +76,7 @@ HandlerResponse WSRequestHandler::HandleGetSceneList(WSRequestHandler* req) {
obs_source_get_name(currentScene)); obs_source_get_name(currentScene));
obs_data_set_array(data, "scenes", scenes); obs_data_set_array(data, "scenes", scenes);
return req->SendOKResponse(data); return request.success(data);
} }
/** /**
@ -92,16 +92,16 @@ HandlerResponse WSRequestHandler::HandleGetSceneList(WSRequestHandler* req) {
* @category scenes * @category scenes
* @since 4.5.0 * @since 4.5.0
*/ */
HandlerResponse WSRequestHandler::HandleReorderSceneItems(WSRequestHandler* req) { RpcResponse WSRequestHandler::ReorderSceneItems(const RpcRequest& request) {
QString sceneName = obs_data_get_string(req->data, "scene"); QString sceneName = obs_data_get_string(request.parameters(), "scene");
OBSScene scene = Utils::GetSceneFromNameOrCurrent(sceneName); OBSScene scene = Utils::GetSceneFromNameOrCurrent(sceneName);
if (!scene) { if (!scene) {
return req->SendErrorResponse("requested scene doesn't exist"); return request.failed("requested scene doesn't exist");
} }
OBSDataArrayAutoRelease items = obs_data_get_array(req->data, "items"); OBSDataArrayAutoRelease items = obs_data_get_array(request.parameters(), "items");
if (!items) { if (!items) {
return req->SendErrorResponse("sceneItem order not specified"); return request.failed("sceneItem order not specified");
} }
struct reorder_context { struct reorder_context {
@ -143,8 +143,8 @@ HandlerResponse WSRequestHandler::HandleReorderSceneItems(WSRequestHandler* req)
}, &ctx); }, &ctx);
if (!ctx.success) { if (!ctx.success) {
return req->SendErrorResponse(ctx.errorMessage); return request.failed(ctx.errorMessage);
} }
return req->SendOKResponse(); return request.success();
} }