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

RPC: Remove usage of std::optional

Browse Source 
Stupid 10.13 doesnt support C++17. No idea how we built 4.9.0
This commit is contained in:
tt2468 2022-01-03 17:06:13 -08:00
parent d0d89dd133
commit b5f267d3bb
4 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/WSEvents.cpp
View File

@ -252,14 +252,14 @@ void WSEvents::broadcastUpdate(const char* updateType,
if (!_srv->isListening()) {
return;
}
std::optional<uint64_t> streamTime;
uint64_t streamTime = 0;
if (obs_frontend_streaming_active()) {
streamTime = std::make_optional(getStreamingTime());
streamTime = getStreamingTime();
}
std::optional<uint64_t> recordingTime;
uint64_t recordingTime;
if (obs_frontend_recording_active()) {
recordingTime = std::make_optional(getRecordingTime());
recordingTime = getRecordingTime();
}
RpcEvent event(QString(updateType), streamTime, recordingTime, additionalFields);

12
src/protocol/OBSRemoteProtocol.cpp
View File

@ -64,15 +64,15 @@ std::string OBSRemoteProtocol::encodeEvent(const RpcEvent& event)
QString updateType = event.updateType();
obs_data_set_string(eventData, "update-type", updateType.toUtf8().constData());
std::optional<uint64_t> streamTime = event.streamTime();
if (streamTime.has_value()) {
QString streamingTimecode = Utils::nsToTimestamp(streamTime.value());
auto streamTime = event.streamTime();
if (streamTime) {
QString streamingTimecode = Utils::nsToTimestamp(streamTime);
obs_data_set_string(eventData, "stream-timecode", streamingTimecode.toUtf8().constData());
}
std::optional<uint64_t> recordingTime = event.recordingTime();
if (recordingTime.has_value()) {
QString recordingTimecode = Utils::nsToTimestamp(recordingTime.value());
auto recordingTime = event.recordingTime();
if (recordingTime) {
QString recordingTimecode = Utils::nsToTimestamp(recordingTime);
obs_data_set_string(eventData, "rec-timecode", recordingTimecode.toUtf8().constData());
}

2
src/rpc/RpcEvent.cpp
View File

@ -20,7 +20,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
RpcEvent::RpcEvent(
const QString& updateType,
std::optional<uint64_t> streamTime, std::optional<uint64_t> recordingTime,
uint64_t streamTime, uint64_t recordingTime,
obs_data_t* additionalFields
) :
_updateType(updateType),

11
src/rpc/RpcEvent.h
View File

@ -18,7 +18,6 @@ with this program. If not, see <https://www.gnu.org/licenses/>
#pragma once
#include <optional>
#include <obs-data.h>
#include <QtCore/QString>
@ -29,7 +28,7 @@ class RpcEvent
public:
explicit RpcEvent(
const QString& updateType,
std::optional<uint64_t> streamTime, std::optional<uint64_t> recordingTime,
uint64_t streamTime, uint64_t recordingTime,
obs_data_t* additionalFields = nullptr
);
@ -38,12 +37,12 @@ public:
return _updateType;
}
const std::optional<uint64_t> streamTime() const
const uint64_t streamTime() const
{
return _streamTime;
}
const std::optional<uint64_t> recordingTime() const
const uint64_t recordingTime() const
{
return _recordingTime;
}
@ -55,7 +54,7 @@ public:
private:
QString _updateType;
std::optional<uint64_t> _streamTime;
std::optional<uint64_t> _recordingTime;
uint64_t _streamTime;
uint64_t _recordingTime;
OBSDataAutoRelease _additionalFields;
};