From 0d59983d1a971fcc1c4d070295dbed32270b58be Mon Sep 17 00:00:00 2001 From: tt2468 Date: Tue, 19 Jan 2021 18:30:18 -0800 Subject: [PATCH] Misc: Fix indentation of src files Replace 4-space code with tabs to conform with the way its supposed to be. --- src/ConnectionProperties.cpp | 6 +++--- src/ConnectionProperties.h | 8 ++++---- src/Utils.h | 12 ++++++------ src/WSRequestHandler_Recording.cpp | 18 +++++++++--------- src/WSRequestHandler_ReplayBuffer.cpp | 6 +++--- src/WSRequestHandler_Sources.cpp | 10 +++++----- src/WSServer.cpp | 2 +- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/ConnectionProperties.cpp b/src/ConnectionProperties.cpp index 485123de..aa7c4525 100644 --- a/src/ConnectionProperties.cpp +++ b/src/ConnectionProperties.cpp @@ -19,16 +19,16 @@ with this program. If not, see #include "ConnectionProperties.h" ConnectionProperties::ConnectionProperties() - : _authenticated(false) + : _authenticated(false) { } bool ConnectionProperties::isAuthenticated() { - return _authenticated.load(); + return _authenticated.load(); } void ConnectionProperties::setAuthenticated(bool authenticated) { - _authenticated.store(authenticated); + _authenticated.store(authenticated); } \ No newline at end of file diff --git a/src/ConnectionProperties.h b/src/ConnectionProperties.h index a766ef6a..8bb87a27 100644 --- a/src/ConnectionProperties.h +++ b/src/ConnectionProperties.h @@ -23,9 +23,9 @@ with this program. If not, see class ConnectionProperties { public: - explicit ConnectionProperties(); - bool isAuthenticated(); - void setAuthenticated(bool authenticated); + explicit ConnectionProperties(); + bool isAuthenticated(); + void setAuthenticated(bool authenticated); private: - std::atomic _authenticated; + std::atomic _authenticated; }; \ No newline at end of file diff --git a/src/Utils.h b/src/Utils.h index 47a19f2d..0983ba4b 100644 --- a/src/Utils.h +++ b/src/Utils.h @@ -88,10 +88,10 @@ namespace Utils { const char* GetCurrentRecordingFilename(); QString nsToTimestamp(uint64_t ns); - struct AddSourceData { - obs_source_t *source; - obs_sceneitem_t *sceneItem; - bool setVisible; - }; - void AddSourceHelper(void *_data, obs_scene_t *scene); + struct AddSourceData { + obs_source_t *source; + obs_sceneitem_t *sceneItem; + bool setVisible; + }; + void AddSourceHelper(void *_data, obs_scene_t *scene); }; diff --git a/src/WSRequestHandler_Recording.cpp b/src/WSRequestHandler_Recording.cpp index db0c529d..d0a53f82 100644 --- a/src/WSRequestHandler_Recording.cpp +++ b/src/WSRequestHandler_Recording.cpp @@ -29,19 +29,19 @@ RpcResponse ifCanPause(const RpcRequest& request, std::function c * @since unreleased */ RpcResponse WSRequestHandler::GetRecordingStatus(const RpcRequest& request) { - auto events = GetEventsSystem(); + auto events = GetEventsSystem(); - OBSDataAutoRelease data = obs_data_create(); - obs_data_set_bool(data, "isRecording", obs_frontend_recording_active()); - obs_data_set_bool(data, "isRecordingPaused", obs_frontend_recording_paused()); + OBSDataAutoRelease data = obs_data_create(); + obs_data_set_bool(data, "isRecording", obs_frontend_recording_active()); + obs_data_set_bool(data, "isRecordingPaused", obs_frontend_recording_paused()); - if (obs_frontend_recording_active()) { - QString recordingTimecode = events->getRecordingTimecode(); - obs_data_set_string(data, "recordTimecode", recordingTimecode.toUtf8().constData()); + if (obs_frontend_recording_active()) { + QString recordingTimecode = events->getRecordingTimecode(); + obs_data_set_string(data, "recordTimecode", recordingTimecode.toUtf8().constData()); obs_data_set_string(data, "recordingFilename", Utils::GetCurrentRecordingFilename()); - } + } - return request.success(data); + return request.success(data); } /** diff --git a/src/WSRequestHandler_ReplayBuffer.cpp b/src/WSRequestHandler_ReplayBuffer.cpp index d4c83a27..2210fcf7 100644 --- a/src/WSRequestHandler_ReplayBuffer.cpp +++ b/src/WSRequestHandler_ReplayBuffer.cpp @@ -16,10 +16,10 @@ * @since unreleased */ RpcResponse WSRequestHandler::GetReplayBufferStatus(const RpcRequest& request) { - OBSDataAutoRelease data = obs_data_create(); - obs_data_set_bool(data, "isReplayBufferActive", obs_frontend_replay_buffer_active()); + OBSDataAutoRelease data = obs_data_create(); + obs_data_set_bool(data, "isReplayBufferActive", obs_frontend_replay_buffer_active()); - return request.success(data); + return request.success(data); } /** diff --git a/src/WSRequestHandler_Sources.cpp b/src/WSRequestHandler_Sources.cpp index 94e9a06c..8b044cf6 100644 --- a/src/WSRequestHandler_Sources.cpp +++ b/src/WSRequestHandler_Sources.cpp @@ -975,10 +975,10 @@ RpcResponse WSRequestHandler::GetTextFreetype2Properties(const RpcRequest& reque */ RpcResponse WSRequestHandler::SetTextFreetype2Properties(const RpcRequest& request) { - const char* sourceName = obs_data_get_string(request.parameters(), "source"); - if (!sourceName) { + const char* sourceName = obs_data_get_string(request.parameters(), "source"); + if (!sourceName) { return request.failed("invalid request parameters"); - } + } OBSSourceAutoRelease source = obs_get_source_by_name(sourceName); if (!source) { @@ -1681,8 +1681,8 @@ RpcResponse WSRequestHandler::SetAudioMonitorType(const RpcRequest& request) /** * Takes a picture snapshot of a source and then can either or both: -* - Send it over as a Data URI (base64-encoded data) in the response (by specifying `embedPictureFormat` in the request) -* - Save it to disk (by specifying `saveToFilePath` in the request) +* - Send it over as a Data URI (base64-encoded data) in the response (by specifying `embedPictureFormat` in the request) +* - Save it to disk (by specifying `saveToFilePath` in the request) * * At least `embedPictureFormat` or `saveToFilePath` must be specified. * diff --git a/src/WSServer.cpp b/src/WSServer.cpp index 33639dd1..6d155658 100644 --- a/src/WSServer.cpp +++ b/src/WSServer.cpp @@ -44,7 +44,7 @@ WSServer::WSServer() _connections(), _clMutex(QMutex::Recursive) { - _server.get_alog().clear_channels(websocketpp::log::alevel::frame_header | websocketpp::log::alevel::frame_payload | websocketpp::log::alevel::control); + _server.get_alog().clear_channels(websocketpp::log::alevel::frame_header | websocketpp::log::alevel::frame_payload | websocketpp::log::alevel::control); _server.init_asio(); #ifndef _WIN32 _server.set_reuse_addr(true);