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(SceneCollections): fixes

Browse Source
This commit is contained in:
Stéphane Lepin 2019-11-15 20:26:00 +01:00
parent 50d3a2600e
commit fd09a0ce54
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/WSRequestHandler_SceneCollections.cpp
View File

@ -12,19 +12,19 @@
* @category scene collections * @category scene collections
* @since 4.0.0 * @since 4.0.0
*/ */
HandlerResponse WSRequestHandler::HandleSetCurrentSceneCollection(WSRequestHandler* req) { RpcResponse WSRequestHandler::SetCurrentSceneCollection(const RpcRequest& request) {
if (!req->hasField("sc-name")) { if (!request.hasField("sc-name")) {
return req->SendErrorResponse("missing request parameters"); return request.failed("missing request parameters");
} }
QString sceneCollection = obs_data_get_string(req->data, "sc-name"); QString sceneCollection = obs_data_get_string(request.parameters(), "sc-name");
if (sceneCollection.isEmpty()) { if (sceneCollection.isEmpty()) {
return req->SendErrorResponse("invalid request parameters"); return request.failed("invalid request parameters");
} }
// TODO : Check if specified profile exists and if changing is allowed // TODO : Check if specified profile exists and if changing is allowed
obs_frontend_set_current_scene_collection(sceneCollection.toUtf8()); obs_frontend_set_current_scene_collection(sceneCollection.toUtf8());
return req->SendOKResponse(); return request.success();
} }
/** /**
@ -37,12 +37,12 @@ HandlerResponse WSRequestHandler::HandleSetCurrentSceneCollection(WSRequestHandl
* @category scene collections * @category scene collections
* @since 4.0.0 * @since 4.0.0
*/ */
HandlerResponse WSRequestHandler::HandleGetCurrentSceneCollection(WSRequestHandler* req) { RpcResponse WSRequestHandler::GetCurrentSceneCollection(const RpcRequest& request) {
OBSDataAutoRelease response = obs_data_create(); OBSDataAutoRelease response = obs_data_create();
obs_data_set_string(response, "sc-name", obs_data_set_string(response, "sc-name",
obs_frontend_get_current_scene_collection()); obs_frontend_get_current_scene_collection());
return req->SendOKResponse(response); return request.success(response);
} }
/** /**
@ -55,7 +55,7 @@ HandlerResponse WSRequestHandler::HandleGetCurrentSceneCollection(WSRequestHandl
* @category scene collections * @category scene collections
* @since 4.0.0 * @since 4.0.0
*/ */
HandlerResponse WSRequestHandler::HandleListSceneCollections(WSRequestHandler* req) { RpcResponse WSRequestHandler::ListSceneCollections(const RpcRequest& request) {
char** sceneCollections = obs_frontend_get_scene_collections(); char** sceneCollections = obs_frontend_get_scene_collections();
OBSDataArrayAutoRelease list = OBSDataArrayAutoRelease list =
Utils::StringListToArray(sceneCollections, "sc-name"); Utils::StringListToArray(sceneCollections, "sc-name");
@ -64,5 +64,5 @@ HandlerResponse WSRequestHandler::HandleListSceneCollections(WSRequestHandler* r
OBSDataAutoRelease response = obs_data_create(); OBSDataAutoRelease response = obs_data_create();
obs_data_set_array(response, "scene-collections", list); obs_data_set_array(response, "scene-collections", list);
return req->SendOKResponse(response); return request.success(response);
} }