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

RpcRequest: rename okResponse to success

Browse Source
This commit is contained in:
Stéphane Lepin 2019-11-15 20:09:43 +01:00
parent f09cbfddbc
commit f660036a25
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/WSRequestHandler_General.cpp
View File

@ -85,7 +85,7 @@ RpcResponse WSRequestHandler::GetVersion(const RpcRequest& request) {
obs_data_set_string(data, "obs-studio-version", obsVersion.toUtf8());
obs_data_set_string(data, "available-requests", requests.toUtf8());
return request.okResponse(data);
return request.success(data);
}
/**
@ -115,7 +115,7 @@ RpcResponse WSRequestHandler::GetAuthRequired(const RpcRequest& request) {
config->Salt.toUtf8());
}
return request.okResponse(data);
return request.success(data);
}
/**
@ -147,7 +147,7 @@ RpcResponse WSRequestHandler::Authenticate(const RpcRequest& request) {
}
_connProperties.setAuthenticated(true);
return request.okResponse();
return request.success();
}
/**
@ -171,7 +171,7 @@ RpcResponse WSRequestHandler::SetHeartbeat(const RpcRequest& request) {
OBSDataAutoRelease response = obs_data_create();
obs_data_set_bool(response, "enable", events->HeartbeatIsActive);
return request.okResponse(response);
return request.success(response);
}
/**
@ -196,7 +196,7 @@ RpcResponse WSRequestHandler::SetFilenameFormatting(const RpcRequest& request) {
Utils::SetFilenameFormatting(filenameFormatting.toUtf8());
return request.okResponse();
return request.success();
}
/**
@ -213,7 +213,7 @@ RpcResponse WSRequestHandler::GetFilenameFormatting(const RpcRequest& request) {
OBSDataAutoRelease response = obs_data_create();
obs_data_set_string(response, "filename-formatting", Utils::GetFilenameFormatting());
return request.okResponse(response);
return request.success(response);
}
/**
@ -232,7 +232,7 @@ RpcResponse WSRequestHandler::GetStats(const RpcRequest& request) {
OBSDataAutoRelease response = obs_data_create();
obs_data_set_obj(response, "stats", stats);
return request.okResponse(response);
return request.success(response);
}
/**
@ -265,7 +265,7 @@ RpcResponse WSRequestHandler::BroadcastCustomMessage(const RpcRequest& request)
auto events = GetEventsSystem();
events->OnBroadcastCustomMessage(realm, data);
return request.okResponse();
return request.success();
}
@ -302,5 +302,5 @@ RpcResponse WSRequestHandler::GetVideoInfo(const RpcRequest& request) {
obs_data_set_string(response, "colorRange", describe_color_range(ovi.range));
obs_data_set_string(response, "scaleType", describe_scale_type(ovi.scale_type));
return request.okResponse(response);
return request.success(response);
}

4
src/rpc/RpcRequest.cpp
View File

@ -42,12 +42,12 @@ const OBSData RpcRequest::parameters() const
return OBSData(_parameters);
}
const RpcResponse RpcRequest::okResponse(obs_data_t* additionalFields) const
const RpcResponse RpcRequest::success(obs_data_t* additionalFields) const
{
return RpcResponse::ok(*this, additionalFields);
}
const RpcResponse RpcRequest::errorResponse(const QString& errorMessage, obs_data_t* additionalFields) const
const RpcResponse RpcRequest::failed(const QString& errorMessage, obs_data_t* additionalFields) const
{
return RpcResponse::fail(*this, errorMessage, additionalFields);
}

4
src/rpc/RpcRequest.h
View File

@ -35,8 +35,8 @@ public:
const QString& methodName() const;
const OBSData parameters() const;
const RpcResponse okResponse(obs_data_t* additionalFields = nullptr) const;
const RpcResponse errorResponse(const QString& errorMessage, obs_data_t* additionalFields = nullptr) const;
const RpcResponse success(obs_data_t* additionalFields = nullptr) const;
const RpcResponse failed(const QString& errorMessage, obs_data_t* additionalFields = nullptr) const;
const bool hasField(QString fieldName, obs_data_type expectedFieldType = OBS_DATA_NULL,
obs_data_number_type expectedNumberType = OBS_DATA_NUM_INVALID) const;