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

RpcEvent + RpcRequest: move accessors into declaration

Browse Source
This commit is contained in:
Stéphane Lepin 2020-01-28 18:59:35 +01:00
parent e52d86e6f9
commit 774abd66fa
4 changed files with 42 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/rpc/RpcEvent.cpp
View File

@ -24,24 +24,8 @@ RpcEvent::RpcEvent(const QString& updateType, uint64_t streamTime, uint64_t reco
_recordingTime(recordingTime), _recordingTime(recordingTime),
_fields(fields) _fields(fields)
{ {
} if (fields) {
_fields = obs_data_create();
const QString& RpcEvent::updateType() const obs_data_apply(_fields, fields);
{ }
return _updateType;
}
const uint64_t RpcEvent::streamTime() const
{
return _streamTime;
}
const uint64_t RpcEvent::recordingTime() const
{
return _recordingTime;
}
const OBSData RpcEvent::fields() const
{
return OBSData(_fields);
} }

23
src/rpc/RpcEvent.h
View File

@ -32,10 +32,25 @@ public:
obs_data_t* fields = nullptr obs_data_t* fields = nullptr
); );
const QString& updateType() const; const QString& updateType() const
const uint64_t streamTime() const; {
const uint64_t recordingTime() const; return _updateType;
const OBSData fields() const; }
const uint64_t streamTime() const
{
return _streamTime;
}
const uint64_t recordingTime() const
{
return _recordingTime;
}
const OBSData fields() const
{
return OBSData(_fields);
}
private: private:
QString _updateType; QString _updateType;

22
src/rpc/RpcRequest.cpp
View File

@ -22,24 +22,12 @@ with this program. If not, see <https://www.gnu.org/licenses/>
RpcRequest::RpcRequest(const QString& messageId, const QString& methodName, obs_data_t* params) : RpcRequest::RpcRequest(const QString& messageId, const QString& methodName, obs_data_t* params) :
_messageId(messageId), _messageId(messageId),
_methodName(methodName), _methodName(methodName),
_parameters(obs_data_create()) _parameters(nullptr)
{ {
obs_data_apply(_parameters, params); if (params) {
} _parameters = obs_data_create();
obs_data_apply(_parameters, params);
const QString& RpcRequest::messageId() const }
{
return _messageId;
}
const QString& RpcRequest::methodName() const
{
return _methodName;
}
const OBSData RpcRequest::parameters() const
{
return OBSData(_parameters);
} }
const RpcResponse RpcRequest::success(obs_data_t* additionalFields) const const RpcResponse RpcRequest::success(obs_data_t* additionalFields) const

17
src/rpc/RpcRequest.h
View File

@ -30,9 +30,20 @@ class RpcRequest
public: public:
explicit RpcRequest(const QString& messageId, const QString& methodName, obs_data_t* params); explicit RpcRequest(const QString& messageId, const QString& methodName, obs_data_t* params);
const QString& messageId() const; const QString& messageId() const
const QString& methodName() const; {
const OBSData parameters() const; return _messageId;
}
const QString& methodName() const
{
return _methodName;
}
const OBSData parameters() const
{
return OBSData(_parameters);
}
const RpcResponse success(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 RpcResponse failed(const QString& errorMessage, obs_data_t* additionalFields = nullptr) const;