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

RpcResponse: fixes

Browse Source
This commit is contained in:
Stéphane Lepin 2019-11-15 22:59:36 +01:00
parent 5864864123
commit d25b65c124
4 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -47,7 +47,7 @@ set(obs-websocket_SOURCES
src/Config.cpp src/Config.cpp
src/Utils.cpp src/Utils.cpp
src/rpc/RpcRequest.cpp src/rpc/RpcRequest.cpp
src/rpc/RpcResponse.h src/rpc/RpcResponse.cpp
src/protocol/OBSRemoteProtocol.cpp src/protocol/OBSRemoteProtocol.cpp
src/forms/settings-dialog.cpp) src/forms/settings-dialog.cpp)

4
src/protocol/OBSRemoteProtocol.cpp
View File

@ -72,9 +72,9 @@ std::string OBSRemoteProtocol::processMessage(std::string message)
OBSData additionalFields = response.additionalFields(); OBSData additionalFields = response.additionalFields();
switch (response.status()) { switch (response.status()) {
case Ok: case RpcResponse::Status::Ok:
return successResponse(messageId, additionalFields); return successResponse(messageId, additionalFields);
case Error: case RpcResponse::Status::Error:
return errorResponse(messageId, response.errorMessage(), additionalFields); return errorResponse(messageId, response.errorMessage(), additionalFields);
} }

10
src/rpc/RpcResponse.cpp
View File

@ -20,7 +20,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
#include "RpcRequest.h" #include "RpcRequest.h"
RpcResponse::RpcResponse( RpcResponse::RpcResponse(
ResponseStatus status, const QString& messageId, Status status, const QString& messageId,
const QString& methodName, obs_data_t* additionalFields const QString& methodName, obs_data_t* additionalFields
) : ) :
_status(status), _status(status),
@ -34,15 +34,15 @@ RpcResponse::RpcResponse(
} }
} }
const RpcResponse::RpcResponse ok(const RpcRequest& request, obs_data_t* additionalFields) const RpcResponse RpcResponse::ok(const RpcRequest& request, obs_data_t* additionalFields)
{ {
RpcResponse response(ResponseStatus::Ok, request.messageId(), request.methodName(), additionalFields); RpcResponse response(Status::Ok, request.messageId(), request.methodName(), additionalFields);
return response; return response;
} }
const RpcResponse::RpcResponse fail(const RpcRequest& request, const QString& errorMessage, obs_data_t* additionalFields) const RpcResponse RpcResponse::fail(const RpcRequest& request, const QString& errorMessage, obs_data_t* additionalFields)
{ {
RpcResponse response(ResponseStatus::Error, request.messageId(), request.methodName(), additionalFields); RpcResponse response(Status::Error, request.messageId(), request.methodName(), additionalFields);
response._errorMessage = errorMessage; response._errorMessage = errorMessage;
return response; return response;
} }

15
src/rpc/RpcResponse.h
View File

@ -24,16 +24,11 @@ with this program. If not, see <https://www.gnu.org/licenses/>
class RpcRequest; class RpcRequest;
enum ResponseStatus
{
Unknown,
Ok,
Error
};
class RpcResponse class RpcResponse
{ {
public: public:
enum Status { Unknown, Ok, Error };
static RpcResponse ofRequest(const RpcRequest& request); static RpcResponse ofRequest(const RpcRequest& request);
static const RpcResponse ok(const RpcRequest& request, obs_data_t* additionalFields = nullptr); static const RpcResponse ok(const RpcRequest& request, obs_data_t* additionalFields = nullptr);
static const RpcResponse fail( static const RpcResponse fail(
@ -41,7 +36,7 @@ public:
obs_data_t* additionalFields = nullptr obs_data_t* additionalFields = nullptr
); );
ResponseStatus status() { Status status() {
return _status; return _status;
} }
@ -63,11 +58,11 @@ public:
private: private:
explicit RpcResponse( explicit RpcResponse(
ResponseStatus status, Status status,
const QString& messageId, const QString& methodName, const QString& messageId, const QString& methodName,
obs_data_t* additionalFields = nullptr obs_data_t* additionalFields = nullptr
); );
const ResponseStatus _status; const Status _status;
const QString _messageId; const QString _messageId;
const QString _methodName; const QString _methodName;
QString _errorMessage; QString _errorMessage;