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

Browse Source
This commit is contained in:
Stéphane Lepin 2019-11-15 20:26:44 +01:00
parent fd09a0ce54
commit f6693d5587
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_Transitions.cpp
View File

@ -14,7 +14,7 @@
* @category transitions * @category transitions
* @since 4.1.0 * @since 4.1.0
*/ */
HandlerResponse WSRequestHandler::HandleGetTransitionList(WSRequestHandler* req) { RpcResponse WSRequestHandler::GetTransitionList(const RpcRequest& request) {
OBSSourceAutoRelease currentTransition = obs_frontend_get_current_transition(); OBSSourceAutoRelease currentTransition = obs_frontend_get_current_transition();
obs_frontend_source_list transitionList = {}; obs_frontend_source_list transitionList = {};
obs_frontend_get_transitions(&transitionList); obs_frontend_get_transitions(&transitionList);
@ -34,7 +34,7 @@ HandlerResponse WSRequestHandler::HandleGetTransitionList(WSRequestHandler* req)
obs_source_get_name(currentTransition)); obs_source_get_name(currentTransition));
obs_data_set_array(response, "transitions", transitions); obs_data_set_array(response, "transitions", transitions);
return req->SendOKResponse(response); return request.success(response);
} }
/** /**
@ -48,7 +48,7 @@ HandlerResponse WSRequestHandler::HandleGetTransitionList(WSRequestHandler* req)
* @category transitions * @category transitions
* @since 0.3 * @since 0.3
*/ */
HandlerResponse WSRequestHandler::HandleGetCurrentTransition(WSRequestHandler* req) { RpcResponse WSRequestHandler::GetCurrentTransition(const RpcRequest& request) {
OBSSourceAutoRelease currentTransition = obs_frontend_get_current_transition(); OBSSourceAutoRelease currentTransition = obs_frontend_get_current_transition();
OBSDataAutoRelease response = obs_data_create(); OBSDataAutoRelease response = obs_data_create();
@ -58,7 +58,7 @@ HandlerResponse WSRequestHandler::HandleGetCurrentTransition(WSRequestHandler* r
if (!obs_transition_fixed(currentTransition)) if (!obs_transition_fixed(currentTransition))
obs_data_set_int(response, "duration", obs_frontend_get_transition_duration()); obs_data_set_int(response, "duration", obs_frontend_get_transition_duration());
return req->SendOKResponse(response); return request.success(response);
} }
/** /**
@ -71,18 +71,18 @@ HandlerResponse WSRequestHandler::HandleGetCurrentTransition(WSRequestHandler* r
* @category transitions * @category transitions
* @since 0.3 * @since 0.3
*/ */
HandlerResponse WSRequestHandler::HandleSetCurrentTransition(WSRequestHandler* req) { RpcResponse WSRequestHandler::SetCurrentTransition(const RpcRequest& request) {
if (!req->hasField("transition-name")) { if (!request.hasField("transition-name")) {
return req->SendErrorResponse("missing request parameters"); return request.failed("missing request parameters");
} }
QString name = obs_data_get_string(req->data, "transition-name"); QString name = obs_data_get_string(request.parameters(), "transition-name");
bool success = Utils::SetTransitionByName(name); bool success = Utils::SetTransitionByName(name);
if (!success) { if (!success) {
return req->SendErrorResponse("requested transition does not exist"); return request.failed("requested transition does not exist");
} }
return req->SendOKResponse(); return request.success();
} }
/** /**
@ -95,14 +95,14 @@ HandlerResponse WSRequestHandler::HandleSetCurrentTransition(WSRequestHandler* r
* @category transitions * @category transitions
* @since 4.0.0 * @since 4.0.0
*/ */
HandlerResponse WSRequestHandler::HandleSetTransitionDuration(WSRequestHandler* req) { RpcResponse WSRequestHandler::SetTransitionDuration(const RpcRequest& request) {
if (!req->hasField("duration")) { if (!request.hasField("duration")) {
return req->SendErrorResponse("missing request parameters"); return request.failed("missing request parameters");
} }
int ms = obs_data_get_int(req->data, "duration"); int ms = obs_data_get_int(request.parameters(), "duration");
obs_frontend_set_transition_duration(ms); obs_frontend_set_transition_duration(ms);
return req->SendOKResponse(); return request.success();
} }
/** /**
@ -115,8 +115,8 @@ HandlerResponse WSRequestHandler::HandleSetTransitionDuration(WSRequestHandler*
* @category transitions * @category transitions
* @since 4.1.0 * @since 4.1.0
*/ */
HandlerResponse WSRequestHandler::HandleGetTransitionDuration(WSRequestHandler* req) { RpcResponse WSRequestHandler::GetTransitionDuration(const RpcRequest& request) {
OBSDataAutoRelease response = obs_data_create(); OBSDataAutoRelease response = obs_data_create();
obs_data_set_int(response, "transition-duration", obs_frontend_get_transition_duration()); obs_data_set_int(response, "transition-duration", obs_frontend_get_transition_duration());
return req->SendOKResponse(response); return request.success(response);
} }