From 6953bc6105844d085f70a5b8fc22a8139f550ed3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lepin?= Date: Wed, 29 Jan 2020 17:24:45 +0100 Subject: [PATCH] Utils: turn it into a namespace --- src/Utils.h | 69 ++++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/src/Utils.h b/src/Utils.h index bdd5da20..4259c2e6 100644 --- a/src/Utils.h +++ b/src/Utils.h @@ -34,58 +34,57 @@ with this program. If not, see typedef void(*PauseRecordingFunction)(bool); typedef bool(*RecordingPausedFunction)(); -class Utils { - public: - static obs_data_array_t* StringListToArray(char** strings, const char* key); - static obs_data_array_t* GetSceneItems(obs_source_t* source); - static obs_data_t* GetSceneItemData(obs_sceneitem_t* item); +namespace Utils { + obs_data_array_t* StringListToArray(char** strings, const char* key); + obs_data_array_t* GetSceneItems(obs_source_t* source); + obs_data_t* GetSceneItemData(obs_sceneitem_t* item); // These two functions support nested lookup into groups - static obs_sceneitem_t* GetSceneItemFromName(obs_scene_t* scene, QString name); - static obs_sceneitem_t* GetSceneItemFromId(obs_scene_t* scene, int64_t id); + obs_sceneitem_t* GetSceneItemFromName(obs_scene_t* scene, QString name); + obs_sceneitem_t* GetSceneItemFromId(obs_scene_t* scene, int64_t id); - static obs_sceneitem_t* GetSceneItemFromItem(obs_scene_t* scene, obs_data_t* item); - static obs_scene_t* GetSceneFromNameOrCurrent(QString sceneName); - static obs_data_t* GetSceneItemPropertiesData(obs_sceneitem_t* item); + obs_sceneitem_t* GetSceneItemFromItem(obs_scene_t* scene, obs_data_t* item); + obs_scene_t* GetSceneFromNameOrCurrent(QString sceneName); + obs_data_t* GetSceneItemPropertiesData(obs_sceneitem_t* item); - static obs_data_t* GetSourceFilterInfo(obs_source_t* filter, bool includeSettings); - static obs_data_array_t* GetSourceFiltersList(obs_source_t* source, bool includeSettings); + obs_data_t* GetSourceFilterInfo(obs_source_t* filter, bool includeSettings); + obs_data_array_t* GetSourceFiltersList(obs_source_t* source, bool includeSettings); - static bool IsValidAlignment(const uint32_t alignment); + bool IsValidAlignment(const uint32_t alignment); - static obs_data_array_t* GetScenes(); - static obs_data_t* GetSceneData(obs_source_t* source); + obs_data_array_t* GetScenes(); + obs_data_t* GetSceneData(obs_source_t* source); // TODO contribute a proper frontend API method for this to OBS and remove this hack - static QSpinBox* GetTransitionDurationControl(); - static int GetTransitionDuration(obs_source_t* transition); - static obs_source_t* GetTransitionFromName(QString transitionName); - static bool SetTransitionByName(QString transitionName); + QSpinBox* GetTransitionDurationControl(); + int GetTransitionDuration(obs_source_t* transition); + obs_source_t* GetTransitionFromName(QString transitionName); + bool SetTransitionByName(QString transitionName); - static QString OBSVersionString(); + QString OBSVersionString(); - static QSystemTrayIcon* GetTrayIcon(); - static void SysTrayNotify( + QSystemTrayIcon* GetTrayIcon(); + void SysTrayNotify( QString text, QSystemTrayIcon::MessageIcon n, QString title = QString("obs-websocket")); - static const char* GetRecordingFolder(); - static bool SetRecordingFolder(const char* path); + const char* GetRecordingFolder(); + bool SetRecordingFolder(const char* path); - static QString ParseDataToQueryString(obs_data_t* data); - static obs_hotkey_t* FindHotkeyByName(QString name); + QString ParseDataToQueryString(obs_data_t* data); + obs_hotkey_t* FindHotkeyByName(QString name); - static bool ReplayBufferEnabled(); - static void StartReplayBuffer(); - static bool IsRPHotkeySet(); + bool ReplayBufferEnabled(); + void StartReplayBuffer(); + bool IsRPHotkeySet(); - static const char* GetFilenameFormatting(); - static bool SetFilenameFormatting(const char* filenameFormatting); + const char* GetFilenameFormatting(); + bool SetFilenameFormatting(const char* filenameFormatting); - static bool RecordingPauseSupported(); - static bool RecordingPaused(); - static void PauseRecording(bool pause); + bool RecordingPauseSupported(); + bool RecordingPaused(); + void PauseRecording(bool pause); - static QString nsToTimestamp(uint64_t ns); + QString nsToTimestamp(uint64_t ns); };