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

Browse Source
This commit is contained in:
Stéphane Lepin 2019-11-15 20:21:40 +01:00
parent 0485cf51ff
commit 03c4fdc607
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_Profiles.cpp
View File

@ -12,19 +12,19 @@
* @category profiles * @category profiles
* @since 4.0.0 * @since 4.0.0
*/ */
HandlerResponse WSRequestHandler::HandleSetCurrentProfile(WSRequestHandler* req) { RpcResponse WSRequestHandler::SetCurrentProfile(const RpcRequest& request) {
if (!req->hasField("profile-name")) { if (!request.hasField("profile-name")) {
return req->SendErrorResponse("missing request parameters"); return request.failed("missing request parameters");
} }
QString profileName = obs_data_get_string(req->data, "profile-name"); QString profileName = obs_data_get_string(request.parameters(), "profile-name");
if (profileName.isEmpty()) { if (profileName.isEmpty()) {
return req->SendErrorResponse("invalid request parameters"); return request.failed("invalid request parameters");
} }
// TODO : check if profile exists // TODO : check if profile exists
obs_frontend_set_current_profile(profileName.toUtf8()); obs_frontend_set_current_profile(profileName.toUtf8());
return req->SendOKResponse(); return request.success();
} }
/** /**
@ -37,10 +37,10 @@ HandlerResponse WSRequestHandler::HandleSetCurrentProfile(WSRequestHandler* req)
* @category profiles * @category profiles
* @since 4.0.0 * @since 4.0.0
*/ */
HandlerResponse WSRequestHandler::HandleGetCurrentProfile(WSRequestHandler* req) { RpcResponse WSRequestHandler::GetCurrentProfile(const RpcRequest& request) {
OBSDataAutoRelease response = obs_data_create(); OBSDataAutoRelease response = obs_data_create();
obs_data_set_string(response, "profile-name", obs_frontend_get_current_profile()); obs_data_set_string(response, "profile-name", obs_frontend_get_current_profile());
return req->SendOKResponse(response); return request.success(response);
} }
/** /**
@ -53,7 +53,7 @@ HandlerResponse WSRequestHandler::HandleGetCurrentProfile(WSRequestHandler* req)
* @category profiles * @category profiles
* @since 4.0.0 * @since 4.0.0
*/ */
HandlerResponse WSRequestHandler::HandleListProfiles(WSRequestHandler* req) { RpcResponse WSRequestHandler::ListProfiles(const RpcRequest& request) {
char** profiles = obs_frontend_get_profiles(); char** profiles = obs_frontend_get_profiles();
OBSDataArrayAutoRelease list = Utils::StringListToArray(profiles, "profile-name"); OBSDataArrayAutoRelease list = Utils::StringListToArray(profiles, "profile-name");
bfree(profiles); bfree(profiles);
@ -61,5 +61,5 @@ HandlerResponse WSRequestHandler::HandleListProfiles(WSRequestHandler* req) {
OBSDataAutoRelease response = obs_data_create(); OBSDataAutoRelease response = obs_data_create();
obs_data_set_array(response, "profiles", list); obs_data_set_array(response, "profiles", list);
return req->SendOKResponse(response); return request.success(response);
} }