From 03c4fdc607f0036b392179a7e52b065a9400bb11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lepin?= Date: Fri, 15 Nov 2019 20:21:40 +0100 Subject: [PATCH] WSRequestHandler(Profiles): fixes --- src/WSRequestHandler_Profiles.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/WSRequestHandler_Profiles.cpp b/src/WSRequestHandler_Profiles.cpp index 4bcc7d4d..d008931e 100644 --- a/src/WSRequestHandler_Profiles.cpp +++ b/src/WSRequestHandler_Profiles.cpp @@ -12,19 +12,19 @@ * @category profiles * @since 4.0.0 */ -HandlerResponse WSRequestHandler::HandleSetCurrentProfile(WSRequestHandler* req) { - if (!req->hasField("profile-name")) { - return req->SendErrorResponse("missing request parameters"); +RpcResponse WSRequestHandler::SetCurrentProfile(const RpcRequest& request) { + if (!request.hasField("profile-name")) { + 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()) { - return req->SendErrorResponse("invalid request parameters"); + return request.failed("invalid request parameters"); } // TODO : check if profile exists obs_frontend_set_current_profile(profileName.toUtf8()); - return req->SendOKResponse(); + return request.success(); } /** @@ -37,10 +37,10 @@ HandlerResponse WSRequestHandler::HandleSetCurrentProfile(WSRequestHandler* req) * @category profiles * @since 4.0.0 */ -HandlerResponse WSRequestHandler::HandleGetCurrentProfile(WSRequestHandler* req) { +RpcResponse WSRequestHandler::GetCurrentProfile(const RpcRequest& request) { OBSDataAutoRelease response = obs_data_create(); 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 * @since 4.0.0 */ -HandlerResponse WSRequestHandler::HandleListProfiles(WSRequestHandler* req) { +RpcResponse WSRequestHandler::ListProfiles(const RpcRequest& request) { char** profiles = obs_frontend_get_profiles(); OBSDataArrayAutoRelease list = Utils::StringListToArray(profiles, "profile-name"); bfree(profiles); @@ -61,5 +61,5 @@ HandlerResponse WSRequestHandler::HandleListProfiles(WSRequestHandler* req) { OBSDataAutoRelease response = obs_data_create(); obs_data_set_array(response, "profiles", list); - return req->SendOKResponse(response); + return request.success(response); }