diff --git a/forms/advanced-scene-switcher.ui b/forms/advanced-scene-switcher.ui index ccb8da05..4f1764e8 100644 --- a/forms/advanced-scene-switcher.ui +++ b/forms/advanced-scene-switcher.ui @@ -658,7 +658,7 @@ - + true @@ -4563,7 +4563,7 @@ - MacroTree + advss::MacroTree QListView
macro-tree.hpp
 diff --git a/src/advanced-scene-switcher.cpp b/src/advanced-scene-switcher.cpp index 8813a53c..ba763f1b 100644 --- a/src/advanced-scene-switcher.cpp +++ b/src/advanced-scene-switcher.cpp @@ -14,18 +14,7 @@ #include "utility.hpp" #include "version.h" -const char *obs_module_text(const char *text) -{ - if (!switcher) { - return ""; - } - return switcher->translate(text); -} - -obs_module_t *obs_current_module() -{ - return switcher->modulePtr; -} +namespace advss { SwitcherData *switcher = nullptr; SwitcherData *GetSwitcher() @@ -762,3 +751,18 @@ extern "C" void InitSceneSwitcher(obs_module_t *m, translateFunc t) obs_module_text("AdvSceneSwitcher.pluginName")); action->connect(action, &QAction::triggered, OpenSettingsWindow); } + +} // namespace advss + +const char *obs_module_text(const char *text) +{ + if (!advss::switcher) { + return ""; + } + return advss::switcher->translate(text); +} + +obs_module_t *obs_current_module() +{ + return advss::switcher->modulePtr; +} diff --git a/src/advanced-scene-switcher.hpp b/src/advanced-scene-switcher.hpp index a826934e..aabb8e83 100644 --- a/src/advanced-scene-switcher.hpp +++ b/src/advanced-scene-switcher.hpp @@ -12,6 +12,9 @@ } class QCloseEvent; + +namespace advss { + class MacroActionEdit; class MacroConditionEdit; @@ -343,3 +346,5 @@ void AskForBackup(obs_data_t *obj); struct SwitcherData; extern SwitcherData *switcher; SwitcherData *GetSwitcher(); + +} // namespace advss diff --git a/src/general.cpp b/src/general.cpp index 57649e7e..31718623 100644 --- a/src/general.cpp +++ b/src/general.cpp @@ -7,6 +7,8 @@ #include #include +namespace advss { + void AdvSceneSwitcher::reject() { close(); @@ -1074,3 +1076,5 @@ void AdvSceneSwitcher::setupGeneralTab() setWindowTitle(windowTitle() + " - " + g_GIT_TAG); } + +} // namespace advss diff --git a/src/hotkey.cpp b/src/hotkey.cpp index 0612700e..a1da5b7a 100644 --- a/src/hotkey.cpp +++ b/src/hotkey.cpp @@ -4,6 +4,8 @@ #include #include +namespace advss { + std::vector> Hotkey::_registeredHotkeys = {}; uint32_t Hotkey::_hotkeyCounter = 1; @@ -249,3 +251,5 @@ void SwitcherData::loadHotkeys(obs_data_t *obj) loadHotkey(obj, downMacroSegment, "downMacroSegmentHotkey"); loadHotkey(obj, removeMacroSegment, "removeMacroSegmentHotkey"); } + +} // namespace advss diff --git a/src/hotkey.hpp b/src/hotkey.hpp index 5a9f260e..1e31d584 100644 --- a/src/hotkey.hpp +++ b/src/hotkey.hpp @@ -5,6 +5,8 @@ #include #include +namespace advss { + extern bool canSimulateKeyPresses; class Hotkey { @@ -162,3 +164,5 @@ enum class HotkeyType { }; void registerHotkeys(); + +} // namespace advss diff --git a/src/legacy/scene-trigger.cpp b/src/legacy/scene-trigger.cpp index 1722bd93..213c426a 100644 --- a/src/legacy/scene-trigger.cpp +++ b/src/legacy/scene-trigger.cpp @@ -3,6 +3,8 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + bool SceneTrigger::pause = false; static QMetaObject::Connection addPulse; @@ -569,3 +571,5 @@ void SceneTriggerWidget::AudioSourceChanged(const QString &text) std::lock_guard lock(switcher->m); switchData->audioSource = GetWeakSourceByQString(text); } + +} // namespace advss diff --git a/src/legacy/scene-trigger.hpp b/src/legacy/scene-trigger.hpp index baab0d4c..03736e4a 100644 --- a/src/legacy/scene-trigger.hpp +++ b/src/legacy/scene-trigger.hpp @@ -10,6 +10,8 @@ #include "switch-generic.hpp" #include "duration-control.hpp" +namespace advss { + enum class sceneTriggerType { NONE = 0, SCENE_ACTIVE = 1, @@ -82,3 +84,5 @@ private: SceneTrigger *switchData; }; + +} // namespace advss diff --git a/src/legacy/switch-audio.cpp b/src/legacy/switch-audio.cpp index 71132f63..49ba4e24 100644 --- a/src/legacy/switch-audio.cpp +++ b/src/legacy/switch-audio.cpp @@ -4,6 +4,8 @@ #include "volume-control.hpp" #include "utility.hpp" +namespace advss { + bool AudioSwitch::pause = false; static QMetaObject::Connection addPulse; @@ -611,3 +613,5 @@ void AudioSwitchFallbackWidget::DurationChanged(const Duration &dur) std::lock_guard lock(switcher->m); switchData->duration = dur; } + +} // namespace advss diff --git a/src/legacy/switch-audio.hpp b/src/legacy/switch-audio.hpp index eba13365..b814ae3a 100644 --- a/src/legacy/switch-audio.hpp +++ b/src/legacy/switch-audio.hpp @@ -13,6 +13,8 @@ #include "duration-control.hpp" #include "volume-control.hpp" +namespace advss { + constexpr auto audio_func = 8; typedef enum { @@ -103,3 +105,5 @@ private: AudioSwitchFallback *switchData; }; + +} // namespace advss diff --git a/src/legacy/switch-executable.cpp b/src/legacy/switch-executable.cpp index 8b6dc1c8..1314ed4c 100644 --- a/src/legacy/switch-executable.cpp +++ b/src/legacy/switch-executable.cpp @@ -1,6 +1,8 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + bool ExecutableSwitch::pause = false; static QMetaObject::Connection addPulse; @@ -272,3 +274,5 @@ void ExecutableSwitchWidget::FocusChanged(int state) std::lock_guard lock(switcher->m); switchData->inFocus = state; } + +} // namespace advss diff --git a/src/legacy/switch-executable.hpp b/src/legacy/switch-executable.hpp index f2cb2e1c..6cf4f2b9 100644 --- a/src/legacy/switch-executable.hpp +++ b/src/legacy/switch-executable.hpp @@ -9,6 +9,8 @@ #include #include "switch-generic.hpp" +namespace advss { + constexpr auto exe_func = 3; struct ExecutableSwitch : SceneSwitcherEntry { @@ -42,3 +44,5 @@ private: ExecutableSwitch *switchData; }; + +} // namespace advss diff --git a/src/legacy/switch-file.cpp b/src/legacy/switch-file.cpp index a9ba1883..2b33688f 100644 --- a/src/legacy/switch-file.cpp +++ b/src/legacy/switch-file.cpp @@ -10,6 +10,8 @@ #include "curl-helper.hpp" #include "utility.hpp" +namespace advss { + bool FileSwitch::pause = false; static QMetaObject::Connection addPulse; static std::hash strHash; @@ -665,3 +667,5 @@ void FileSwitchWidget::CheckFileContentChanged(int state) std::lock_guard lock(switcher->m); switchData->onlyMatchIfChanged = state; } + +} // namespace advss diff --git a/src/legacy/switch-file.hpp b/src/legacy/switch-file.hpp index 5432f250..955baee9 100644 --- a/src/legacy/switch-file.hpp +++ b/src/legacy/switch-file.hpp @@ -10,6 +10,8 @@ #include #include +namespace advss { + constexpr auto read_file_func = 0; typedef enum { @@ -77,3 +79,5 @@ static inline QString MakeFileSwitchName(const QString &scene, const QString &fileName, const QString &text, bool useRegex, bool useTime, bool onlyMatchIfChanged); + +} // namespace advss diff --git a/src/legacy/switch-generic.cpp b/src/legacy/switch-generic.cpp index 09d49599..0aaa8c40 100644 --- a/src/legacy/switch-generic.cpp +++ b/src/legacy/switch-generic.cpp @@ -1,6 +1,8 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + static inline bool SceneGroupValid(SceneGroup *group) { if (group) { @@ -300,3 +302,5 @@ void SwitchWidget::TransitionChanged(const QString &text) switchData->transition = GetWeakTransitionByQString(text); switchData->useCurrentTransition = switchData->transition == nullptr; } + +} // namespace advss diff --git a/src/legacy/switch-generic.hpp b/src/legacy/switch-generic.hpp index ec1893a2..6135f9e2 100644 --- a/src/legacy/switch-generic.hpp +++ b/src/legacy/switch-generic.hpp @@ -4,6 +4,8 @@ #include "scene-group.hpp" +namespace advss { + enum class SwitchTargetType { Scene, SceneGroup, @@ -95,3 +97,5 @@ protected: SceneSwitcherEntry *switchData; }; + +} // namespace advss diff --git a/src/legacy/switch-idle.cpp b/src/legacy/switch-idle.cpp index c0326c17..bdf2cc7d 100644 --- a/src/legacy/switch-idle.cpp +++ b/src/legacy/switch-idle.cpp @@ -3,6 +3,8 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + bool IdleData::pause = false; IdleWidget *idleWidget = nullptr; @@ -285,3 +287,5 @@ void IdleWidget::DurationChanged(int dur) std::lock_guard lock(switcher->m); switcher->idleData.time = dur; } + +} // namespace advss diff --git a/src/legacy/switch-idle.hpp b/src/legacy/switch-idle.hpp index 41d02a02..3e1e37a3 100644 --- a/src/legacy/switch-idle.hpp +++ b/src/legacy/switch-idle.hpp @@ -8,6 +8,8 @@ #pragma once #include "switch-generic.hpp" +namespace advss { + constexpr auto default_idle_time = 60; constexpr auto idle_func = 2; @@ -36,3 +38,5 @@ private: IdleData *switchData; }; + +} // namespace advss diff --git a/src/legacy/switch-media.cpp b/src/legacy/switch-media.cpp index 5c6eee03..4f360e6f 100644 --- a/src/legacy/switch-media.cpp +++ b/src/legacy/switch-media.cpp @@ -1,6 +1,8 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + bool MediaSwitch::pause = false; static QMetaObject::Connection addPulse; @@ -560,3 +562,5 @@ void MediaSwitchWidget::TimeChanged(int time) std::lock_guard lock(switcher->m); switchData->time = time; } + +} // namespace advss diff --git a/src/legacy/switch-media.hpp b/src/legacy/switch-media.hpp index 4fe799c0..e817d612 100644 --- a/src/legacy/switch-media.hpp +++ b/src/legacy/switch-media.hpp @@ -8,6 +8,8 @@ #pragma once #include "switch-generic.hpp" +namespace advss { + constexpr auto media_func = 6; typedef enum { @@ -83,3 +85,5 @@ private: MediaSwitch *switchData; }; + +} // namespace advss diff --git a/src/legacy/switch-network.cpp b/src/legacy/switch-network.cpp index 7c100c11..bed79419 100644 --- a/src/legacy/switch-network.cpp +++ b/src/legacy/switch-network.cpp @@ -9,6 +9,8 @@ Most of this code is based on https://github.com/Palakis/obs-websocket #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + #define PARAM_SERVER_ENABLE "ServerEnabled" #define PARAM_SERVER_PORT "ServerPort" #define PARAM_LOCKTOIPV4 "LockToIPv4" @@ -124,10 +126,9 @@ WSServer::WSServer() : QObject(nullptr), _connections(), _clMutex() _server.set_reuse_addr(true); #endif - _server.set_open_handler(bind(&WSServer::onOpen, this, ::_1)); - _server.set_close_handler(bind(&WSServer::onClose, this, ::_1)); - _server.set_message_handler( - bind(&WSServer::onMessage, this, ::_1, ::_2)); + _server.set_open_handler(bind(&WSServer::onOpen, this, _1)); + _server.set_close_handler(bind(&WSServer::onClose, this, _1)); + _server.set_message_handler(bind(&WSServer::onMessage, this, _1, _2)); } WSServer::~WSServer() @@ -361,11 +362,10 @@ WSClient::WSClient() : QObject(nullptr) _client.set_reuse_addr(true); #endif - _client.set_open_handler(bind(&WSClient::onOpen, this, ::_1)); - _client.set_fail_handler(bind(&WSClient::onFail, this, ::_1)); - _client.set_message_handler( - bind(&WSClient::onMessage, this, ::_1, ::_2)); - _client.set_close_handler(bind(&WSClient::onClose, this, ::_1)); + _client.set_open_handler(bind(&WSClient::onOpen, this, _1)); + _client.set_fail_handler(bind(&WSClient::onFail, this, _1)); + _client.set_message_handler(bind(&WSClient::onMessage, this, _1, _2)); + _client.set_close_handler(bind(&WSClient::onClose, this, _1)); } WSClient::~WSClient() @@ -709,3 +709,5 @@ Compatability::StdFunctionRunnable::StdFunctionRunnable( : cb(std::move(func)) { } + +} // namespace advss diff --git a/src/legacy/switch-network.hpp b/src/legacy/switch-network.hpp index 6c63d9cd..f47fa60b 100644 --- a/src/legacy/switch-network.hpp +++ b/src/legacy/switch-network.hpp @@ -19,6 +19,8 @@ Most of this code is based on https://github.com/Palakis/obs-websocket #include #include +namespace advss { + using websocketpp::connection_hdl; typedef websocketpp::server server; typedef websocketpp::client client; @@ -131,3 +133,5 @@ public: QRunnable *CreateFunctionRunnable(std::function func); } + +} // namespace advss diff --git a/src/legacy/switch-pause.cpp b/src/legacy/switch-pause.cpp index fcbf62b3..cea6cec9 100644 --- a/src/legacy/switch-pause.cpp +++ b/src/legacy/switch-pause.cpp @@ -3,6 +3,8 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + static QMetaObject::Connection addPulse; void AdvSceneSwitcher::on_pauseAdd_clicked() @@ -410,3 +412,5 @@ bool PauseEntry::valid() { return true; } + +} // namespace advss diff --git a/src/legacy/switch-pause.hpp b/src/legacy/switch-pause.hpp index 0a7be8ef..a9e3e230 100644 --- a/src/legacy/switch-pause.hpp +++ b/src/legacy/switch-pause.hpp @@ -8,6 +8,8 @@ #pragma once #include "switch-generic.hpp" +namespace advss { + enum class PauseType { Scene, Window, @@ -70,3 +72,5 @@ private: PauseEntry *switchData; }; + +} // namespace advss diff --git a/src/legacy/switch-priority.cpp b/src/legacy/switch-priority.cpp index 2f456b3c..85ec0f40 100644 --- a/src/legacy/switch-priority.cpp +++ b/src/legacy/switch-priority.cpp @@ -2,6 +2,8 @@ #include "advanced-scene-switcher.hpp" +namespace advss { + void AdvSceneSwitcher::on_threadPriority_currentTextChanged(const QString &text) { if (loading || ui->threadPriority->count() != @@ -76,3 +78,5 @@ bool SwitcherData::prioFuncsValid() } return true; } + +} // namespace advss diff --git a/src/legacy/switch-random.cpp b/src/legacy/switch-random.cpp index 96b18b33..072beee3 100644 --- a/src/legacy/switch-random.cpp +++ b/src/legacy/switch-random.cpp @@ -3,6 +3,8 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + bool RandomSwitch::pause = false; static QMetaObject::Connection addPulse; @@ -220,3 +222,5 @@ void RandomSwitchWidget::DelayChanged(double d) std::lock_guard lock(switcher->m); switchData->delay = d; } + +} // namespace advss diff --git a/src/legacy/switch-random.hpp b/src/legacy/switch-random.hpp index 16e66fd1..5df7f25f 100644 --- a/src/legacy/switch-random.hpp +++ b/src/legacy/switch-random.hpp @@ -8,6 +8,8 @@ #pragma once #include "switch-generic.hpp" +namespace advss { + struct RandomSwitch : SceneSwitcherEntry { static bool pause; double delay = 0.0; @@ -36,3 +38,5 @@ private: RandomSwitch *switchData; }; + +} // namespace advss diff --git a/src/legacy/switch-screen-region.cpp b/src/legacy/switch-screen-region.cpp index 5f9d4c26..6ee474c7 100644 --- a/src/legacy/switch-screen-region.cpp +++ b/src/legacy/switch-screen-region.cpp @@ -3,6 +3,8 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + bool ScreenRegionSwitch::pause = false; static QMetaObject::Connection addPulse; @@ -455,3 +457,5 @@ void ScreenRegionWidget::drawFrame() switchData->maxY - switchData->minY); } } + +} // namespace advss diff --git a/src/legacy/switch-screen-region.hpp b/src/legacy/switch-screen-region.hpp index 6dc8769f..dd588f28 100644 --- a/src/legacy/switch-screen-region.hpp +++ b/src/legacy/switch-screen-region.hpp @@ -9,6 +9,8 @@ #include #include "switch-generic.hpp" +namespace advss { + constexpr auto screen_region_func = 4; struct ScreenRegionSwitch : SceneSwitcherEntry { @@ -55,3 +57,5 @@ private: void drawFrame(); }; + +} // namespace advss diff --git a/src/legacy/switch-sequence.cpp b/src/legacy/switch-sequence.cpp index 291c1763..11f44cc5 100644 --- a/src/legacy/switch-sequence.cpp +++ b/src/legacy/switch-sequence.cpp @@ -5,6 +5,8 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + constexpr auto max_extend_text_size = 150; bool SceneSequenceSwitch::pause = false; @@ -793,3 +795,5 @@ void SequenceWidget::ReduceClicked() delete item; } } + +} // namespace advss diff --git a/src/legacy/switch-sequence.hpp b/src/legacy/switch-sequence.hpp index 0492d033..ad523a85 100644 --- a/src/legacy/switch-sequence.hpp +++ b/src/legacy/switch-sequence.hpp @@ -11,6 +11,8 @@ #include "switch-generic.hpp" #include "duration-control.hpp" +namespace advss { + constexpr auto round_trip_func = 1; struct SceneSequenceSwitch : SceneSwitcherEntry { @@ -82,3 +84,5 @@ protected: SceneSequenceSwitch *switchData; }; + +} // namespace advss diff --git a/src/legacy/switch-time.cpp b/src/legacy/switch-time.cpp index 6fe80e3c..826887f7 100644 --- a/src/legacy/switch-time.cpp +++ b/src/legacy/switch-time.cpp @@ -1,6 +1,8 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + bool TimeSwitch::pause = false; static QMetaObject::Connection addPulse; @@ -306,3 +308,5 @@ void TimeSwitchWidget::TimeChanged(const QTime &time) std::lock_guard lock(switcher->m); switchData->time = time; } + +} // namespace advss diff --git a/src/legacy/switch-time.hpp b/src/legacy/switch-time.hpp index 0de30abb..cc42ae8e 100644 --- a/src/legacy/switch-time.hpp +++ b/src/legacy/switch-time.hpp @@ -10,6 +10,8 @@ #include "switch-generic.hpp" +namespace advss { + constexpr auto time_func = 7; typedef enum { @@ -54,3 +56,5 @@ private: TimeSwitch *switchData; }; + +} // namespace advss diff --git a/src/legacy/switch-transitions.cpp b/src/legacy/switch-transitions.cpp index b4bf8da2..c9ae41c1 100644 --- a/src/legacy/switch-transitions.cpp +++ b/src/legacy/switch-transitions.cpp @@ -3,6 +3,8 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + constexpr auto default_def_transition_dealy = 300; bool DefaultSceneTransition::pause = false; unsigned int DefaultSceneTransition::delay = default_def_transition_dealy; @@ -592,3 +594,5 @@ void DefaultSceneTransition::setTransition() t = std::thread(setTransitionDelayed, transition, delay); t.detach(); } + +} // namespace advss diff --git a/src/legacy/switch-transitions.hpp b/src/legacy/switch-transitions.hpp index 77cfc257..5f317f8c 100644 --- a/src/legacy/switch-transitions.hpp +++ b/src/legacy/switch-transitions.hpp @@ -3,6 +3,8 @@ #include "switch-generic.hpp" +namespace advss { + struct SceneTransition : SceneSwitcherEntry { OBSWeakSource scene2 = nullptr; double duration = 0.3; @@ -77,3 +79,5 @@ public: private: DefaultSceneTransition *switchData; }; + +} // namespace advss diff --git a/src/legacy/switch-video.cpp b/src/legacy/switch-video.cpp index 99ad2c10..18c5190a 100644 --- a/src/legacy/switch-video.cpp +++ b/src/legacy/switch-video.cpp @@ -6,6 +6,8 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + bool VideoSwitch::pause = false; static QMetaObject::Connection addPulse; @@ -577,3 +579,5 @@ void VideoSwitchWidget::IgnoreInactiveChanged(int state) std::lock_guard lock(switcher->m); switchData->ignoreInactiveSource = state; } + +} // namespace advss diff --git a/src/legacy/switch-video.hpp b/src/legacy/switch-video.hpp index bebef19e..3aaff096 100644 --- a/src/legacy/switch-video.hpp +++ b/src/legacy/switch-video.hpp @@ -11,6 +11,8 @@ #include "switch-generic.hpp" #include "screenshot-helper.hpp" +namespace advss { + constexpr auto video_func = 9; enum class videoSwitchType { @@ -80,3 +82,5 @@ private: VideoSwitch *switchData; }; + +} // namespace advss diff --git a/src/legacy/switch-window.cpp b/src/legacy/switch-window.cpp index c796483e..46a37173 100644 --- a/src/legacy/switch-window.cpp +++ b/src/legacy/switch-window.cpp @@ -3,6 +3,8 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + bool WindowSwitch::pause = false; static QMetaObject::Connection addPulse; @@ -482,3 +484,5 @@ void WindowSwitchWidget::FocusChanged(int state) std::lock_guard lock(switcher->m); switchData->focus = state; } + +} // namespace advss diff --git a/src/legacy/switch-window.hpp b/src/legacy/switch-window.hpp index c4209e35..28c0f2df 100644 --- a/src/legacy/switch-window.hpp +++ b/src/legacy/switch-window.hpp @@ -8,6 +8,8 @@ #pragma once #include "switch-generic.hpp" +namespace advss { + constexpr auto window_title_func = 5; struct WindowSwitch : SceneSwitcherEntry { @@ -47,3 +49,5 @@ private: WindowSwitch *switchData; }; + +} // namespace advss diff --git a/src/linux/advanced-scene-switcher-nix.cpp b/src/linux/advanced-scene-switcher-nix.cpp index 71bf4432..c68e2bd1 100644 --- a/src/linux/advanced-scene-switcher-nix.cpp +++ b/src/linux/advanced-scene-switcher-nix.cpp @@ -33,6 +33,8 @@ #include #include +namespace advss { + static Display *xdisplay = 0; static QLibrary *libXtstHandle = nullptr; @@ -659,3 +661,5 @@ void PlatformCleanup() } cleanupDisplay(); } + +} // namespace advss diff --git a/src/macro-core/macro-action-audio.cpp b/src/macro-core/macro-action-audio.cpp index bc9eddb4..1996f294 100644 --- a/src/macro-core/macro-action-audio.cpp +++ b/src/macro-core/macro-action-audio.cpp @@ -2,6 +2,8 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + constexpr int64_t nsPerMs = 1000000; const std::string MacroActionAudio::id = "audio"; @@ -622,3 +624,5 @@ void MacroActionAudioEdit::FadeTypeChanged(int value) _entryData->_fadeType = static_cast(value); SetWidgetVisibility(); } + +} // namespace advss diff --git a/src/macro-core/macro-action-audio.hpp b/src/macro-core/macro-action-audio.hpp index 88334961..a0809ca3 100644 --- a/src/macro-core/macro-action-audio.hpp +++ b/src/macro-core/macro-action-audio.hpp @@ -9,6 +9,8 @@ #include #include +namespace advss { + class MacroActionAudio : public MacroAction { public: MacroActionAudio(Macro *m) : MacroAction(m) {} @@ -119,3 +121,5 @@ private: bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-action-edit.cpp b/src/macro-core/macro-action-edit.cpp index 9de47904..adc07664 100644 --- a/src/macro-core/macro-action-edit.cpp +++ b/src/macro-core/macro-action-edit.cpp @@ -4,6 +4,8 @@ #include "section.hpp" #include "utility.hpp" +namespace advss { + std::map &MacroActionFactory::GetMap() { static std::map _methods; @@ -361,3 +363,5 @@ void AdvSceneSwitcher::MacroActionReorder(int to, int from) HighlightAction(to); emit(MacroSegmentOrderChanged()); } + +} // namespace advss diff --git a/src/macro-core/macro-action-edit.hpp b/src/macro-core/macro-action-edit.hpp index 57016ba6..5cefd92b 100644 --- a/src/macro-core/macro-action-edit.hpp +++ b/src/macro-core/macro-action-edit.hpp @@ -4,6 +4,8 @@ #include #include +namespace advss { + struct MacroActionInfo { using TCreateMethod = std::shared_ptr (*)(Macro *m); using TCreateWidgetMethod = QWidget *(*)(QWidget *parent, @@ -51,3 +53,5 @@ private: std::shared_ptr *_entryData; bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-action-file.cpp b/src/macro-core/macro-action-file.cpp index f278da91..ba448142 100644 --- a/src/macro-core/macro-action-file.cpp +++ b/src/macro-core/macro-action-file.cpp @@ -6,6 +6,8 @@ #include #include +namespace advss { + const std::string MacroActionFile::id = "file"; bool MacroActionFile::_registered = MacroActionFactory::Register( @@ -167,3 +169,5 @@ void MacroActionFileEdit::ActionChanged(int value) std::lock_guard lock(switcher->m); _entryData->_action = static_cast(value); } + +} // namespace advss diff --git a/src/macro-core/macro-action-file.hpp b/src/macro-core/macro-action-file.hpp index 9d70202e..760096e9 100644 --- a/src/macro-core/macro-action-file.hpp +++ b/src/macro-core/macro-action-file.hpp @@ -5,6 +5,8 @@ #include +namespace advss { + enum class FileAction { WRITE, APPEND, @@ -65,3 +67,5 @@ protected: private: bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-action-filter.cpp b/src/macro-core/macro-action-filter.cpp index 690cb673..8aa542e9 100644 --- a/src/macro-core/macro-action-filter.cpp +++ b/src/macro-core/macro-action-filter.cpp @@ -2,6 +2,8 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + const std::string MacroActionFilter::id = "filter"; bool MacroActionFilter::_registered = MacroActionFactory::Register( @@ -247,3 +249,5 @@ void MacroActionFilterEdit::SetWidgetVisibility(bool showSettings) _getSettings->setVisible(showSettings); adjustSize(); } + +} // namespace advss diff --git a/src/macro-core/macro-action-filter.hpp b/src/macro-core/macro-action-filter.hpp index 80bb057a..2b506ddb 100644 --- a/src/macro-core/macro-action-filter.hpp +++ b/src/macro-core/macro-action-filter.hpp @@ -7,6 +7,8 @@ #include #include +namespace advss { + class MacroActionFilter : public MacroAction { public: MacroActionFilter(Macro *m) : MacroAction(m) {} @@ -79,3 +81,5 @@ private: void SetWidgetVisibility(bool); bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-action-hotkey.cpp b/src/macro-core/macro-action-hotkey.cpp index ce3cd92c..8b35764c 100644 --- a/src/macro-core/macro-action-hotkey.cpp +++ b/src/macro-core/macro-action-hotkey.cpp @@ -3,6 +3,8 @@ #include "utility.hpp" #include +namespace advss { + const std::string MacroActionHotkey::id = "hotkey"; bool MacroActionHotkey::_registered = MacroActionFactory::Register( @@ -612,3 +614,5 @@ void MacroActionHotkeyEdit::KeyChanged(int key) std::lock_guard lock(switcher->m); _entryData->_key = static_cast(key); } + +} // namespace advss diff --git a/src/macro-core/macro-action-hotkey.hpp b/src/macro-core/macro-action-hotkey.hpp index 07186f90..92470e93 100644 --- a/src/macro-core/macro-action-hotkey.hpp +++ b/src/macro-core/macro-action-hotkey.hpp @@ -8,6 +8,8 @@ #include #include +namespace advss { + class MacroActionHotkey : public MacroAction { public: MacroActionHotkey(Macro *m) : MacroAction(m) {} @@ -93,3 +95,5 @@ private: QHBoxLayout *_mainLayout; bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-action-http.cpp b/src/macro-core/macro-action-http.cpp index daeaa3b5..345896a5 100644 --- a/src/macro-core/macro-action-http.cpp +++ b/src/macro-core/macro-action-http.cpp @@ -3,6 +3,8 @@ #include "utility.hpp" #include "curl-helper.hpp" +namespace advss { + const std::string MacroActionHttp::id = "http"; bool MacroActionHttp::_registered = MacroActionFactory::Register( @@ -292,3 +294,5 @@ void MacroActionHttpEdit::DataChanged() adjustSize(); updateGeometry(); } + +} // namespace advss diff --git a/src/macro-core/macro-action-http.hpp b/src/macro-core/macro-action-http.hpp index fc5bacce..eab70abb 100644 --- a/src/macro-core/macro-action-http.hpp +++ b/src/macro-core/macro-action-http.hpp @@ -9,6 +9,8 @@ #include #include +namespace advss { + class MacroActionHttp : public MacroAction { public: MacroActionHttp(Macro *m) : MacroAction(m, true) {} @@ -85,3 +87,5 @@ private: DurationSelection *_timeout; bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-action-macro.cpp b/src/macro-core/macro-action-macro.cpp index f38389a1..8c71a944 100644 --- a/src/macro-core/macro-action-macro.cpp +++ b/src/macro-core/macro-action-macro.cpp @@ -2,6 +2,8 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + const std::string MacroActionMacro::id = "macro"; bool MacroActionMacro::_registered = MacroActionFactory::Register( @@ -177,3 +179,5 @@ void MacroActionMacroEdit::ActionChanged(int value) _macros->ShowAllMacros(); } } + +} // namespace advss diff --git a/src/macro-core/macro-action-macro.hpp b/src/macro-core/macro-action-macro.hpp index 3597c889..0cc175e3 100644 --- a/src/macro-core/macro-action-macro.hpp +++ b/src/macro-core/macro-action-macro.hpp @@ -4,6 +4,8 @@ #include +namespace advss { + enum class PerformMacroAction { PAUSE, UNPAUSE, @@ -64,3 +66,5 @@ private: QHBoxLayout *_mainLayout; bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-action-media.cpp b/src/macro-core/macro-action-media.cpp index c31d927b..36c33b31 100644 --- a/src/macro-core/macro-action-media.cpp +++ b/src/macro-core/macro-action-media.cpp @@ -2,6 +2,8 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + const std::string MacroActionMedia::id = "media"; bool MacroActionMedia::_registered = MacroActionFactory::Register( @@ -187,3 +189,5 @@ void MacroActionMediaEdit::SetWidgetVisibility() _seek->setVisible(_entryData->_action == MediaAction::SEEK); adjustSize(); } + +} // namespace advss diff --git a/src/macro-core/macro-action-media.hpp b/src/macro-core/macro-action-media.hpp index e72347dd..8e63520a 100644 --- a/src/macro-core/macro-action-media.hpp +++ b/src/macro-core/macro-action-media.hpp @@ -6,6 +6,8 @@ #include #include +namespace advss { + enum class MediaAction { PLAY, PAUSE, @@ -74,3 +76,5 @@ private: QHBoxLayout *_mainLayout; bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-action-plugin-state.cpp b/src/macro-core/macro-action-plugin-state.cpp index 4d573cce..a448a0be 100644 --- a/src/macro-core/macro-action-plugin-state.cpp +++ b/src/macro-core/macro-action-plugin-state.cpp @@ -4,6 +4,8 @@ #include +namespace advss { + const std::string MacroActionPluginState::id = "plugin_state"; bool MacroActionPluginState::_registered = MacroActionFactory::Register( @@ -263,3 +265,5 @@ void MacroActionPluginStateEdit::SetWidgetVisibility() break; } } + +} // namespace advss diff --git a/src/macro-core/macro-action-plugin-state.hpp b/src/macro-core/macro-action-plugin-state.hpp index 2b98894d..9412cf25 100644 --- a/src/macro-core/macro-action-plugin-state.hpp +++ b/src/macro-core/macro-action-plugin-state.hpp @@ -5,6 +5,8 @@ #include #include +namespace advss { + enum class PluginStateAction { STOP, NO_MATCH_BEHAVIOUR, @@ -69,3 +71,5 @@ private: void SetWidgetVisibility(); bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-action-profile.cpp b/src/macro-core/macro-action-profile.cpp index 9c1a13a8..f01e9830 100644 --- a/src/macro-core/macro-action-profile.cpp +++ b/src/macro-core/macro-action-profile.cpp @@ -2,6 +2,8 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + const std::string MacroActionProfile::id = "profile"; bool MacroActionProfile::_registered = MacroActionFactory::Register( @@ -81,3 +83,5 @@ void MacroActionProfileEdit::ProfileChanged(const QString &text) emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); } + +} // namespace advss diff --git a/src/macro-core/macro-action-profile.hpp b/src/macro-core/macro-action-profile.hpp index 84ae18b8..a8ccad01 100644 --- a/src/macro-core/macro-action-profile.hpp +++ b/src/macro-core/macro-action-profile.hpp @@ -3,6 +3,8 @@ #include +namespace advss { + class MacroActionProfile : public MacroAction { public: MacroActionProfile(Macro *m) : MacroAction(m) {} @@ -52,3 +54,5 @@ protected: private: bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-action-projector.cpp b/src/macro-core/macro-action-projector.cpp index 5dab4041..4ad76abf 100644 --- a/src/macro-core/macro-action-projector.cpp +++ b/src/macro-core/macro-action-projector.cpp @@ -4,6 +4,8 @@ #include +namespace advss { + const std::string MacroActionProjector::id = "projector"; bool MacroActionProjector::_registered = MacroActionFactory::Register( @@ -288,3 +290,5 @@ void MacroActionProjectorEdit::SetWidgetVisibility() adjustSize(); updateGeometry(); } + +} // namespace advss diff --git a/src/macro-core/macro-action-projector.hpp b/src/macro-core/macro-action-projector.hpp index dc2962f0..d3f37441 100644 --- a/src/macro-core/macro-action-projector.hpp +++ b/src/macro-core/macro-action-projector.hpp @@ -3,6 +3,8 @@ #include "scene-selection.hpp" #include "source-selection.hpp" +namespace advss { + class MacroActionProjector : public MacroAction { public: MacroActionProjector(Macro *m) : MacroAction(m) {} @@ -71,3 +73,5 @@ private: void SetWidgetVisibility(); bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-action-random.cpp b/src/macro-core/macro-action-random.cpp index 38afb0f2..4a94b433 100644 --- a/src/macro-core/macro-action-random.cpp +++ b/src/macro-core/macro-action-random.cpp @@ -4,6 +4,8 @@ #include +namespace advss { + const std::string MacroActionRandom::id = "random"; bool MacroActionRandom::_registered = MacroActionFactory::Register( @@ -203,3 +205,5 @@ bool MacroActionRandomEdit::ShouldShowAllowRepeat() } return false; } + +} // namespace advss diff --git a/src/macro-core/macro-action-random.hpp b/src/macro-core/macro-action-random.hpp index 397cf785..7b6ec418 100644 --- a/src/macro-core/macro-action-random.hpp +++ b/src/macro-core/macro-action-random.hpp @@ -6,6 +6,8 @@ #include #include +namespace advss { + class MacroActionRandom : public MultiMacroRefAction { public: MacroActionRandom(Macro *m) : MacroAction(m), MultiMacroRefAction(m) {} @@ -60,3 +62,5 @@ private: QCheckBox *_allowRepeat; bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-action-recording.cpp b/src/macro-core/macro-action-recording.cpp index a97dd465..04f50780 100644 --- a/src/macro-core/macro-action-recording.cpp +++ b/src/macro-core/macro-action-recording.cpp @@ -2,6 +2,8 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + const std::string MacroActionRecord::id = "recording"; bool MacroActionRecord::_registered = MacroActionFactory::Register( @@ -145,3 +147,5 @@ void MacroActionRecordEdit::ActionChanged(int value) _entryData->_action = static_cast(value); SetLabelVisibility(); } + +} // namespace advss diff --git a/src/macro-core/macro-action-recording.hpp b/src/macro-core/macro-action-recording.hpp index 653e7f1f..adb2567d 100644 --- a/src/macro-core/macro-action-recording.hpp +++ b/src/macro-core/macro-action-recording.hpp @@ -4,6 +4,8 @@ #include #include +namespace advss { + enum class RecordAction { STOP, START, @@ -63,3 +65,5 @@ private: QHBoxLayout *_mainLayout; bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-action-replay-buffer.cpp b/src/macro-core/macro-action-replay-buffer.cpp index f681b282..b7b4f736 100644 --- a/src/macro-core/macro-action-replay-buffer.cpp +++ b/src/macro-core/macro-action-replay-buffer.cpp @@ -2,6 +2,8 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + const std::string MacroActionReplayBuffer::id = "replay_buffer"; bool MacroActionReplayBuffer::_registered = MacroActionFactory::Register( @@ -123,3 +125,5 @@ void MacroActionReplayBufferEdit::ActionChanged(int value) ReplayBufferAction::SAVE); adjustSize(); } + +} // namespace advss diff --git a/src/macro-core/macro-action-replay-buffer.hpp b/src/macro-core/macro-action-replay-buffer.hpp index c7477303..e21974fa 100644 --- a/src/macro-core/macro-action-replay-buffer.hpp +++ b/src/macro-core/macro-action-replay-buffer.hpp @@ -4,6 +4,8 @@ #include +namespace advss { + enum class ReplayBufferAction { STOP, START, @@ -58,3 +60,5 @@ protected: private: bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-action-run.cpp b/src/macro-core/macro-action-run.cpp index 285f0a88..aaee2c9f 100644 --- a/src/macro-core/macro-action-run.cpp +++ b/src/macro-core/macro-action-run.cpp @@ -5,6 +5,8 @@ #include #include +namespace advss { + const std::string MacroActionRun::id = "run"; bool MacroActionRun::_registered = MacroActionFactory::Register( @@ -87,3 +89,5 @@ void MacroActionRunEdit::ProcessConfigChanged(const ProcessConfig &conf) emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); } + +} // namespace advss diff --git a/src/macro-core/macro-action-run.hpp b/src/macro-core/macro-action-run.hpp index 39afc8f0..ca94a2cf 100644 --- a/src/macro-core/macro-action-run.hpp +++ b/src/macro-core/macro-action-run.hpp @@ -2,6 +2,8 @@ #include "macro-action-edit.hpp" #include "process-config.hpp" +namespace advss { + class MacroActionRun : public MacroAction { public: MacroActionRun(Macro *m) : MacroAction(m) {} @@ -50,3 +52,5 @@ private: ProcessConfigEdit *_procConfig; bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-action-scene-collection.cpp b/src/macro-core/macro-action-scene-collection.cpp index 577b87a7..ec73cb2c 100644 --- a/src/macro-core/macro-action-scene-collection.cpp +++ b/src/macro-core/macro-action-scene-collection.cpp @@ -2,6 +2,8 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + const std::string MacroActionSceneCollection::id = "scene_collection"; bool MacroActionSceneCollection::_registered = MacroActionFactory::Register( @@ -115,3 +117,5 @@ void MacroActionSceneCollectionEdit::SceneCollectionChanged(const QString &text) emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); } + +} // namespace advss diff --git a/src/macro-core/macro-action-scene-collection.hpp b/src/macro-core/macro-action-scene-collection.hpp index 2ad3ac29..6969e18b 100644 --- a/src/macro-core/macro-action-scene-collection.hpp +++ b/src/macro-core/macro-action-scene-collection.hpp @@ -3,6 +3,8 @@ #include +namespace advss { + class MacroActionSceneCollection : public MacroAction { public: MacroActionSceneCollection(Macro *m) : MacroAction(m) {} @@ -53,3 +55,5 @@ protected: private: bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-action-scene-order.cpp b/src/macro-core/macro-action-scene-order.cpp index e5d6d614..c34360d4 100644 --- a/src/macro-core/macro-action-scene-order.cpp +++ b/src/macro-core/macro-action-scene-order.cpp @@ -2,6 +2,8 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + const std::string MacroActionSceneOrder::id = "scene_order"; bool MacroActionSceneOrder::_registered = MacroActionFactory::Register( @@ -250,3 +252,5 @@ void MacroActionSceneOrderEdit::PositionChanged(int value) std::lock_guard lock(switcher->m); _entryData->_position = value; } + +} // namespace advss diff --git a/src/macro-core/macro-action-scene-order.hpp b/src/macro-core/macro-action-scene-order.hpp index 5d8519af..f932953f 100644 --- a/src/macro-core/macro-action-scene-order.hpp +++ b/src/macro-core/macro-action-scene-order.hpp @@ -5,6 +5,8 @@ #include +namespace advss { + enum class SceneOrderAction { MOVE_UP, MOVE_DOWN, @@ -73,3 +75,5 @@ private: QHBoxLayout *_mainLayout; bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-action-scene-switch.cpp b/src/macro-core/macro-action-scene-switch.cpp index 5de0a331..bbe7e085 100644 --- a/src/macro-core/macro-action-scene-switch.cpp +++ b/src/macro-core/macro-action-scene-switch.cpp @@ -2,6 +2,8 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + using namespace std::chrono_literals; const std::string MacroActionSwitchScene::id = "scene_switch"; @@ -298,3 +300,5 @@ void MacroActionSwitchSceneEdit::TransitionChanged(const TransitionSelection &t) _entryData->_transition = t; SetDurationVisibility(); } + +} // namespace advss diff --git a/src/macro-core/macro-action-scene-switch.hpp b/src/macro-core/macro-action-scene-switch.hpp index 2712808a..925c8818 100644 --- a/src/macro-core/macro-action-scene-switch.hpp +++ b/src/macro-core/macro-action-scene-switch.hpp @@ -6,6 +6,8 @@ #include +namespace advss { + class MacroActionSwitchScene : public MacroAction { public: MacroActionSwitchScene(Macro *m) : MacroAction(m) {} @@ -69,3 +71,5 @@ private: void SetDurationVisibility(); bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-action-scene-transform.cpp b/src/macro-core/macro-action-scene-transform.cpp index 3896550a..30116e61 100644 --- a/src/macro-core/macro-action-scene-transform.cpp +++ b/src/macro-core/macro-action-scene-transform.cpp @@ -2,6 +2,8 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + const std::string MacroActionSceneTransform::id = "scene_transform"; bool MacroActionSceneTransform::_registered = MacroActionFactory::Register( @@ -227,3 +229,5 @@ void MacroActionSceneTransformEdit::SettingsChanged() adjustSize(); updateGeometry(); } + +} // namespace advss diff --git a/src/macro-core/macro-action-scene-transform.hpp b/src/macro-core/macro-action-scene-transform.hpp index 52906ecb..557e6f94 100644 --- a/src/macro-core/macro-action-scene-transform.hpp +++ b/src/macro-core/macro-action-scene-transform.hpp @@ -6,6 +6,8 @@ #include +namespace advss { + class MacroActionSceneTransform : public MacroAction { public: MacroActionSceneTransform(Macro *m) : MacroAction(m) {} @@ -70,3 +72,5 @@ protected: private: bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-action-scene-visibility.cpp b/src/macro-core/macro-action-scene-visibility.cpp index 4b1b56fc..0614a099 100644 --- a/src/macro-core/macro-action-scene-visibility.cpp +++ b/src/macro-core/macro-action-scene-visibility.cpp @@ -2,6 +2,8 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + const std::string MacroActionSceneVisibility::id = "scene_visibility"; bool MacroActionSceneVisibility::_registered = MacroActionFactory::Register( @@ -311,3 +313,5 @@ void MacroActionSceneVisibilityEdit::SetWidgetVisibility() SceneItemSourceType::SOURCE_GROUP); adjustSize(); } + +} // namespace advss diff --git a/src/macro-core/macro-action-scene-visibility.hpp b/src/macro-core/macro-action-scene-visibility.hpp index bb701809..02204ef5 100644 --- a/src/macro-core/macro-action-scene-visibility.hpp +++ b/src/macro-core/macro-action-scene-visibility.hpp @@ -5,6 +5,8 @@ #include +namespace advss { + enum class SceneVisibilityAction { SHOW, HIDE, @@ -81,3 +83,5 @@ private: QHBoxLayout *_mainLayout; bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-action-screenshot.cpp b/src/macro-core/macro-action-screenshot.cpp index a9608f7e..b30cfdd6 100644 --- a/src/macro-core/macro-action-screenshot.cpp +++ b/src/macro-core/macro-action-screenshot.cpp @@ -2,6 +2,8 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + const uint32_t MacroActionScreenshot::_version = 1; const std::string MacroActionScreenshot::id = "screenshot"; @@ -272,3 +274,5 @@ void MacroActionScreenshotEdit::SetWidgetVisibility() adjustSize(); } + +} // namespace advss diff --git a/src/macro-core/macro-action-screenshot.hpp b/src/macro-core/macro-action-screenshot.hpp index fde8dec1..13b6cfd1 100644 --- a/src/macro-core/macro-action-screenshot.hpp +++ b/src/macro-core/macro-action-screenshot.hpp @@ -7,6 +7,8 @@ #include +namespace advss { + class MacroActionScreenshot : public MacroAction { public: MacroActionScreenshot(Macro *m) : MacroAction(m) {} @@ -84,3 +86,5 @@ private: bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-action-sequence.cpp b/src/macro-core/macro-action-sequence.cpp index a1b842d9..50718efe 100644 --- a/src/macro-core/macro-action-sequence.cpp +++ b/src/macro-core/macro-action-sequence.cpp @@ -2,6 +2,8 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + const std::string MacroActionSequence::id = "sequence"; bool MacroActionSequence::_registered = MacroActionFactory::Register( @@ -264,3 +266,5 @@ void MacroActionSequenceEdit::UpdateStatusLine() obs_module_text("AdvSceneSwitcher.action.sequence.status")}; _statusLine->setText(format.arg(lastMacroName, nextMacroName)); } + +} // namespace advss diff --git a/src/macro-core/macro-action-sequence.hpp b/src/macro-core/macro-action-sequence.hpp index d449261f..a0db84c7 100644 --- a/src/macro-core/macro-action-sequence.hpp +++ b/src/macro-core/macro-action-sequence.hpp @@ -7,6 +7,8 @@ #include #include +namespace advss { + class MacroActionSequence : public MultiMacroRefAction { public: MacroActionSequence(Macro *m) : MacroAction(m), MultiMacroRefAction(m) @@ -70,3 +72,5 @@ private: QTimer _statusTimer; bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-action-source.cpp b/src/macro-core/macro-action-source.cpp index 49220452..62a070a9 100644 --- a/src/macro-core/macro-action-source.cpp +++ b/src/macro-core/macro-action-source.cpp @@ -2,7 +2,9 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" -Q_DECLARE_METATYPE(SourceSettingButton); +Q_DECLARE_METATYPE(advss::SourceSettingButton); + +namespace advss { const std::string MacroActionSource::id = "source"; @@ -343,3 +345,5 @@ std::string SourceSettingButton::ToString() const } return "[" + id + "] " + description; } + +} // namespace advss diff --git a/src/macro-core/macro-action-source.hpp b/src/macro-core/macro-action-source.hpp index 1f712afb..37cdedb2 100644 --- a/src/macro-core/macro-action-source.hpp +++ b/src/macro-core/macro-action-source.hpp @@ -8,6 +8,8 @@ #include #include +namespace advss { + enum class SourceAction { ENABLE, DISABLE, @@ -87,3 +89,5 @@ private: void SetWidgetVisibility(); bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-action-streaming.cpp b/src/macro-core/macro-action-streaming.cpp index 67ec6982..7e9b0e13 100644 --- a/src/macro-core/macro-action-streaming.cpp +++ b/src/macro-core/macro-action-streaming.cpp @@ -2,6 +2,8 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + const std::string MacroActionStream::id = "streaming"; bool MacroActionStream::_registered = MacroActionFactory::Register( @@ -120,3 +122,5 @@ void MacroActionStreamEdit::ActionChanged(int value) std::lock_guard lock(switcher->m); _entryData->_action = static_cast(value); } + +} // namespace advss diff --git a/src/macro-core/macro-action-streaming.hpp b/src/macro-core/macro-action-streaming.hpp index 354b05c9..29f7c38a 100644 --- a/src/macro-core/macro-action-streaming.hpp +++ b/src/macro-core/macro-action-streaming.hpp @@ -6,6 +6,8 @@ #include #include +namespace advss { + enum class StreamAction { STOP, START, @@ -61,3 +63,5 @@ private: QHBoxLayout *_mainLayout; bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-action-studio-mode.cpp b/src/macro-core/macro-action-studio-mode.cpp index a213f57f..205ffa99 100644 --- a/src/macro-core/macro-action-studio-mode.cpp +++ b/src/macro-core/macro-action-studio-mode.cpp @@ -2,6 +2,8 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + const std::string MacroActionSudioMode::id = "studio_mode"; bool MacroActionSudioMode::_registered = MacroActionFactory::Register( @@ -167,3 +169,5 @@ void MacroActionSudioModeEdit::ActionChanged(int value) emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); } + +} // namespace advss diff --git a/src/macro-core/macro-action-studio-mode.hpp b/src/macro-core/macro-action-studio-mode.hpp index dac9483b..13f7c215 100644 --- a/src/macro-core/macro-action-studio-mode.hpp +++ b/src/macro-core/macro-action-studio-mode.hpp @@ -2,6 +2,8 @@ #include "macro-action-edit.hpp" #include "scene-selection.hpp" +namespace advss { + enum class StudioModeAction { SWAP_SCENE, SET_SCENE, @@ -61,3 +63,5 @@ protected: private: bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-action-systray.cpp b/src/macro-core/macro-action-systray.cpp index b05be9da..b9ff4701 100644 --- a/src/macro-core/macro-action-systray.cpp +++ b/src/macro-core/macro-action-systray.cpp @@ -2,6 +2,8 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + const std::string MacroActionSystray::id = "systray_notification"; bool MacroActionSystray::_registered = MacroActionFactory::Register( @@ -68,3 +70,5 @@ void MacroActionSystrayEdit::MessageChanged() std::lock_guard lock(switcher->m); _entryData->_msg = _msg->text().toStdString(); } + +} // namespace advss diff --git a/src/macro-core/macro-action-systray.hpp b/src/macro-core/macro-action-systray.hpp index cc33807f..d38d35aa 100644 --- a/src/macro-core/macro-action-systray.hpp +++ b/src/macro-core/macro-action-systray.hpp @@ -3,6 +3,8 @@ #include +namespace advss { + class MacroActionSystray : public MacroAction { public: MacroActionSystray(Macro *m) : MacroAction(m) {} @@ -48,3 +50,5 @@ private: QLineEdit *_msg; bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-action-timer.cpp b/src/macro-core/macro-action-timer.cpp index e4261fca..5faa300b 100644 --- a/src/macro-core/macro-action-timer.cpp +++ b/src/macro-core/macro-action-timer.cpp @@ -5,6 +5,8 @@ #include +namespace advss { + const std::string MacroActionTimer::id = "timer"; bool MacroActionTimer::_registered = MacroActionFactory::Register( @@ -204,3 +206,5 @@ void MacroActionTimerEdit::MacroChanged(const QString &text) emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); } + +} // namespace advss diff --git a/src/macro-core/macro-action-timer.hpp b/src/macro-core/macro-action-timer.hpp index 52bd5bf2..75bee494 100644 --- a/src/macro-core/macro-action-timer.hpp +++ b/src/macro-core/macro-action-timer.hpp @@ -6,6 +6,8 @@ #include #include +namespace advss { + enum class TimerAction { PAUSE, CONTINUE, @@ -69,3 +71,5 @@ private: QHBoxLayout *_mainLayout; bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-action-transition.cpp b/src/macro-core/macro-action-transition.cpp index 86074486..842602da 100644 --- a/src/macro-core/macro-action-transition.cpp +++ b/src/macro-core/macro-action-transition.cpp @@ -2,6 +2,8 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + const std::string MacroActionTransition::id = "transition"; bool MacroActionTransition::_registered = MacroActionFactory::Register( @@ -382,3 +384,5 @@ void MacroActionTransitionEdit::SetDurationChanged(int state) _entryData->_setDuration = state; _duration->setEnabled(state); } + +} // namespace advss diff --git a/src/macro-core/macro-action-transition.hpp b/src/macro-core/macro-action-transition.hpp index fcf20950..daca5e4a 100644 --- a/src/macro-core/macro-action-transition.hpp +++ b/src/macro-core/macro-action-transition.hpp @@ -8,6 +8,8 @@ #include #include +namespace advss { + class MacroActionTransition : public MacroAction { public: MacroActionTransition(Macro *m) : MacroAction(m) {} @@ -91,3 +93,5 @@ private: bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-action-variable.cpp b/src/macro-core/macro-action-variable.cpp index a668b2c1..fb77a48f 100644 --- a/src/macro-core/macro-action-variable.cpp +++ b/src/macro-core/macro-action-variable.cpp @@ -4,6 +4,8 @@ #include "math-helpers.hpp" #include "utility.hpp" +namespace advss { + const std::string MacroActionVariable::id = "variable"; bool MacroActionVariable::_registered = MacroActionFactory::Register( @@ -833,3 +835,5 @@ void MacroActionVariableEdit::SetWidgetVisibility() adjustSize(); updateGeometry(); } + +} // namespace advss diff --git a/src/macro-core/macro-action-variable.hpp b/src/macro-core/macro-action-variable.hpp index 29e2c730..7acdb32e 100644 --- a/src/macro-core/macro-action-variable.hpp +++ b/src/macro-core/macro-action-variable.hpp @@ -4,6 +4,8 @@ #include "resizing-text-edit.hpp" #include "variable-line-edit.hpp" +namespace advss { + class MacroActionVariable : public MacroAction { public: MacroActionVariable(Macro *m) : MacroAction(m) {} @@ -134,3 +136,5 @@ private: QTimer _timer; bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-action-virtual-cam.cpp b/src/macro-core/macro-action-virtual-cam.cpp index 0c0d2d42..d200c058 100644 --- a/src/macro-core/macro-action-virtual-cam.cpp +++ b/src/macro-core/macro-action-virtual-cam.cpp @@ -2,6 +2,8 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + const std::string MacroActionVCam::id = "virtual_cam"; bool MacroActionVCam::_registered = MacroActionFactory::Register( @@ -109,3 +111,5 @@ void MacroActionVCamEdit::ActionChanged(int value) std::lock_guard lock(switcher->m); _entryData->_action = static_cast(value); } + +} // namespace advss diff --git a/src/macro-core/macro-action-virtual-cam.hpp b/src/macro-core/macro-action-virtual-cam.hpp index 93bbad4e..2bd5be2f 100644 --- a/src/macro-core/macro-action-virtual-cam.hpp +++ b/src/macro-core/macro-action-virtual-cam.hpp @@ -4,6 +4,8 @@ #include #include +namespace advss { + enum class VCamAction { STOP, START, @@ -56,3 +58,5 @@ private: QHBoxLayout *_mainLayout; bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-action-wait.cpp b/src/macro-core/macro-action-wait.cpp index 1eee9f06..e15f126f 100644 --- a/src/macro-core/macro-action-wait.cpp +++ b/src/macro-core/macro-action-wait.cpp @@ -4,6 +4,8 @@ #include +namespace advss { + const std::string MacroActionWait::id = "wait"; bool MacroActionWait::_registered = MacroActionFactory::Register( @@ -203,3 +205,5 @@ void MacroActionWaitEdit::Duration2Changed(const Duration &dur) std::lock_guard lock(switcher->m); _entryData->_duration2 = dur; } + +} // namespace advss diff --git a/src/macro-core/macro-action-wait.hpp b/src/macro-core/macro-action-wait.hpp index e601fe00..d4f6c8f9 100644 --- a/src/macro-core/macro-action-wait.hpp +++ b/src/macro-core/macro-action-wait.hpp @@ -5,6 +5,8 @@ #include #include +namespace advss { + enum class WaitType { FIXED, RANDOM, @@ -63,3 +65,5 @@ private: QHBoxLayout *_mainLayout; bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-action-websocket.cpp b/src/macro-core/macro-action-websocket.cpp index 9ef47f87..d9601603 100644 --- a/src/macro-core/macro-action-websocket.cpp +++ b/src/macro-core/macro-action-websocket.cpp @@ -2,6 +2,8 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + const std::string MacroActionWebsocket::id = "websocket"; bool MacroActionWebsocket::_registered = MacroActionFactory::Register( @@ -211,3 +213,5 @@ void MacroActionWebsocketEdit::ConnectionSelectionChanged( _entryData->_connection = GetWeakConnectionByQString(connection); emit(HeaderInfoChanged(connection)); } + +} // namespace advss diff --git a/src/macro-core/macro-action-websocket.hpp b/src/macro-core/macro-action-websocket.hpp index 491bc0bd..0b134d10 100644 --- a/src/macro-core/macro-action-websocket.hpp +++ b/src/macro-core/macro-action-websocket.hpp @@ -8,6 +8,8 @@ #include #include +namespace advss { + class MacroActionWebsocket : public MacroAction { public: MacroActionWebsocket(Macro *m) : MacroAction(m) {} @@ -74,3 +76,5 @@ private: QHBoxLayout *_editLayout; bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-action.cpp b/src/macro-core/macro-action.cpp index 2b239bff..ff00cc87 100644 --- a/src/macro-core/macro-action.cpp +++ b/src/macro-core/macro-action.cpp @@ -1,6 +1,8 @@ #include "macro-action.hpp" #include "advanced-scene-switcher.hpp" +namespace advss { + MacroAction::MacroAction(Macro *m, bool supportsVariableValue) : MacroSegment(m, supportsVariableValue) { @@ -47,3 +49,5 @@ bool MultiMacroRefAction::PostLoad() } return true; } + +} // namespace advss diff --git a/src/macro-core/macro-action.hpp b/src/macro-core/macro-action.hpp index 04317a93..7898e302 100644 --- a/src/macro-core/macro-action.hpp +++ b/src/macro-core/macro-action.hpp @@ -2,6 +2,8 @@ #include "macro-segment.hpp" #include "macro-ref.hpp" +namespace advss { + class MacroAction : public MacroSegment { public: MacroAction(Macro *m, bool supportsVariableValue = false); @@ -27,3 +29,5 @@ public: std::vector _macros; }; + +} // namespace advss diff --git a/src/macro-core/macro-condition-audio.cpp b/src/macro-core/macro-condition-audio.cpp index 8be25bd0..6bb5e5aa 100644 --- a/src/macro-core/macro-condition-audio.cpp +++ b/src/macro-core/macro-condition-audio.cpp @@ -3,6 +3,8 @@ #include "utility.hpp" #include "advanced-scene-switcher.hpp" +namespace advss { + constexpr int64_t nsPerMs = 1000000; const std::string MacroConditionAudio::id = "audio"; @@ -581,3 +583,5 @@ void MacroConditionAudioEdit::SetWidgetVisibility() MacroConditionAudio::Type::OUTPUT_VOLUME); adjustSize(); } + +} // namespace advss diff --git a/src/macro-core/macro-condition-audio.hpp b/src/macro-core/macro-condition-audio.hpp index b8a10b09..daba9f8a 100644 --- a/src/macro-core/macro-condition-audio.hpp +++ b/src/macro-core/macro-condition-audio.hpp @@ -9,6 +9,8 @@ #include #include +namespace advss { + class MacroConditionAudio : public MacroCondition { public: MacroConditionAudio(Macro *m) : MacroCondition(m, true) {} @@ -116,3 +118,5 @@ private: bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-condition-cursor.cpp b/src/macro-core/macro-condition-cursor.cpp index 58c267f3..13e716a7 100644 --- a/src/macro-core/macro-condition-cursor.cpp +++ b/src/macro-core/macro-condition-cursor.cpp @@ -5,6 +5,8 @@ #include +namespace advss { + const std::string MacroConditionCursor::id = "cursor"; bool MacroConditionCursor::_registered = MacroConditionFactory::Register( @@ -380,3 +382,5 @@ void MacroConditionCursorEdit::UpdateEntryData() _maxY->SetValue(_entryData->_maxY); SetWidgetVisibility(); } + +} // namespace advss diff --git a/src/macro-core/macro-condition-cursor.hpp b/src/macro-core/macro-condition-cursor.hpp index c58611f5..4ac641e4 100644 --- a/src/macro-core/macro-condition-cursor.hpp +++ b/src/macro-core/macro-condition-cursor.hpp @@ -8,6 +8,8 @@ #include #include +namespace advss { + class MacroConditionCursor : public MacroCondition { public: MacroConditionCursor(Macro *m) : MacroCondition(m, true) {} @@ -90,3 +92,5 @@ private: StripedFrame _frame; bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-condition-date.cpp b/src/macro-core/macro-condition-date.cpp index fd08c5f6..08d83072 100644 --- a/src/macro-core/macro-condition-date.cpp +++ b/src/macro-core/macro-condition-date.cpp @@ -5,6 +5,8 @@ #include +namespace advss { + const std::string MacroConditionDate::id = "date"; constexpr const char dateFormat[] = "yyyy MM dd hh mm ss"; @@ -743,3 +745,5 @@ void MacroConditionDateEdit::ShowSecondDateSelection(bool visible) _date2->setVisible(visible); _time2->setVisible(visible); } + +} // namespace advss diff --git a/src/macro-core/macro-condition-date.hpp b/src/macro-core/macro-condition-date.hpp index bf78e82a..53c9de35 100644 --- a/src/macro-core/macro-condition-date.hpp +++ b/src/macro-core/macro-condition-date.hpp @@ -7,6 +7,8 @@ #include #include +namespace advss { + class MacroConditionDate : public MacroCondition { public: MacroConditionDate(Macro *m) : MacroCondition(m, true) {} @@ -148,3 +150,5 @@ private: QTimer _timer; bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-condition-edit.cpp b/src/macro-core/macro-condition-edit.cpp index 84a021f8..b88496aa 100644 --- a/src/macro-core/macro-condition-edit.cpp +++ b/src/macro-core/macro-condition-edit.cpp @@ -4,6 +4,8 @@ #include "section.hpp" #include "utility.hpp" +namespace advss { + std::map &MacroConditionFactory::GetMap() { static std::map _methods; @@ -601,3 +603,5 @@ void AdvSceneSwitcher::MacroConditionReorder(int to, int from) HighlightCondition(to); emit(MacroSegmentOrderChanged()); } + +} // namespace advss diff --git a/src/macro-core/macro-condition-edit.hpp b/src/macro-core/macro-condition-edit.hpp index d951994c..68281d24 100644 --- a/src/macro-core/macro-condition-edit.hpp +++ b/src/macro-core/macro-condition-edit.hpp @@ -3,6 +3,8 @@ #include +namespace advss { + struct MacroConditionInfo { using TCreateMethod = std::shared_ptr (*)(Macro *m); using TCreateWidgetMethod = @@ -82,3 +84,5 @@ private: bool _isRoot = true; bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-condition-file.cpp b/src/macro-core/macro-condition-file.cpp index 079f5cb0..a9a702c7 100644 --- a/src/macro-core/macro-condition-file.cpp +++ b/src/macro-core/macro-condition-file.cpp @@ -8,6 +8,8 @@ #include #include +namespace advss { + const std::string MacroConditionFile::id = "file"; bool MacroConditionFile::_registered = MacroConditionFactory::Register( @@ -423,3 +425,5 @@ void MacroConditionFileEdit::SetWidgetVisibility() adjustSize(); updateGeometry(); } + +} // namespace advss diff --git a/src/macro-core/macro-condition-file.hpp b/src/macro-core/macro-condition-file.hpp index b693bc77..f1f12627 100644 --- a/src/macro-core/macro-condition-file.hpp +++ b/src/macro-core/macro-condition-file.hpp @@ -11,6 +11,8 @@ #include #include +namespace advss { + class MacroConditionFile : public MacroCondition { public: MacroConditionFile(Macro *m) : MacroCondition(m, true) {} @@ -100,3 +102,5 @@ private: bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-condition-filter.cpp b/src/macro-core/macro-condition-filter.cpp index 99d13253..54e9dce9 100644 --- a/src/macro-core/macro-condition-filter.cpp +++ b/src/macro-core/macro-condition-filter.cpp @@ -5,6 +5,8 @@ #include +namespace advss { + const std::string MacroConditionFilter::id = "filter"; bool MacroConditionFilter::_registered = MacroConditionFactory::Register( @@ -282,3 +284,5 @@ void MacroConditionFilterEdit::UpdateEntryData() adjustSize(); updateGeometry(); } + +} // namespace advss diff --git a/src/macro-core/macro-condition-filter.hpp b/src/macro-core/macro-condition-filter.hpp index a483b3de..d0b4ed4a 100644 --- a/src/macro-core/macro-condition-filter.hpp +++ b/src/macro-core/macro-condition-filter.hpp @@ -8,6 +8,8 @@ #include #include +namespace advss { + class MacroConditionFilter : public MacroCondition { public: MacroConditionFilter(Macro *m) : MacroCondition(m, true) {} @@ -83,3 +85,5 @@ private: void SetSettingsSelectionVisible(bool visible); bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-condition-hotkey.cpp b/src/macro-core/macro-condition-hotkey.cpp index e7ae0bc8..573f3452 100644 --- a/src/macro-core/macro-condition-hotkey.cpp +++ b/src/macro-core/macro-condition-hotkey.cpp @@ -3,6 +3,8 @@ #include "utility.hpp" #include "advanced-scene-switcher.hpp" +namespace advss { + const std::string MacroConditionHotkey::id = "hotkey"; bool MacroConditionHotkey::_registered = MacroConditionFactory::Register( @@ -110,3 +112,5 @@ void MacroConditionHotkeyEdit::UpdateEntryData() _name->setText( QString::fromStdString(_entryData->_hotkey->GetDescription())); } + +} // namespace advss diff --git a/src/macro-core/macro-condition-hotkey.hpp b/src/macro-core/macro-condition-hotkey.hpp index 8c8ab72f..7cd345e4 100644 --- a/src/macro-core/macro-condition-hotkey.hpp +++ b/src/macro-core/macro-condition-hotkey.hpp @@ -5,6 +5,8 @@ #include #include +namespace advss { + class MacroConditionHotkey : public MacroCondition { public: MacroConditionHotkey(Macro *m); @@ -52,3 +54,5 @@ protected: private: bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-condition-idle.cpp b/src/macro-core/macro-condition-idle.cpp index 8061fe78..70885b85 100644 --- a/src/macro-core/macro-condition-idle.cpp +++ b/src/macro-core/macro-condition-idle.cpp @@ -3,6 +3,8 @@ #include "utility.hpp" #include "advanced-scene-switcher.hpp" +namespace advss { + const std::string MacroConditionIdle::id = "idle"; bool MacroConditionIdle::_registered = MacroConditionFactory::Register( @@ -71,3 +73,5 @@ void MacroConditionIdleEdit::UpdateEntryData() _duration->SetDuration(_entryData->_duration); } + +} // namespace advss diff --git a/src/macro-core/macro-condition-idle.hpp b/src/macro-core/macro-condition-idle.hpp index f9fdf87c..55b7f6c0 100644 --- a/src/macro-core/macro-condition-idle.hpp +++ b/src/macro-core/macro-condition-idle.hpp @@ -5,6 +5,8 @@ #include #include +namespace advss { + class MacroConditionIdle : public MacroCondition { public: MacroConditionIdle(Macro *m) : MacroCondition(m, true) {} @@ -50,3 +52,5 @@ protected: private: bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-condition-macro.cpp b/src/macro-core/macro-condition-macro.cpp index d1ed31b0..a01ea2d4 100644 --- a/src/macro-core/macro-condition-macro.cpp +++ b/src/macro-core/macro-condition-macro.cpp @@ -3,6 +3,8 @@ #include "utility.hpp" #include "advanced-scene-switcher.hpp" +namespace advss { + const std::string MacroConditionMacro::id = "macro"; bool MacroConditionMacro::_registered = MacroConditionFactory::Register( @@ -578,3 +580,5 @@ void MacroConditionMacroEdit::Replace(int idx, const std::string &name) _entryData->_macros[idx] = macro; adjustSize(); } + +} // namespace advss diff --git a/src/macro-core/macro-condition-macro.hpp b/src/macro-core/macro-condition-macro.hpp index 691aed6b..7ea1d7ec 100644 --- a/src/macro-core/macro-condition-macro.hpp +++ b/src/macro-core/macro-condition-macro.hpp @@ -11,6 +11,8 @@ #include #include +namespace advss { + class MacroConditionMacro : public MultiMacroRefCondtition, public MacroRefCondition { public: @@ -121,3 +123,5 @@ private: void SetWidgetVisibility(); bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-condition-media.cpp b/src/macro-core/macro-condition-media.cpp index e7e19752..0974e897 100644 --- a/src/macro-core/macro-condition-media.cpp +++ b/src/macro-core/macro-condition-media.cpp @@ -3,6 +3,8 @@ #include "utility.hpp" #include "advanced-scene-switcher.hpp" +namespace advss { + const std::string MacroConditionMedia::id = "media"; bool MacroConditionMedia::_registered = MacroConditionFactory::Register( @@ -627,3 +629,5 @@ void MacroConditionMediaEdit::UpdateEntryData() _onChange->setChecked(_entryData->_onlyMatchOnChagne); SetWidgetVisibility(); } + +} // namespace advss diff --git a/src/macro-core/macro-condition-media.hpp b/src/macro-core/macro-condition-media.hpp index 6cdbdf73..b7d582d1 100644 --- a/src/macro-core/macro-condition-media.hpp +++ b/src/macro-core/macro-condition-media.hpp @@ -9,6 +9,8 @@ #include #include +namespace advss { + constexpr auto custom_media_states_offset = 100; class MacroConditionMedia : public MacroCondition { @@ -135,3 +137,5 @@ private: void SetWidgetVisibility(); bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-condition-obs-stats.cpp b/src/macro-core/macro-condition-obs-stats.cpp index 5a76d981..0b3f9a78 100644 --- a/src/macro-core/macro-condition-obs-stats.cpp +++ b/src/macro-core/macro-condition-obs-stats.cpp @@ -3,6 +3,8 @@ #include "utility.hpp" #include "advanced-scene-switcher.hpp" +namespace advss { + const std::string MacroConditionStats::id = "obs_stats"; bool MacroConditionStats::_registered = MacroConditionFactory::Register( @@ -588,3 +590,5 @@ void MacroConditionStatsEdit::SetWidgetVisibility() adjustSize(); } + +} // namespace advss diff --git a/src/macro-core/macro-condition-obs-stats.hpp b/src/macro-core/macro-condition-obs-stats.hpp index 52ca774d..d3603a21 100644 --- a/src/macro-core/macro-condition-obs-stats.hpp +++ b/src/macro-core/macro-condition-obs-stats.hpp @@ -5,6 +5,8 @@ #include #include +namespace advss { + class MacroConditionStats : public MacroCondition { public: MacroConditionStats(Macro *m); @@ -116,3 +118,5 @@ private: bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-condition-plugin-state.cpp b/src/macro-core/macro-condition-plugin-state.cpp index 6f2c3f1a..0080059b 100644 --- a/src/macro-core/macro-condition-plugin-state.cpp +++ b/src/macro-core/macro-condition-plugin-state.cpp @@ -3,6 +3,8 @@ #include "utility.hpp" #include "advanced-scene-switcher.hpp" +namespace advss { + const uint32_t MacroConditionPluginState::_version = 1; const std::string MacroConditionPluginState::id = "plugin_state"; @@ -165,3 +167,5 @@ void MacroConditionPluginStateEdit::UpdateEntryData() _condition->setCurrentIndex( _condition->findData(static_cast(_entryData->_condition))); } + +} // namespace advss diff --git a/src/macro-core/macro-condition-plugin-state.hpp b/src/macro-core/macro-condition-plugin-state.hpp index 42c0d3b8..10e0e2dc 100644 --- a/src/macro-core/macro-condition-plugin-state.hpp +++ b/src/macro-core/macro-condition-plugin-state.hpp @@ -3,6 +3,8 @@ #include #include +namespace advss { + class MacroConditionPluginState : public MacroCondition { public: MacroConditionPluginState(Macro *m) : MacroCondition(m) {} @@ -62,3 +64,5 @@ protected: private: bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-condition-process.cpp b/src/macro-core/macro-condition-process.cpp index 5f5fd0fa..82ee7942 100644 --- a/src/macro-core/macro-condition-process.cpp +++ b/src/macro-core/macro-condition-process.cpp @@ -5,6 +5,8 @@ #include +namespace advss { + const std::string MacroConditionProcess::id = "process"; bool MacroConditionProcess::_registered = MacroConditionFactory::Register( @@ -146,3 +148,5 @@ void MacroConditionProcessEdit::UpdateEntryData() _focused->setChecked(_entryData->_focus); SetWidgetVisibility(); } + +} // namespace advss diff --git a/src/macro-core/macro-condition-process.hpp b/src/macro-core/macro-condition-process.hpp index 72abfe0d..09cb8d1d 100644 --- a/src/macro-core/macro-condition-process.hpp +++ b/src/macro-core/macro-condition-process.hpp @@ -4,6 +4,8 @@ #include #include +namespace advss { + class MacroConditionProcess : public MacroCondition { public: MacroConditionProcess(Macro *m) : MacroCondition(m, true) {} @@ -61,3 +63,5 @@ private: bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-condition-profile.cpp b/src/macro-core/macro-condition-profile.cpp index 822c7130..0ab7a94d 100644 --- a/src/macro-core/macro-condition-profile.cpp +++ b/src/macro-core/macro-condition-profile.cpp @@ -3,6 +3,8 @@ #include "utility.hpp" #include "advanced-scene-switcher.hpp" +namespace advss { + const std::string MacroConditionProfile::id = "profile"; bool MacroConditionProfile::_registered = MacroConditionFactory::Register( @@ -81,3 +83,5 @@ void MacroConditionProfileEdit::UpdateEntryData() _profiles->setCurrentText(QString::fromStdString(_entryData->_profile)); } + +} // namespace advss diff --git a/src/macro-core/macro-condition-profile.hpp b/src/macro-core/macro-condition-profile.hpp index e119225f..cf4bff15 100644 --- a/src/macro-core/macro-condition-profile.hpp +++ b/src/macro-core/macro-condition-profile.hpp @@ -3,6 +3,8 @@ #include #include +namespace advss { + class MacroConditionProfile : public MacroCondition { public: MacroConditionProfile(Macro *m) : MacroCondition(m) {} @@ -51,3 +53,5 @@ protected: private: bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-condition-recording.cpp b/src/macro-core/macro-condition-recording.cpp index 2806b35e..d48454cc 100644 --- a/src/macro-core/macro-condition-recording.cpp +++ b/src/macro-core/macro-condition-recording.cpp @@ -3,6 +3,8 @@ #include "utility.hpp" #include "advanced-scene-switcher.hpp" +namespace advss { + const std::string MacroConditionRecord::id = "recording"; bool MacroConditionRecord::_registered = MacroConditionFactory::Register( @@ -101,3 +103,5 @@ void MacroConditionRecordEdit::UpdateEntryData() _recordState->setCurrentIndex( static_cast(_entryData->_recordState)); } + +} // namespace advss diff --git a/src/macro-core/macro-condition-recording.hpp b/src/macro-core/macro-condition-recording.hpp index 0d4d90e2..18645021 100644 --- a/src/macro-core/macro-condition-recording.hpp +++ b/src/macro-core/macro-condition-recording.hpp @@ -3,6 +3,8 @@ #include #include +namespace advss { + enum class RecordState { STOP, PAUSE, @@ -54,3 +56,5 @@ protected: private: bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-condition-replay-buffer.cpp b/src/macro-core/macro-condition-replay-buffer.cpp index 3f2f4cb6..4c57eaf8 100644 --- a/src/macro-core/macro-condition-replay-buffer.cpp +++ b/src/macro-core/macro-condition-replay-buffer.cpp @@ -3,6 +3,8 @@ #include "utility.hpp" #include "advanced-scene-switcher.hpp" +namespace advss { + const std::string MacroConditionReplayBuffer::id = "replay_buffer"; bool MacroConditionReplayBuffer::_registered = MacroConditionFactory::Register( @@ -106,3 +108,5 @@ void MacroConditionReplayBufferEdit::UpdateEntryData() _state->setCurrentIndex(static_cast(_entryData->_state)); } + +} // namespace advss diff --git a/src/macro-core/macro-condition-replay-buffer.hpp b/src/macro-core/macro-condition-replay-buffer.hpp index 137bad7d..af107ad6 100644 --- a/src/macro-core/macro-condition-replay-buffer.hpp +++ b/src/macro-core/macro-condition-replay-buffer.hpp @@ -3,6 +3,8 @@ #include #include +namespace advss { + enum class ReplayBufferState { STOP, START, @@ -55,3 +57,5 @@ protected: private: bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-condition-run.cpp b/src/macro-core/macro-condition-run.cpp index 846eb0d1..9a764935 100644 --- a/src/macro-core/macro-condition-run.cpp +++ b/src/macro-core/macro-condition-run.cpp @@ -6,6 +6,8 @@ #include #include +namespace advss { + const std::string MacroConditionRun::id = "run"; bool MacroConditionRun::_registered = MacroConditionFactory::Register( @@ -220,3 +222,5 @@ void MacroConditionRunEdit::ProcessConfigChanged(const ProcessConfig &conf) emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); } + +} // namespace advss diff --git a/src/macro-core/macro-condition-run.hpp b/src/macro-core/macro-condition-run.hpp index bb02dfc6..5fbb7d61 100644 --- a/src/macro-core/macro-condition-run.hpp +++ b/src/macro-core/macro-condition-run.hpp @@ -6,6 +6,8 @@ #include #include +namespace advss { + class MacroConditionRun : public MacroCondition { public: MacroConditionRun(Macro *m) : MacroCondition(m, true) {} @@ -77,3 +79,5 @@ protected: private: bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-condition-scene-order.cpp b/src/macro-core/macro-condition-scene-order.cpp index 75154ac4..5cc58cc7 100644 --- a/src/macro-core/macro-condition-scene-order.cpp +++ b/src/macro-core/macro-condition-scene-order.cpp @@ -3,6 +3,8 @@ #include "utility.hpp" #include "advanced-scene-switcher.hpp" +namespace advss { + const std::string MacroConditionSceneOrder::id = "scene_order"; bool MacroConditionSceneOrder::_registered = MacroConditionFactory::Register( @@ -354,3 +356,5 @@ void MacroConditionSceneOrderEdit::UpdateEntryData() SetWidgetVisibility(_entryData->_condition == MacroConditionSceneOrder::Condition::POSITION); } + +} // namespace advss diff --git a/src/macro-core/macro-condition-scene-order.hpp b/src/macro-core/macro-condition-scene-order.hpp index 63f494c6..d658802e 100644 --- a/src/macro-core/macro-condition-scene-order.hpp +++ b/src/macro-core/macro-condition-scene-order.hpp @@ -7,6 +7,8 @@ #include #include +namespace advss { + class MacroConditionSceneOrder : public MacroCondition { public: MacroConditionSceneOrder(Macro *m) : MacroCondition(m) {} @@ -77,3 +79,5 @@ private: void SetWidgetVisibility(bool showPos); bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-condition-scene-transform.cpp b/src/macro-core/macro-condition-scene-transform.cpp index 44c2d1c7..d89eb287 100644 --- a/src/macro-core/macro-condition-scene-transform.cpp +++ b/src/macro-core/macro-condition-scene-transform.cpp @@ -3,6 +3,8 @@ #include "utility.hpp" #include "advanced-scene-switcher.hpp" +namespace advss { + const std::string MacroConditionSceneTransform::id = "scene_transform"; bool MacroConditionSceneTransform::_registered = @@ -215,3 +217,5 @@ void MacroConditionSceneTransformEdit::RegexChanged(RegexConfig conf) adjustSize(); updateGeometry(); } + +} // namespace advss diff --git a/src/macro-core/macro-condition-scene-transform.hpp b/src/macro-core/macro-condition-scene-transform.hpp index 67f4bf9e..d01fca62 100644 --- a/src/macro-core/macro-condition-scene-transform.hpp +++ b/src/macro-core/macro-condition-scene-transform.hpp @@ -8,6 +8,8 @@ #include #include +namespace advss { + class MacroConditionSceneTransform : public MacroCondition { public: MacroConditionSceneTransform(Macro *m) : MacroCondition(m, true) {} @@ -70,3 +72,5 @@ protected: private: bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-condition-scene-visibility.cpp b/src/macro-core/macro-condition-scene-visibility.cpp index 5d1f743b..de097095 100644 --- a/src/macro-core/macro-condition-scene-visibility.cpp +++ b/src/macro-core/macro-condition-scene-visibility.cpp @@ -5,6 +5,8 @@ #include +namespace advss { + const std::string MacroConditionSceneVisibility::id = "scene_visibility"; bool MacroConditionSceneVisibility::_registered = @@ -234,3 +236,5 @@ void MacroConditionSceneVisibilityEdit::UpdateEntryData() } _sources->SetSceneItem(_entryData->_source); } + +} // namespace advss diff --git a/src/macro-core/macro-condition-scene-visibility.hpp b/src/macro-core/macro-condition-scene-visibility.hpp index 9e3f010d..5295d963 100644 --- a/src/macro-core/macro-condition-scene-visibility.hpp +++ b/src/macro-core/macro-condition-scene-visibility.hpp @@ -5,6 +5,8 @@ #include +namespace advss { + class MacroConditionSceneVisibility : public MacroCondition { public: MacroConditionSceneVisibility(Macro *m) : MacroCondition(m) {} @@ -69,3 +71,5 @@ protected: private: bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-condition-scene.cpp b/src/macro-core/macro-condition-scene.cpp index f411c901..6e6ee3f6 100644 --- a/src/macro-core/macro-condition-scene.cpp +++ b/src/macro-core/macro-condition-scene.cpp @@ -3,6 +3,8 @@ #include "utility.hpp" #include "advanced-scene-switcher.hpp" +namespace advss { + const std::string MacroConditionScene::id = "scene"; bool MacroConditionScene::_registered = MacroConditionFactory::Register( @@ -254,3 +256,5 @@ void MacroConditionSceneEdit::UpdateEntryData() _entryData->_useTransitionTargetScene); SetWidgetVisibility(); } + +} // namespace advss diff --git a/src/macro-core/macro-condition-scene.hpp b/src/macro-core/macro-condition-scene.hpp index b2552634..f0c072cf 100644 --- a/src/macro-core/macro-condition-scene.hpp +++ b/src/macro-core/macro-condition-scene.hpp @@ -7,6 +7,8 @@ #include #include +namespace advss { + class MacroConditionScene : public MacroCondition { public: MacroConditionScene(Macro *m) : MacroCondition(m, true) {} @@ -78,3 +80,5 @@ private: void SetWidgetVisibility(); bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-condition-source.cpp b/src/macro-core/macro-condition-source.cpp index 4b00cb66..65d39df5 100644 --- a/src/macro-core/macro-condition-source.cpp +++ b/src/macro-core/macro-condition-source.cpp @@ -3,6 +3,8 @@ #include "utility.hpp" #include "advanced-scene-switcher.hpp" +namespace advss { + const std::string MacroConditionSource::id = "source"; bool MacroConditionSource::_registered = MacroConditionFactory::Register( @@ -237,3 +239,5 @@ void MacroConditionSourceEdit::UpdateEntryData() adjustSize(); updateGeometry(); } + +} // namespace advss diff --git a/src/macro-core/macro-condition-source.hpp b/src/macro-core/macro-condition-source.hpp index 39a10d39..3010bdd0 100644 --- a/src/macro-core/macro-condition-source.hpp +++ b/src/macro-core/macro-condition-source.hpp @@ -8,6 +8,8 @@ #include #include +namespace advss { + enum class SourceCondition { ACTIVE, SHOWING, @@ -75,3 +77,5 @@ private: void SetSettingsSelectionVisible(bool visible); bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-condition-streaming.cpp b/src/macro-core/macro-condition-streaming.cpp index 36588c3f..10a9434e 100644 --- a/src/macro-core/macro-condition-streaming.cpp +++ b/src/macro-core/macro-condition-streaming.cpp @@ -3,6 +3,8 @@ #include "utility.hpp" #include "advanced-scene-switcher.hpp" +namespace advss { + const std::string MacroConditionStream::id = "streaming"; bool MacroConditionStream::_registered = MacroConditionFactory::Register( @@ -120,3 +122,5 @@ void MacroConditionStreamEdit::UpdateEntryData() _streamState->setCurrentIndex( static_cast(_entryData->_streamState)); } + +} // namespace advss diff --git a/src/macro-core/macro-condition-streaming.hpp b/src/macro-core/macro-condition-streaming.hpp index bcee7f3c..b7d82654 100644 --- a/src/macro-core/macro-condition-streaming.hpp +++ b/src/macro-core/macro-condition-streaming.hpp @@ -3,6 +3,8 @@ #include #include +namespace advss { + enum class StreamState { STOP, START, @@ -58,3 +60,5 @@ protected: private: bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-condition-studio-mode.cpp b/src/macro-core/macro-condition-studio-mode.cpp index 17d503ca..f42718e2 100644 --- a/src/macro-core/macro-condition-studio-mode.cpp +++ b/src/macro-core/macro-condition-studio-mode.cpp @@ -3,6 +3,8 @@ #include "utility.hpp" #include "advanced-scene-switcher.hpp" +namespace advss { + const std::string MacroConditionStudioMode::id = "studio_mode"; bool MacroConditionStudioMode::_registered = MacroConditionFactory::Register( @@ -155,3 +157,5 @@ void MacroConditionStudioModeEdit::SetWidgetVisibility() _scenes->setVisible(_entryData->_condition == StudioModeCondition::PREVIEW_SCENE); } + +} // namespace advss diff --git a/src/macro-core/macro-condition-studio-mode.hpp b/src/macro-core/macro-condition-studio-mode.hpp index 07fb8dbd..389ebb66 100644 --- a/src/macro-core/macro-condition-studio-mode.hpp +++ b/src/macro-core/macro-condition-studio-mode.hpp @@ -5,6 +5,8 @@ #include #include +namespace advss { + enum class StudioModeCondition { STUDIO_MODE_ACTIVE, STUDIO_MODE_NOT_ACTIVE, @@ -64,3 +66,5 @@ private: void SetWidgetVisibility(); bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-condition-timer.cpp b/src/macro-core/macro-condition-timer.cpp index d7d20ff9..4d56484a 100644 --- a/src/macro-core/macro-condition-timer.cpp +++ b/src/macro-core/macro-condition-timer.cpp @@ -3,6 +3,8 @@ #include "utility.hpp" #include "advanced-scene-switcher.hpp" +namespace advss { + const std::string MacroConditionTimer::id = "timer"; bool MacroConditionTimer::_registered = MacroConditionFactory::Register( @@ -349,3 +351,5 @@ void MacroConditionTimerEdit::SetWidgetVisibility() _duration2->hide(); } } + +} // namespace advss diff --git a/src/macro-core/macro-condition-timer.hpp b/src/macro-core/macro-condition-timer.hpp index 06319d26..73dc8158 100644 --- a/src/macro-core/macro-condition-timer.hpp +++ b/src/macro-core/macro-condition-timer.hpp @@ -10,6 +10,8 @@ #include +namespace advss { + enum class TimerType { FIXED, RANDOM, @@ -91,3 +93,5 @@ private: QTimer timer; bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-condition-transition.cpp b/src/macro-core/macro-condition-transition.cpp index 7245c280..9d46e3e1 100644 --- a/src/macro-core/macro-condition-transition.cpp +++ b/src/macro-core/macro-condition-transition.cpp @@ -3,6 +3,8 @@ #include "utility.hpp" #include "advanced-scene-switcher.hpp" +namespace advss { + const std::string MacroConditionTransition::id = "transition"; bool MacroConditionTransition::_registered = MacroConditionFactory::Register( @@ -307,3 +309,5 @@ void MacroConditionTransitionEdit::UpdateEntryData() _scenes->SetScene(_entryData->_scene); _duration->SetDuration(_entryData->_duration); } + +} // namespace advss diff --git a/src/macro-core/macro-condition-transition.hpp b/src/macro-core/macro-condition-transition.hpp index ef209d4a..adecf294 100644 --- a/src/macro-core/macro-condition-transition.hpp +++ b/src/macro-core/macro-condition-transition.hpp @@ -7,6 +7,8 @@ #include #include +namespace advss { + enum class TransitionCondition { CURRENT, DURATION, @@ -84,3 +86,5 @@ private: void SetWidgetVisibility(); bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-condition-variable.cpp b/src/macro-core/macro-condition-variable.cpp index 2f308609..bda32ae8 100644 --- a/src/macro-core/macro-condition-variable.cpp +++ b/src/macro-core/macro-condition-variable.cpp @@ -5,6 +5,8 @@ #include +namespace advss { + const std::string MacroConditionVariable::id = "variable"; bool MacroConditionVariable::_registered = MacroConditionFactory::Register( @@ -343,3 +345,5 @@ void MacroConditionVariableEdit::SetWidgetVisibility() adjustSize(); updateGeometry(); } + +} // namespace advss diff --git a/src/macro-core/macro-condition-variable.hpp b/src/macro-core/macro-condition-variable.hpp index ac89f48c..377183af 100644 --- a/src/macro-core/macro-condition-variable.hpp +++ b/src/macro-core/macro-condition-variable.hpp @@ -9,6 +9,8 @@ #include #include +namespace advss { + class MacroConditionVariable : public MacroCondition { public: MacroConditionVariable(Macro *m) : MacroCondition(m) {} @@ -94,3 +96,5 @@ private: bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-condition-virtual-cam.cpp b/src/macro-core/macro-condition-virtual-cam.cpp index 598a7a43..ca32d6f9 100644 --- a/src/macro-core/macro-condition-virtual-cam.cpp +++ b/src/macro-core/macro-condition-virtual-cam.cpp @@ -3,6 +3,8 @@ #include "utility.hpp" #include "advanced-scene-switcher.hpp" +namespace advss { + const std::string MacroConditionVCam::id = "virtual_cam"; bool MacroConditionVCam::_registered = MacroConditionFactory::Register( @@ -101,3 +103,5 @@ void MacroConditionVCamEdit::UpdateEntryData() _states->setCurrentIndex(static_cast(_entryData->_state)); } + +} // namespace advss diff --git a/src/macro-core/macro-condition-virtual-cam.hpp b/src/macro-core/macro-condition-virtual-cam.hpp index d475cd24..8abd9e54 100644 --- a/src/macro-core/macro-condition-virtual-cam.hpp +++ b/src/macro-core/macro-condition-virtual-cam.hpp @@ -3,6 +3,8 @@ #include #include +namespace advss { + enum class VCamState { STOP, START, @@ -53,3 +55,5 @@ protected: private: bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-condition-websocket.cpp b/src/macro-core/macro-condition-websocket.cpp index b9ffd6b7..658f8858 100644 --- a/src/macro-core/macro-condition-websocket.cpp +++ b/src/macro-core/macro-condition-websocket.cpp @@ -5,6 +5,8 @@ #include +namespace advss { + const std::string MacroConditionWebsocket::id = "websocket"; bool MacroConditionWebsocket::_registered = MacroConditionFactory::Register( @@ -255,3 +257,5 @@ void MacroConditionWebsocketEdit::RegexChanged(RegexConfig conf) adjustSize(); updateGeometry(); } + +} // namespace advss diff --git a/src/macro-core/macro-condition-websocket.hpp b/src/macro-core/macro-condition-websocket.hpp index 163d53d1..8aaf9638 100644 --- a/src/macro-core/macro-condition-websocket.hpp +++ b/src/macro-core/macro-condition-websocket.hpp @@ -6,6 +6,8 @@ #include +namespace advss { + class MacroConditionWebsocket : public MacroCondition { public: MacroConditionWebsocket(Macro *m) : MacroCondition(m, true) {} @@ -73,3 +75,5 @@ private: QHBoxLayout *_editLayout; bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-condition-window.cpp b/src/macro-core/macro-condition-window.cpp index c155f411..a68ec7be 100644 --- a/src/macro-core/macro-condition-window.cpp +++ b/src/macro-core/macro-condition-window.cpp @@ -5,6 +5,8 @@ #include +namespace advss { + const std::string MacroConditionWindow::id = "window"; bool MacroConditionWindow::_registered = MacroConditionFactory::Register( @@ -246,3 +248,5 @@ void MacroConditionWindowEdit::UpdateEntryData() _windowFocusChanged->setChecked(_entryData->_windowFocusChanged); SetWidgetVisibility(); } + +} // namespace advss diff --git a/src/macro-core/macro-condition-window.hpp b/src/macro-core/macro-condition-window.hpp index b7656c5b..3c4e6aa2 100644 --- a/src/macro-core/macro-condition-window.hpp +++ b/src/macro-core/macro-condition-window.hpp @@ -4,6 +4,8 @@ #include #include +namespace advss { + class MacroConditionWindow : public MacroCondition { public: MacroConditionWindow(Macro *m) : MacroCondition(m, true) {} @@ -78,3 +80,5 @@ private: bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-core/macro-condition.cpp b/src/macro-core/macro-condition.cpp index 540cc66b..3f5f6f93 100644 --- a/src/macro-core/macro-condition.cpp +++ b/src/macro-core/macro-condition.cpp @@ -1,6 +1,8 @@ #include "macro-condition.hpp" #include "advanced-scene-switcher.hpp" +namespace advss { + const std::map MacroCondition::logicTypes = { {LogicType::NONE, {"AdvSceneSwitcher.logic.none"}}, {LogicType::AND, {"AdvSceneSwitcher.logic.and"}}, @@ -176,3 +178,5 @@ bool MultiMacroRefCondtition::PostLoad() } return true; } + +} // namespace advss diff --git a/src/macro-core/macro-condition.hpp b/src/macro-core/macro-condition.hpp index 587bbb7a..263d2289 100644 --- a/src/macro-core/macro-condition.hpp +++ b/src/macro-core/macro-condition.hpp @@ -3,6 +3,8 @@ #include "macro-ref.hpp" #include +namespace advss { + constexpr auto logic_root_offset = 100; enum class LogicType { @@ -92,3 +94,5 @@ public: std::vector _macros; }; + +} // namespace advss diff --git a/src/macro-core/macro-dock.cpp b/src/macro-core/macro-dock.cpp index c887649b..e1925278 100644 --- a/src/macro-core/macro-dock.cpp +++ b/src/macro-core/macro-dock.cpp @@ -5,6 +5,8 @@ #include #include +namespace advss { + MacroDock::MacroDock(Macro *m, QWidget *parent) : OBSDock(parent), _run(new QPushButton( @@ -99,3 +101,5 @@ void MacroDock::UpdatePauseText() ? obs_module_text("AdvSceneSwitcher.macroDock.unpause") : obs_module_text("AdvSceneSwitcher.macroDock.pause")); } + +} // namespace advss diff --git a/src/macro-core/macro-dock.hpp b/src/macro-core/macro-dock.hpp index 49deeda7..c0600f43 100644 --- a/src/macro-core/macro-dock.hpp +++ b/src/macro-core/macro-dock.hpp @@ -5,6 +5,8 @@ #include #include +namespace advss { + class Macro; class MacroDock : public OBSDock { @@ -28,3 +30,5 @@ private: Macro *_macro; }; + +} // namespace advss diff --git a/src/macro-core/macro-properties.cpp b/src/macro-core/macro-properties.cpp index be2cbbb8..37bc146a 100644 --- a/src/macro-core/macro-properties.cpp +++ b/src/macro-core/macro-properties.cpp @@ -4,6 +4,8 @@ #include #include +namespace advss { + void MacroProperties::Save(obs_data_t *obj) const { auto data = obs_data_create(); @@ -147,3 +149,5 @@ bool MacroPropertiesDialog::AskForSettings(QWidget *parent, dialog._currentMacroDockAddPauseButton->isChecked()); return true; } + +} // namespace advss diff --git a/src/macro-core/macro-properties.hpp b/src/macro-core/macro-properties.hpp index 652af3c8..492e1538 100644 --- a/src/macro-core/macro-properties.hpp +++ b/src/macro-core/macro-properties.hpp @@ -7,6 +7,8 @@ #include #include +namespace advss { + class MacroProperties { public: void Save(obs_data_t *obj) const; @@ -42,3 +44,5 @@ private: QCheckBox *_currentMacroDockAddPauseButton; QGroupBox *_dockOptions; }; + +} // namespace advss diff --git a/src/macro-core/macro-ref.cpp b/src/macro-core/macro-ref.cpp index 25fd6768..db5897df 100644 --- a/src/macro-core/macro-ref.cpp +++ b/src/macro-core/macro-ref.cpp @@ -1,6 +1,8 @@ #include "macro-ref.hpp" #include "macro.hpp" +namespace advss { + MacroRef::MacroRef(std::string name) { _macro = GetWeakMacroByName(name.c_str()); @@ -78,3 +80,5 @@ void LoadMacroList(obs_data_t *obj, std::vector ¯os, } obs_data_array_release(array); } + +} // namespace advss diff --git a/src/macro-core/macro-ref.hpp b/src/macro-core/macro-ref.hpp index 66580d8e..baea8ec1 100644 --- a/src/macro-core/macro-ref.hpp +++ b/src/macro-core/macro-ref.hpp @@ -5,6 +5,8 @@ #include #include +namespace advss { + class Macro; class MacroRef { @@ -28,3 +30,5 @@ void SaveMacroList(obs_data_t *obj, const std::vector ¯os, const std::string &name = "macros"); void LoadMacroList(obs_data_t *obj, std::vector ¯os, const std::string &name = "macros"); + +} // namespace advss diff --git a/src/macro-core/macro-segment-list.cpp b/src/macro-core/macro-segment-list.cpp index 2e162e20..fb0fef7b 100644 --- a/src/macro-core/macro-segment-list.cpp +++ b/src/macro-core/macro-segment-list.cpp @@ -10,6 +10,8 @@ #include #include +namespace advss { + MacroSegmentList::MacroSegmentList(QWidget *parent) : QScrollArea(parent), _layout(new QVBoxLayout), @@ -439,3 +441,5 @@ void MacroSegmentList::dropEvent(QDropEvent *event) #endif _dragPosition = -1; } + +} // namespace advss diff --git a/src/macro-core/macro-segment-list.hpp b/src/macro-core/macro-segment-list.hpp index e7582f23..cba3ebc9 100644 --- a/src/macro-core/macro-segment-list.hpp +++ b/src/macro-core/macro-segment-list.hpp @@ -7,6 +7,8 @@ #include #include +namespace advss { + class MacroSegmentList : public QScrollArea { Q_OBJECT @@ -59,3 +61,5 @@ private: QVBoxLayout *_contentLayout; QLabel *_helpMsg; }; + +} // namespace advss diff --git a/src/macro-core/macro-segment.cpp b/src/macro-core/macro-segment.cpp index bc8e30f2..b766ba96 100644 --- a/src/macro-core/macro-segment.cpp +++ b/src/macro-core/macro-segment.cpp @@ -10,6 +10,8 @@ #include #include +namespace advss { + MacroSegment::MacroSegment(Macro *m, bool supportsVariableValue) : _macro(m), _supportsVariableValue(supportsVariableValue) { @@ -271,3 +273,5 @@ void MacroSegmentEdit::ShowDropLine(DropLineState state) break; } } + +} // namespace advss diff --git a/src/macro-core/macro-segment.hpp b/src/macro-core/macro-segment.hpp index 96f63bef..b39c4039 100644 --- a/src/macro-core/macro-segment.hpp +++ b/src/macro-core/macro-segment.hpp @@ -5,6 +5,10 @@ #include #include +class QLabel; + +namespace advss { + class Macro; class MacroSegment { @@ -48,7 +52,6 @@ private: }; class Section; -class QLabel; class MacroSegmentEdit : public QWidget { Q_OBJECT @@ -113,3 +116,5 @@ private: friend class MacroSegmentList; }; + +} // namespace advss diff --git a/src/macro-core/macro-selection.cpp b/src/macro-core/macro-selection.cpp index 5d8d80b7..1a0e2c5e 100644 --- a/src/macro-core/macro-selection.cpp +++ b/src/macro-core/macro-selection.cpp @@ -5,6 +5,8 @@ #include #include +namespace advss { + MacroSelection::MacroSelection(QWidget *parent) : QComboBox(parent) { addItem(obs_module_text("AdvSceneSwitcher.selectMacro")); @@ -143,3 +145,5 @@ bool MacroSelectionDialog::AskForMacro(QWidget *parent, std::string ¯oName) return true; } + +} // namespace advss diff --git a/src/macro-core/macro-selection.hpp b/src/macro-core/macro-selection.hpp index 5a10a0b1..2cb9afdf 100644 --- a/src/macro-core/macro-selection.hpp +++ b/src/macro-core/macro-selection.hpp @@ -2,6 +2,8 @@ #include #include +namespace advss { + class Macro; class MacroRef; @@ -30,3 +32,5 @@ public: private: MacroSelection *_macroSelection; }; + +} // namespace advss diff --git a/src/macro-core/macro-tab.cpp b/src/macro-core/macro-tab.cpp index 43903095..92ef673f 100644 --- a/src/macro-core/macro-tab.cpp +++ b/src/macro-core/macro-tab.cpp @@ -12,6 +12,8 @@ #include #include +namespace advss { + static QMetaObject::Connection addPulse; static QTimer onChangeHighlightTimer; @@ -882,3 +884,5 @@ void AdvSceneSwitcher::HighlightControls() ResetOpacityConditionControls(); } } + +} // namespace advss diff --git a/src/macro-core/macro-tree.cpp b/src/macro-core/macro-tree.cpp index a2401f10..402f9782 100644 --- a/src/macro-core/macro-tree.cpp +++ b/src/macro-core/macro-tree.cpp @@ -14,6 +14,10 @@ #include #include +Q_DECLARE_METATYPE(std::shared_ptr); + +namespace advss { + MacroTreeItem::MacroTreeItem(MacroTree *tree, std::shared_ptr macroItem, bool highlight) : _tree(tree), _highlight(highlight), _macro(macroItem) @@ -778,8 +782,6 @@ void MacroTree::UpdateWidgets(bool force) } } -Q_DECLARE_METATYPE(std::shared_ptr); - static inline void MoveItem(std::deque> &items, std::shared_ptr &item, int to) { @@ -1220,3 +1222,5 @@ QSize MacroTreeDelegate::sizeHint(const QStyleOptionViewItem &option, return (QSize(option.widget->minimumWidth(), item->height())); } + +} // namespace advss diff --git a/src/macro-core/macro-tree.hpp b/src/macro-core/macro-tree.hpp index f6d5255b..3eac8158 100644 --- a/src/macro-core/macro-tree.hpp +++ b/src/macro-core/macro-tree.hpp @@ -11,13 +11,20 @@ #include #include -class Macro; - class QLabel; -class MacroTree; class QSpacerItem; class QHBoxLayout; +// Only used to enable applying "SourceTreeSubItemCheckBox" stylesheet +class SourceTreeSubItemCheckBox : public QCheckBox { + Q_OBJECT +}; + +namespace advss { + +class Macro; +class MacroTree; + class MacroTreeItem : public QFrame { Q_OBJECT @@ -61,11 +68,6 @@ private: friend class MacroTreeModel; }; -// Only used to enable applying "SourceTreeSubItemCheckBox" stylesheet -class SourceTreeSubItemCheckBox : public QCheckBox { - Q_OBJECT -}; - class MacroTreeModel : public QAbstractListModel { Q_OBJECT @@ -162,3 +164,5 @@ public: virtual QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override; }; + +} // namespace advss diff --git a/src/macro-core/macro.cpp b/src/macro-core/macro.cpp index e7c382a9..94d7a9ee 100644 --- a/src/macro-core/macro.cpp +++ b/src/macro-core/macro.cpp @@ -12,6 +12,8 @@ #include #include +namespace advss { + constexpr int perfLogThreshold = 300; Macro::Macro(const std::string &name, const bool addHotkey) @@ -961,3 +963,5 @@ std::weak_ptr GetWeakMacroByName(const char *name) return {}; } + +} // namespace advss diff --git a/src/macro-core/macro.hpp b/src/macro-core/macro.hpp index 33ec88e5..dc81fab0 100644 --- a/src/macro-core/macro.hpp +++ b/src/macro-core/macro.hpp @@ -13,6 +13,8 @@ #include #include +namespace advss { + constexpr auto macro_func = 10; class MacroDock; @@ -148,3 +150,5 @@ private: Macro *GetMacroByName(const char *name); Macro *GetMacroByQString(const QString &name); std::weak_ptr GetWeakMacroByName(const char *name); + +} // namespace advss diff --git a/src/macro-external/openvr/macro-condition-openvr.cpp b/src/macro-external/openvr/macro-condition-openvr.cpp index 59d0e654..3d100257 100644 --- a/src/macro-external/openvr/macro-condition-openvr.cpp +++ b/src/macro-external/openvr/macro-condition-openvr.cpp @@ -5,6 +5,8 @@ #include #include +namespace advss { + const std::string MacroConditionOpenVR::id = "openvr"; bool MacroConditionOpenVR::_registered = MacroConditionFactory::Register( @@ -322,3 +324,5 @@ void MacroConditionOpenVREdit::UpdateEntryData() _maxY->SetValue(_entryData->_maxY); _maxZ->SetValue(_entryData->_maxZ); } + +} // namespace advss diff --git a/src/macro-external/openvr/macro-condition-openvr.hpp b/src/macro-external/openvr/macro-condition-openvr.hpp index 60a65eef..f9fd13a9 100644 --- a/src/macro-external/openvr/macro-condition-openvr.hpp +++ b/src/macro-external/openvr/macro-condition-openvr.hpp @@ -6,6 +6,8 @@ #include #include +namespace advss { + class MacroConditionOpenVR : public MacroCondition { public: MacroConditionOpenVR(Macro *m) : MacroCondition(m) {} @@ -68,3 +70,5 @@ private: QTimer _timer; bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-external/video/area-selection.cpp b/src/macro-external/video/area-selection.cpp index e42a2b63..cb3b3499 100644 --- a/src/macro-external/video/area-selection.cpp +++ b/src/macro-external/video/area-selection.cpp @@ -4,7 +4,9 @@ #include #include -void advss::Size::Save(obs_data_t *obj, const char *name) const +namespace advss { + +void Size::Save(obs_data_t *obj, const char *name) const { auto data = obs_data_create(); width.Save(data, "width"); @@ -14,7 +16,7 @@ void advss::Size::Save(obs_data_t *obj, const char *name) const obs_data_release(data); } -void advss::Size::Load(obs_data_t *obj, const char *name) +void Size::Load(obs_data_t *obj, const char *name) { auto data = obs_data_get_obj(obj, name); if (!obs_data_has_user_value(data, "version")) { @@ -27,12 +29,12 @@ void advss::Size::Load(obs_data_t *obj, const char *name) obs_data_release(data); } -cv::Size advss::Size::CV() +cv::Size Size::CV() { return {width, height}; } -void advss::Area::Save(obs_data_t *obj, const char *name) const +void Area::Save(obs_data_t *obj, const char *name) const { auto data = obs_data_create(); x.Save(data, "x"); @@ -44,7 +46,7 @@ void advss::Area::Save(obs_data_t *obj, const char *name) const obs_data_release(data); } -void advss::Area::Load(obs_data_t *obj, const char *name) +void Area::Load(obs_data_t *obj, const char *name) { auto data = obs_data_get_obj(obj, name); if (!obs_data_has_user_value(data, "version")) { @@ -81,25 +83,25 @@ SizeSelection::SizeSelection(int min, int max, QWidget *parent) setLayout(layout); } -void SizeSelection::SetSize(const advss::Size &s) +void SizeSelection::SetSize(const Size &s) { _x->SetValue(s.width); _y->SetValue(s.height); } -advss::Size SizeSelection::Size() +Size SizeSelection::GetSize() { - return advss::Size{_x->Value(), _y->Value()}; + return Size{_x->Value(), _y->Value()}; } void SizeSelection::XChanged(const NumberVariable &value) { - emit SizeChanged(advss::Size{value, _y->Value()}); + emit SizeChanged(Size{value, _y->Value()}); } void SizeSelection::YChanged(const NumberVariable &value) { - emit SizeChanged(advss::Size{_x->Value(), value}); + emit SizeChanged(Size{_x->Value(), value}); } AreaSelection::AreaSelection(int min, int max, QWidget *parent) @@ -116,10 +118,8 @@ AreaSelection::AreaSelection(int min, int max, QWidget *parent) "AdvSceneSwitcher.condition.video.height")) + ":"); - connect(_x, SIGNAL(SizeChanged(advss::Size)), this, - SLOT(XSizeChanged(advss::Size))); - connect(_y, SIGNAL(SizeChanged(advss::Size)), this, - SLOT(YSizeChanged(advss::Size))); + connect(_x, SIGNAL(SizeChanged(Size)), this, SLOT(XSizeChanged(Size))); + connect(_y, SIGNAL(SizeChanged(Size)), this, SLOT(YSizeChanged(Size))); auto layout = new QVBoxLayout(); layout->setContentsMargins(0, 0, 0, 0); @@ -128,20 +128,22 @@ AreaSelection::AreaSelection(int min, int max, QWidget *parent) setLayout(layout); } -void AreaSelection::SetArea(const advss::Area &value) +void AreaSelection::SetArea(const Area &value) { _x->SetSize({value.x, value.y}); _y->SetSize({value.width, value.height}); } -void AreaSelection::XSizeChanged(advss::Size value) +void AreaSelection::XSizeChanged(Size value) { - emit AreaChanged(advss::Area{value.width, value.height, - _y->Size().width, _y->Size().height}); + emit AreaChanged(Area{value.width, value.height, _y->GetSize().width, + _y->GetSize().height}); } -void AreaSelection::YSizeChanged(advss::Size value) +void AreaSelection::YSizeChanged(Size value) { - emit AreaChanged(advss::Area{_x->Size().width, _x->Size().height, - value.width, value.height}); + emit AreaChanged(Area{_x->GetSize().width, _x->GetSize().height, + value.width, value.height}); } + +} // namespace advss diff --git a/src/macro-external/video/area-selection.hpp b/src/macro-external/video/area-selection.hpp index 38f93445..17866ab9 100644 --- a/src/macro-external/video/area-selection.hpp +++ b/src/macro-external/video/area-selection.hpp @@ -27,21 +27,19 @@ struct Area { NumberVariable height; }; -} - class SizeSelection : public QWidget { Q_OBJECT public: SizeSelection(int min, int max, QWidget *parent = 0); - void SetSize(const advss::Size &); - advss::Size Size(); + void SetSize(const Size &); + Size GetSize(); private slots: void XChanged(const NumberVariable &); void YChanged(const NumberVariable &); signals: - void SizeChanged(advss::Size value); + void SizeChanged(Size value); private: VariableSpinBox *_x; @@ -55,15 +53,17 @@ class AreaSelection : public QWidget { public: AreaSelection(int min, int max, QWidget *parent = 0); - void SetArea(const advss::Area &); + void SetArea(const Area &); private slots: - void XSizeChanged(advss::Size value); - void YSizeChanged(advss::Size value); + void XSizeChanged(Size value); + void YSizeChanged(Size value); signals: - void AreaChanged(advss::Area value); + void AreaChanged(Area value); private: SizeSelection *_x; SizeSelection *_y; }; + +} // namespace advss diff --git a/src/macro-external/video/macro-condition-video.cpp b/src/macro-external/video/macro-condition-video.cpp index c0eb40ff..004e2170 100644 --- a/src/macro-external/video/macro-condition-video.cpp +++ b/src/macro-external/video/macro-condition-video.cpp @@ -12,6 +12,8 @@ #include #include +namespace advss { + const std::string MacroConditionVideo::id = "video"; bool MacroConditionVideo::_registered = MacroConditionFactory::Register( @@ -1294,3 +1296,5 @@ void MacroConditionVideoEdit::UpdateEntryData() SetupPreviewDialogParams(); SetWidgetVisibility(); } + +} // namespace advss diff --git a/src/macro-external/video/macro-condition-video.hpp b/src/macro-external/video/macro-condition-video.hpp index 83a01c07..abb85e43 100644 --- a/src/macro-external/video/macro-condition-video.hpp +++ b/src/macro-external/video/macro-condition-video.hpp @@ -18,6 +18,8 @@ #include #include +namespace advss { + class PreviewDialog; class MacroConditionVideo : public MacroCondition { @@ -200,3 +202,5 @@ private: std::shared_ptr _entryData; bool _loading = true; }; + +} // namespace advss diff --git a/src/macro-external/video/opencv-helpers.cpp b/src/macro-external/video/opencv-helpers.cpp index dffeec02..937b7dd5 100644 --- a/src/macro-external/video/opencv-helpers.cpp +++ b/src/macro-external/video/opencv-helpers.cpp @@ -1,5 +1,7 @@ #include "opencv-helpers.hpp" +namespace advss { + PatternImageData createPatternData(QImage &pattern) { PatternImageData data{}; @@ -186,3 +188,5 @@ QImage MatToQImage(const cv::Mat &mat) return QImage(mat.data, mat.cols, mat.rows, QImage::Format::Format_RGBA8888); } + +} // namespace advss diff --git a/src/macro-external/video/opencv-helpers.hpp b/src/macro-external/video/opencv-helpers.hpp index 984134ae..d6dd3253 100644 --- a/src/macro-external/video/opencv-helpers.hpp +++ b/src/macro-external/video/opencv-helpers.hpp @@ -35,6 +35,8 @@ public: } #endif +namespace advss { + constexpr int minMinNeighbors = 3; constexpr int maxMinNeighbors = 6; constexpr double defaultScaleFactor = 1.1; @@ -60,3 +62,5 @@ cv::Mat preprocessForOCR(const QImage &image, const QColor &color); std::string runOCR(tesseract::TessBaseAPI *, const QImage &, const QColor &); cv::Mat QImageToMat(const QImage &img); QImage MatToQImage(const cv::Mat &mat); + +} // namespace advss diff --git a/src/macro-external/video/paramerter-wrappers.cpp b/src/macro-external/video/paramerter-wrappers.cpp index 0eb28ec9..30b2bcae 100644 --- a/src/macro-external/video/paramerter-wrappers.cpp +++ b/src/macro-external/video/paramerter-wrappers.cpp @@ -1,5 +1,7 @@ #include "paramerter-wrappers.hpp" +namespace advss { + bool PatternMatchParameters::Save(obs_data_t *obj) const { auto data = obs_data_create(); @@ -312,3 +314,5 @@ void OCRParameters::Setup() } initDone = true; } + +} // namespace advss diff --git a/src/macro-external/video/paramerter-wrappers.hpp b/src/macro-external/video/paramerter-wrappers.hpp index 87c5680b..f62a5fdd 100644 --- a/src/macro-external/video/paramerter-wrappers.hpp +++ b/src/macro-external/video/paramerter-wrappers.hpp @@ -16,6 +16,8 @@ #include #endif +namespace advss { + enum class VideoCondition { MATCH, DIFFER, @@ -102,8 +104,6 @@ private: bool initDone = false; }; -Q_DECLARE_METATYPE(OCRParameters) - class AreaParamters { public: bool Save(obs_data_t *obj) const; @@ -112,3 +112,7 @@ public: bool enable = false; advss::Area area{0, 0, 0, 0}; }; + +} // namespace advss + +Q_DECLARE_METATYPE(advss::OCRParameters) \ No newline at end of file diff --git a/src/macro-external/video/preview-dialog.cpp b/src/macro-external/video/preview-dialog.cpp index 6e2fe92c..48dfa81c 100644 --- a/src/macro-external/video/preview-dialog.cpp +++ b/src/macro-external/video/preview-dialog.cpp @@ -5,6 +5,8 @@ #include +namespace advss { + PreviewDialog::PreviewDialog(QWidget *parent) : QDialog(parent), _scrollArea(new QScrollArea), @@ -329,3 +331,5 @@ void PreviewImage::MarkMatch(QImage &screenshot, // TODO: show preprocessed image } } + +} // namespace advss diff --git a/src/macro-external/video/preview-dialog.hpp b/src/macro-external/video/preview-dialog.hpp index 470a6106..89ddfd20 100644 --- a/src/macro-external/video/preview-dialog.hpp +++ b/src/macro-external/video/preview-dialog.hpp @@ -10,6 +10,8 @@ #include #include +namespace advss { + enum class PreviewType { SHOW_MATCH, SELECT_AREA, @@ -90,3 +92,5 @@ private: std::mutex _mtx; QThread _thread; }; + +} // namespace advss diff --git a/src/osx/advanced-scene-switcher-osx.mm b/src/osx/advanced-scene-switcher-osx.mm index b19fe630..4728f3c7 100644 --- a/src/osx/advanced-scene-switcher-osx.mm +++ b/src/osx/advanced-scene-switcher-osx.mm @@ -13,6 +13,8 @@ #include #include +namespace advss { + bool canSimulateKeyPresses = false; std::chrono::high_resolution_clock::time_point lastMouseLeftClickTime{}; @@ -453,3 +455,5 @@ void PressKeys(const std::vector keys, int duration) void PlatformCleanup() {} void PlatformInit() {} + +} // namespace advss diff --git a/src/platform-funcs.hpp b/src/platform-funcs.hpp index 8f8a1196..2825ea77 100644 --- a/src/platform-funcs.hpp +++ b/src/platform-funcs.hpp @@ -4,6 +4,8 @@ #include #include +namespace advss { + enum class HotkeyType; // TODO: Implement for MacOS and Linux @@ -23,3 +25,5 @@ bool isInFocus(const QString &executable); void PressKeys(const std::vector keys, int duration); void PlatformInit(); void PlatformCleanup(); + +} // namespace advss diff --git a/src/scene-group.cpp b/src/scene-group.cpp index f59bb3e1..2b25950e 100644 --- a/src/scene-group.cpp +++ b/src/scene-group.cpp @@ -6,6 +6,8 @@ #include "name-dialog.hpp" #include "utility.hpp" +namespace advss { + static QMetaObject::Connection addPulse; SceneGroupEditWidget *typeEdit = nullptr; @@ -705,3 +707,5 @@ SceneGroup *GetSceneGroupByQString(const QString &name) { return GetSceneGroupByName(name.toUtf8().constData()); } + +} // namespace advss diff --git a/src/scene-group.hpp b/src/scene-group.hpp index 5aaa9580..f3c7024b 100644 --- a/src/scene-group.hpp +++ b/src/scene-group.hpp @@ -10,6 +10,8 @@ #include #include +namespace advss { + auto constexpr invalid_scene_group_name = "invalid-scene-group"; enum class AdvanceCondition { @@ -85,3 +87,5 @@ private: SceneGroup *GetSceneGroupByName(const char *name); SceneGroup *GetSceneGroupByQString(const QString &name); + +} // namespace advss diff --git a/src/status-control.cpp b/src/status-control.cpp index ccb84f62..69140860 100644 --- a/src/status-control.cpp +++ b/src/status-control.cpp @@ -7,6 +7,8 @@ #include #include +namespace advss { + StatusDock *dock = nullptr; StatusControl::StatusControl(QWidget *parent, bool noLayout) @@ -159,3 +161,5 @@ void SetupDock() dock->setVisible(false); obs_frontend_add_dock(dock); } + +} // namespace advss diff --git a/src/status-control.hpp b/src/status-control.hpp index 166f3204..952a97fb 100644 --- a/src/status-control.hpp +++ b/src/status-control.hpp @@ -7,6 +7,8 @@ #include #include +namespace advss { + class StatusControl : public QWidget { Q_OBJECT @@ -43,3 +45,5 @@ public: }; void SetupDock(); + +} // namespace advss diff --git a/src/switcher-data-structs.cpp b/src/switcher-data-structs.cpp index 537eed8b..709f06e3 100644 --- a/src/switcher-data-structs.cpp +++ b/src/switcher-data-structs.cpp @@ -1,6 +1,8 @@ #include "switcher-data-structs.hpp" #include "utility.hpp" +namespace advss { + void SwitcherData::Prune() { for (size_t i = 0; i < windowSwitches.size(); i++) { @@ -140,3 +142,5 @@ void SwitcherData::addResetForNextIntervalFunction( std::lock_guard lock(switcher->m); resetForNextIntervalFuncs.emplace_back(function); } + +} // namespace advss diff --git a/src/switcher-data-structs.hpp b/src/switcher-data-structs.hpp index 465a3344..eaa5e0b6 100644 --- a/src/switcher-data-structs.hpp +++ b/src/switcher-data-structs.hpp @@ -31,6 +31,8 @@ #include #include +namespace advss { + constexpr auto default_interval = 300; constexpr auto previous_scene_name = "Previous Scene"; constexpr auto current_transition_name = "Current Transition"; @@ -365,3 +367,5 @@ public: explicit SwitcherThread(){}; void run() { switcher->Thread(); }; }; + +} // namespace advss diff --git a/src/utils/connection-manager.cpp b/src/utils/connection-manager.cpp index 732ec2b6..e39d0481 100644 --- a/src/utils/connection-manager.cpp +++ b/src/utils/connection-manager.cpp @@ -9,7 +9,9 @@ #include #include -Q_DECLARE_METATYPE(Connection *); +Q_DECLARE_METATYPE(advss::Connection *); + +namespace advss { void SwitcherData::saveConnections(obs_data_t *obj) { @@ -419,3 +421,5 @@ void Connection::Save(obs_data_t *obj) const obs_data_set_bool(obj, "reconnect", _reconnect); obs_data_set_int(obj, "reconnectDelay", _reconnectDelay); } + +} // namespace advss diff --git a/src/utils/connection-manager.hpp b/src/utils/connection-manager.hpp index 8020dc00..4285decc 100644 --- a/src/utils/connection-manager.hpp +++ b/src/utils/connection-manager.hpp @@ -15,6 +15,8 @@ #include #include +namespace advss { + class ConnectionSelection; class ConnectionSettingsDialog; @@ -97,3 +99,5 @@ public: void SetConnection(const std::string &); void SetConnection(const std::weak_ptr &); }; + +} // namespace advss diff --git a/src/utils/curl-helper.cpp b/src/utils/curl-helper.cpp index b884231a..ba125c95 100644 --- a/src/utils/curl-helper.cpp +++ b/src/utils/curl-helper.cpp @@ -5,6 +5,8 @@ #include #include +namespace advss { + #if defined(WIN32) constexpr auto curl_library_name = "libcurl.dll"; #elif __APPLE__ @@ -108,3 +110,5 @@ bool Curlhelper::Resolve() blog(LOG_INFO, "[adv-ss] curl symbols not resolved"); return false; } + +} // namespace advss diff --git a/src/utils/curl-helper.hpp b/src/utils/curl-helper.hpp index e7db3821..923f273a 100644 --- a/src/utils/curl-helper.hpp +++ b/src/utils/curl-helper.hpp @@ -2,6 +2,8 @@ #include #include +namespace advss { + typedef CURL *(*initFunction)(void); typedef void (*cleanupFunction)(CURL *); typedef CURLcode (*setOptFunction)(CURL *, CURLoption, ...); @@ -42,3 +44,5 @@ inline CURLcode Curlhelper::SetOpt(CURLoption option, Args... args) } return _setopt(_curl, option, args...); } + +} // namespace advss diff --git a/src/utils/duration-control.cpp b/src/utils/duration-control.cpp index bb291005..c90553b6 100644 --- a/src/utils/duration-control.cpp +++ b/src/utils/duration-control.cpp @@ -7,6 +7,8 @@ #include #include +namespace advss { + Duration::Duration(double initialValueInSeconds) : _value(initialValueInSeconds) { } @@ -223,3 +225,5 @@ void DurationSelection::_UnitChanged(int idx) (prevMultiplier / newMultiplier)); emit DurationChanged(_current); } + +} // namespace advss diff --git a/src/utils/duration-control.hpp b/src/utils/duration-control.hpp index 0a44e623..0566068d 100644 --- a/src/utils/duration-control.hpp +++ b/src/utils/duration-control.hpp @@ -8,6 +8,8 @@ #include #include +namespace advss { + class Duration { public: Duration() = default; @@ -61,3 +63,5 @@ private: Duration _current; }; + +} // namespace advss diff --git a/src/utils/file-selection.cpp b/src/utils/file-selection.cpp index 54cc06a7..7bd5a5c1 100644 --- a/src/utils/file-selection.cpp +++ b/src/utils/file-selection.cpp @@ -6,6 +6,8 @@ #include #include +namespace advss { + FileSelection::FileSelection(FileSelection::Type type, QWidget *parent) : QWidget(parent), _type(type), @@ -68,3 +70,5 @@ void FileSelection::PathChange() { emit PathChanged(_filePath->text()); } + +} // namespace advss diff --git a/src/utils/file-selection.hpp b/src/utils/file-selection.hpp index 930a29de..029eafc7 100644 --- a/src/utils/file-selection.hpp +++ b/src/utils/file-selection.hpp @@ -5,6 +5,8 @@ #include #include +namespace advss { + class FileSelection : public QWidget { Q_OBJECT @@ -33,3 +35,5 @@ private: VariableLineEdit *_filePath; QPushButton *_browseButton; }; + +} // namespace advss diff --git a/src/utils/item-selection-helpers.cpp b/src/utils/item-selection-helpers.cpp index 769c66a2..bc3beea7 100644 --- a/src/utils/item-selection-helpers.cpp +++ b/src/utils/item-selection-helpers.cpp @@ -8,7 +8,9 @@ #include #include -Q_DECLARE_METATYPE(Item *); +Q_DECLARE_METATYPE(advss::Item *); + +namespace advss { Item::Item(std::string name) : _name(name) {} @@ -315,3 +317,5 @@ void Item::Save(obs_data_t *obj) const { obs_data_set_string(obj, "name", _name.c_str()); } + +} // namespace advss diff --git a/src/utils/item-selection-helpers.hpp b/src/utils/item-selection-helpers.hpp index a106e1f1..d89883c6 100644 --- a/src/utils/item-selection-helpers.hpp +++ b/src/utils/item-selection-helpers.hpp @@ -15,6 +15,8 @@ #include #include +namespace advss { + class ItemSelection; class ItemSettingsDialog; @@ -99,3 +101,5 @@ protected: std::string_view _selectStr; std::string_view _addStr; }; + +} // namespace advss diff --git a/src/utils/macro-list.cpp b/src/utils/macro-list.cpp index d3e0b69d..d028eb08 100644 --- a/src/utils/macro-list.cpp +++ b/src/utils/macro-list.cpp @@ -3,6 +3,8 @@ #include "macro-selection.hpp" #include "utility.hpp" +namespace advss { + MacroList::MacroList(QWidget *parent, bool allowDuplicates, bool reorder) : QWidget(parent), _list(new QListWidget()), @@ -217,3 +219,5 @@ void MacroList::SetMacroListSize() setHeightToContentHeight(_list); adjustSize(); } + +} // namespace advss diff --git a/src/utils/macro-list.hpp b/src/utils/macro-list.hpp index a3ab37db..ca371c41 100644 --- a/src/utils/macro-list.hpp +++ b/src/utils/macro-list.hpp @@ -5,6 +5,8 @@ #include #include +namespace advss { + class MacroList : public QWidget { Q_OBJECT public: @@ -42,3 +44,5 @@ private: const bool _allowDuplicates; const bool _reorder; }; + +} // namespace advss diff --git a/src/utils/math-helpers.cpp b/src/utils/math-helpers.cpp index 2e9d447b..f46d61ba 100644 --- a/src/utils/math-helpers.cpp +++ b/src/utils/math-helpers.cpp @@ -13,6 +13,8 @@ const char *obs_module_text(const char *text) typedef exprtk::expression expression_t; typedef exprtk::parser parser_t; +namespace advss { + std::variant EvalMathExpression(const std::string &expr) { expression_t expression; @@ -41,3 +43,5 @@ std::optional GetDouble(const std::string &str) } return {}; } + +} // namespace advss diff --git a/src/utils/math-helpers.hpp b/src/utils/math-helpers.hpp index 36f436e3..736cf123 100644 --- a/src/utils/math-helpers.hpp +++ b/src/utils/math-helpers.hpp @@ -3,7 +3,11 @@ #include #include +namespace advss { + std::variant EvalMathExpression(const std::string &expression); bool IsValidNumber(const std::string &); std::optional GetDouble(const std::string &); + +} // namespace advss diff --git a/src/utils/mouse-wheel-guard.cpp b/src/utils/mouse-wheel-guard.cpp index 3fc7c947..d8e55330 100644 --- a/src/utils/mouse-wheel-guard.cpp +++ b/src/utils/mouse-wheel-guard.cpp @@ -3,6 +3,8 @@ #include #include +namespace advss { + MouseWheelWidgetAdjustmentGuard::MouseWheelWidgetAdjustmentGuard(QObject *parent) : QObject(parent) { @@ -29,3 +31,5 @@ void PreventMouseWheelAdjustWithoutFocus(QWidget *w) } w->installEventFilter(new MouseWheelWidgetAdjustmentGuard(w)); } + +} // namespace advss diff --git a/src/utils/mouse-wheel-guard.hpp b/src/utils/mouse-wheel-guard.hpp index d141426a..5442e72f 100644 --- a/src/utils/mouse-wheel-guard.hpp +++ b/src/utils/mouse-wheel-guard.hpp @@ -1,6 +1,8 @@ #pragma once #include +namespace advss { + class MouseWheelWidgetAdjustmentGuard : public QObject { public: explicit MouseWheelWidgetAdjustmentGuard(QObject *parent); @@ -10,3 +12,5 @@ protected: }; void PreventMouseWheelAdjustWithoutFocus(QWidget *); + +} // namespace advss diff --git a/src/utils/name-dialog.cpp b/src/utils/name-dialog.cpp index 91f241fe..c3ffb250 100644 --- a/src/utils/name-dialog.cpp +++ b/src/utils/name-dialog.cpp @@ -2,6 +2,8 @@ #include #include "name-dialog.hpp" +namespace advss { + AdvSSNameDialog::AdvSSNameDialog(QWidget *parent) : QDialog(parent) { setModal(true); @@ -67,3 +69,5 @@ bool AdvSSNameDialog::AskForName(QWidget *parent, const QString &title, } return true; } + +} // namespace advss diff --git a/src/utils/name-dialog.hpp b/src/utils/name-dialog.hpp index fa858b04..0cf9cdb0 100644 --- a/src/utils/name-dialog.hpp +++ b/src/utils/name-dialog.hpp @@ -4,6 +4,8 @@ #include #include +namespace advss { + // Based on OBS's NameDialog class AdvSSNameDialog : public QDialog { Q_OBJECT @@ -22,3 +24,5 @@ private: QLabel *label; QLineEdit *userText; }; + +} // namespace advss diff --git a/src/utils/process-config.cpp b/src/utils/process-config.cpp index a289461c..d1f75ed0 100644 --- a/src/utils/process-config.cpp +++ b/src/utils/process-config.cpp @@ -5,6 +5,8 @@ #include #include +namespace advss { + bool ProcessConfig::Save(obs_data_t *obj) const { auto data = obs_data_create(); @@ -141,3 +143,5 @@ void ProcessConfigEdit::ShowAdvancedSettings(bool showAdvancedSettings) adjustSize(); updateGeometry(); } + +} // namespace advss diff --git a/src/utils/process-config.hpp b/src/utils/process-config.hpp index 4b86794c..720066f9 100644 --- a/src/utils/process-config.hpp +++ b/src/utils/process-config.hpp @@ -10,6 +10,8 @@ #include #include +namespace advss { + class ProcessConfig { public: bool Save(obs_data_t *obj) const; @@ -54,3 +56,5 @@ private: StringListEdit *_argList; FileSelection *_workingDirectory; }; + +} // namespace advss diff --git a/src/utils/regex-config.cpp b/src/utils/regex-config.cpp index 69e5651d..2411e84a 100644 --- a/src/utils/regex-config.cpp +++ b/src/utils/regex-config.cpp @@ -4,6 +4,8 @@ #include #include +namespace advss { + void RegexConfig::Save(obs_data_t *obj) const { auto data = obs_data_create(); @@ -180,3 +182,5 @@ bool RegexConfigDialog::AskForSettings(QWidget *parent, RegexConfig &settings) dialog._extendedPattern); return true; } + +} // namespace advss diff --git a/src/utils/regex-config.hpp b/src/utils/regex-config.hpp index 59b5e9a9..8d375d74 100644 --- a/src/utils/regex-config.hpp +++ b/src/utils/regex-config.hpp @@ -8,6 +8,8 @@ #include #include +namespace advss { + class RegexConfigWidget; class RegexConfigDialog; @@ -74,3 +76,5 @@ private: QCheckBox *_extendedPattern; QDialogButtonBox *_buttonbox; }; + +} // namespace advss diff --git a/src/utils/resizing-text-edit.cpp b/src/utils/resizing-text-edit.cpp index 3f2c64ba..5cac67ea 100644 --- a/src/utils/resizing-text-edit.cpp +++ b/src/utils/resizing-text-edit.cpp @@ -1,5 +1,7 @@ #include "resizing-text-edit.hpp" +namespace advss { + ResizingPlainTextEdit::ResizingPlainTextEdit(QWidget *parent, const int scrollAt, const int minLines, @@ -29,3 +31,5 @@ void ResizingPlainTextEdit::ResizeTexteditArea() adjustSize(); updateGeometry(); } + +} // namespace advss diff --git a/src/utils/resizing-text-edit.hpp b/src/utils/resizing-text-edit.hpp index 33352179..8507cc7b 100644 --- a/src/utils/resizing-text-edit.hpp +++ b/src/utils/resizing-text-edit.hpp @@ -1,6 +1,8 @@ #pragma once #include +namespace advss { + class ResizingPlainTextEdit : public QPlainTextEdit { Q_OBJECT public: @@ -16,3 +18,5 @@ private: const int _minLines; const int _paddingLines; }; + +} // namespace advss diff --git a/src/utils/scene-item-selection.cpp b/src/utils/scene-item-selection.cpp index eff02535..744fc3fb 100644 --- a/src/utils/scene-item-selection.cpp +++ b/src/utils/scene-item-selection.cpp @@ -2,6 +2,8 @@ #include +namespace advss { + constexpr std::string_view typeSaveName = "type"; constexpr std::string_view itemSaveName = "item"; constexpr std::string_view idxSaveName = "idx"; @@ -490,3 +492,5 @@ void SceneItemSelectionWidget::SetupIdxSelection(int sceneItemCount) } adjustSize(); } + +} // namespace advss diff --git a/src/utils/scene-item-selection.hpp b/src/utils/scene-item-selection.hpp index 5e90ae9f..fccd85ad 100644 --- a/src/utils/scene-item-selection.hpp +++ b/src/utils/scene-item-selection.hpp @@ -6,6 +6,8 @@ #include #include +namespace advss { + class SceneItemSelection { public: void Save(obs_data_t *obj, @@ -82,3 +84,5 @@ private: int _variablesEndIdx = -1; int _itemsEndIdx = -1; }; + +} // namespace advss diff --git a/src/utils/scene-selection.cpp b/src/utils/scene-selection.cpp index 4c4db5ba..da8aad7f 100644 --- a/src/utils/scene-selection.cpp +++ b/src/utils/scene-selection.cpp @@ -2,6 +2,8 @@ #include "advanced-scene-switcher.hpp" #include "utility.hpp" +namespace advss { + constexpr std::string_view typeSaveName = "type"; constexpr std::string_view nameSaveName = "name"; constexpr std::string_view selectionSaveName = "sceneSelection"; @@ -454,3 +456,5 @@ void SceneSelectionWidget::ItemRename(const QString &, const QString &) Reset(); blockSignals(false); } + +} // namespace advss diff --git a/src/utils/scene-selection.hpp b/src/utils/scene-selection.hpp index 811a8a26..cf9727d4 100644 --- a/src/utils/scene-selection.hpp +++ b/src/utils/scene-selection.hpp @@ -5,6 +5,8 @@ #include +namespace advss { + class SceneSelection { public: void Save(obs_data_t *obj) const; @@ -78,3 +80,5 @@ private: int _groupsEndIdx = -1; int _scenesEndIdx = -1; }; + +} // namespace advss diff --git a/src/utils/screenshot-helper.cpp b/src/utils/screenshot-helper.cpp index 227a68f3..90e0003c 100644 --- a/src/utils/screenshot-helper.cpp +++ b/src/utils/screenshot-helper.cpp @@ -3,6 +3,8 @@ #include +namespace advss { + static void ScreenshotTick(void *param, float); ScreenshotHelper::ScreenshotHelper(obs_source_t *source, bool blocking, @@ -179,3 +181,5 @@ static void ScreenshotTick(void *param, float) data->stage++; } + +} // namespace advss diff --git a/src/utils/screenshot-helper.hpp b/src/utils/screenshot-helper.hpp index 73d809b0..19cd8797 100644 --- a/src/utils/screenshot-helper.hpp +++ b/src/utils/screenshot-helper.hpp @@ -7,6 +7,8 @@ #include #include +namespace advss { + class ScreenshotHelper { public: ScreenshotHelper() = default; @@ -44,3 +46,5 @@ private: std::mutex _mutex; std::condition_variable _cv; }; + +} // namespace advss diff --git a/src/utils/section.cpp b/src/utils/section.cpp index e25eadd1..74e4b8ef 100644 --- a/src/utils/section.cpp +++ b/src/utils/section.cpp @@ -4,6 +4,8 @@ #include #include +namespace advss { + Section::Section(const int animationDuration, QWidget *parent) : QWidget(parent), _animationDuration(animationDuration) { @@ -175,3 +177,5 @@ void Section::AnimationFinish() _transitioning = false; emit AnimationFinished(); } + +} // namespace advss diff --git a/src/utils/section.hpp b/src/utils/section.hpp index 6523ba04..5fd0bd4a 100644 --- a/src/utils/section.hpp +++ b/src/utils/section.hpp @@ -7,6 +7,8 @@ #include #include +namespace advss { + class Section : public QWidget { Q_OBJECT @@ -47,3 +49,5 @@ private: int _headerHeight = 0; int _contentHeight = 0; }; + +} // namespace advss diff --git a/src/utils/slider-spinbox.cpp b/src/utils/slider-spinbox.cpp index 7e1e666b..b5850083 100644 --- a/src/utils/slider-spinbox.cpp +++ b/src/utils/slider-spinbox.cpp @@ -1,6 +1,8 @@ #include "slider-spinbox.hpp" #include +namespace advss { + SliderSpinBox::SliderSpinBox(double min, double max, const QString &label, const QString &description, QWidget *parent) : QWidget(parent), @@ -71,3 +73,5 @@ void SliderSpinBox::SetVisibility(const NumberVariable &value) { _slider->setVisible(value.IsFixedType()); } + +} // namespace advss diff --git a/src/utils/slider-spinbox.hpp b/src/utils/slider-spinbox.hpp index 1adc3a2d..e5b456c2 100644 --- a/src/utils/slider-spinbox.hpp +++ b/src/utils/slider-spinbox.hpp @@ -6,6 +6,8 @@ #include #include +namespace advss { + class SliderSpinBox : public QWidget { Q_OBJECT @@ -28,3 +30,5 @@ private: QSlider *_slider; double _scale = 100.0; }; + +} // namespace advss diff --git a/src/utils/source-selection.cpp b/src/utils/source-selection.cpp index cb23b5ca..4f9b037c 100644 --- a/src/utils/source-selection.cpp +++ b/src/utils/source-selection.cpp @@ -1,6 +1,8 @@ #include "source-selection.hpp" #include "advanced-scene-switcher.hpp" +namespace advss { + constexpr std::string_view typeSaveName = "type"; constexpr std::string_view nameSaveName = "name"; @@ -247,3 +249,5 @@ void SourceSelectionWidget::ItemRename(const QString &, const QString &) Reset(); blockSignals(false); } + +} // namespace advss diff --git a/src/utils/source-selection.hpp b/src/utils/source-selection.hpp index d16d62eb..0c0c8de3 100644 --- a/src/utils/source-selection.hpp +++ b/src/utils/source-selection.hpp @@ -5,6 +5,8 @@ #include +namespace advss { + class SourceSelection { public: void Save(obs_data_t *obj, const char *name = "source") const; @@ -66,3 +68,5 @@ private: int _variablesEndIdx = -1; int _sourcesEndIdx = -1; }; + +} // namespace advss diff --git a/src/utils/string-list.cpp b/src/utils/string-list.cpp index e8314f1e..9836476d 100644 --- a/src/utils/string-list.cpp +++ b/src/utils/string-list.cpp @@ -4,6 +4,8 @@ #include +namespace advss { + bool StringList::Save(obs_data_t *obj, const char *name, const char *elementName) const { @@ -195,3 +197,5 @@ void StringListEdit::SetListSize() adjustSize(); updateGeometry(); } + +} // namespace advss diff --git a/src/utils/string-list.hpp b/src/utils/string-list.hpp index 99426417..466f6ea0 100644 --- a/src/utils/string-list.hpp +++ b/src/utils/string-list.hpp @@ -8,6 +8,8 @@ #include #include +namespace advss { + class StringList : public QList { public: bool Save(obs_data_t *obj, const char *name, @@ -49,3 +51,5 @@ private: QString _addString; QString _addStringDescription; }; + +} // namespace advss diff --git a/src/utils/striped-frame.cpp b/src/utils/striped-frame.cpp index 1656d2de..de06a47f 100644 --- a/src/utils/striped-frame.cpp +++ b/src/utils/striped-frame.cpp @@ -2,6 +2,8 @@ #include +namespace advss { + constexpr QColor stripeColor = QColor(255, 255, 255, 50); constexpr int stripeWidth = 30; constexpr int stripeSpacing = 30; @@ -35,3 +37,5 @@ void StripedFrame::paintEvent(QPaintEvent *event) painter.translate(horizontalMoveStep, verticalMoveStep); } } + +} // namespace advss diff --git a/src/utils/striped-frame.hpp b/src/utils/striped-frame.hpp index f972bd08..560b6b47 100644 --- a/src/utils/striped-frame.hpp +++ b/src/utils/striped-frame.hpp @@ -2,6 +2,8 @@ #include #include +namespace advss { + class StripedFrame : public QFrame { public: StripedFrame(QWidget *parent = nullptr) : QFrame(parent) {} @@ -9,3 +11,5 @@ public: protected: void paintEvent(QPaintEvent *event) override; }; + +} // namespace advss diff --git a/src/utils/transition-selection.cpp b/src/utils/transition-selection.cpp index eca7e4a4..a1c872d8 100644 --- a/src/utils/transition-selection.cpp +++ b/src/utils/transition-selection.cpp @@ -1,6 +1,8 @@ #include "transition-selection.hpp" #include "advanced-scene-switcher.hpp" +namespace advss { + void TransitionSelection::Save(obs_data_t *obj, const char *name, const char *typeName) const { @@ -169,3 +171,5 @@ void TransitionSelectionWidget::SelectionChanged(const QString &name) emit TransitionChanged(t); } + +} // namespace advss diff --git a/src/utils/transition-selection.hpp b/src/utils/transition-selection.hpp index a21cfffb..a2bc5ac3 100644 --- a/src/utils/transition-selection.hpp +++ b/src/utils/transition-selection.hpp @@ -3,6 +3,8 @@ #include +namespace advss { + class TransitionSelection { public: void Save(obs_data_t *obj, const char *name = "transition", @@ -44,3 +46,5 @@ private: bool IsCurrentTransitionSelected(const QString &name); bool IsAnyTransitionSelected(const QString &name); }; + +} // namespace advss diff --git a/src/utils/utility.cpp b/src/utils/utility.cpp index ffa44951..33dd28b1 100644 --- a/src/utils/utility.cpp +++ b/src/utils/utility.cpp @@ -22,6 +22,8 @@ #include #include +namespace advss { + bool WeakSourceValid(obs_weak_source_t *ws) { obs_source_t *source = obs_weak_source_get_source(ws); @@ -1055,3 +1057,5 @@ void replaceAll(std::string &str, const std::string &from, start_pos += to.length(); } } + +} // namespace advss diff --git a/src/utils/utility.hpp b/src/utils/utility.hpp index f12031a6..863b3a00 100644 --- a/src/utils/utility.hpp +++ b/src/utils/utility.hpp @@ -13,6 +13,8 @@ #include #include "scene-group.hpp" +namespace advss { + class SceneSelection; class RegexConfig; @@ -120,3 +122,5 @@ bool doubleEquals(double left, double right, double epsilon); std::pair getCursorPos(); void replaceAll(std::string &str, const std::string &from, const std::string &to); + +} // namespace advss diff --git a/src/utils/variable-line-edit.cpp b/src/utils/variable-line-edit.cpp index 089d9122..4d696e6e 100644 --- a/src/utils/variable-line-edit.cpp +++ b/src/utils/variable-line-edit.cpp @@ -1,5 +1,7 @@ #include "variable-line-edit.hpp" +namespace advss { + VariableLineEdit::VariableLineEdit(QWidget *parent) : QLineEdit(parent) {} void VariableLineEdit::setText(const QString &string) @@ -11,3 +13,5 @@ void VariableLineEdit::setText(const StringVariable &string) { QLineEdit::setText(QString::fromStdString(string.UnresolvedValue())); } + +} // namespace advss diff --git a/src/utils/variable-line-edit.hpp b/src/utils/variable-line-edit.hpp index cb06caf8..a4a398e6 100644 --- a/src/utils/variable-line-edit.hpp +++ b/src/utils/variable-line-edit.hpp @@ -3,6 +3,8 @@ #include +namespace advss { + class VariableLineEdit : public QLineEdit { Q_OBJECT public: @@ -12,3 +14,5 @@ public: private: }; + +} // namespace advss diff --git a/src/utils/variable-number.hpp b/src/utils/variable-number.hpp index 4a92e93c..38c9ba54 100644 --- a/src/utils/variable-number.hpp +++ b/src/utils/variable-number.hpp @@ -3,6 +3,8 @@ #include +namespace advss { + template class NumberVariable { public: NumberVariable() = default; @@ -33,3 +35,5 @@ private: }; #include "variable-number.tpp" + +} // namespace advss diff --git a/src/utils/variable-spinbox.cpp b/src/utils/variable-spinbox.cpp index e6d22592..f4cea0fb 100644 --- a/src/utils/variable-spinbox.cpp +++ b/src/utils/variable-spinbox.cpp @@ -4,6 +4,8 @@ #include +namespace advss { + GenericVaraiableSpinbox::GenericVaraiableSpinbox(QWidget *parent, bool wholeNumber) : QWidget(parent), @@ -194,3 +196,5 @@ VariableDoubleSpinBox::VariableDoubleSpinBox(QWidget *parent) : GenericVaraiableSpinbox(parent, false) { } + +} // namespace advss diff --git a/src/utils/variable-spinbox.hpp b/src/utils/variable-spinbox.hpp index ff0cbc86..53852afe 100644 --- a/src/utils/variable-spinbox.hpp +++ b/src/utils/variable-spinbox.hpp @@ -6,6 +6,8 @@ #include #include +namespace advss { + class GenericVaraiableSpinbox : public QWidget { Q_OBJECT public: @@ -66,3 +68,5 @@ public: QDoubleSpinBox *SpinBox() { return _fixedValueDouble; } void setDecimals(int prec) { _fixedValueDouble->setDecimals(prec); } }; + +} // namespace advss diff --git a/src/utils/variable-string.cpp b/src/utils/variable-string.cpp index 8ebb73f4..d20fdbc6 100644 --- a/src/utils/variable-string.cpp +++ b/src/utils/variable-string.cpp @@ -3,6 +3,8 @@ #include #include +namespace advss { + void StringVariable::Resolve() { if (switcher->variables.empty()) { @@ -71,3 +73,5 @@ std::string SubstitueVariables(std::string str) } return str; } + +} // namespace advss diff --git a/src/utils/variable-string.hpp b/src/utils/variable-string.hpp index 43dc5517..a0f07190 100644 --- a/src/utils/variable-string.hpp +++ b/src/utils/variable-string.hpp @@ -4,6 +4,8 @@ #include #include +namespace advss { + // Helper class which automatically resovles variables contained in strings // when reading its value as a std::string @@ -32,6 +34,8 @@ private: std::chrono::high_resolution_clock::time_point _lastResolve{}; }; -Q_DECLARE_METATYPE(StringVariable); - std::string SubstitueVariables(std::string str); + +} // namespace advss + +Q_DECLARE_METATYPE(advss::StringVariable); \ No newline at end of file diff --git a/src/utils/variable-text-edit.cpp b/src/utils/variable-text-edit.cpp index 1d0cea6a..1d2cce52 100644 --- a/src/utils/variable-text-edit.cpp +++ b/src/utils/variable-text-edit.cpp @@ -1,6 +1,8 @@ #include "variable-text-edit.hpp" #include "switcher-data-structs.hpp" +namespace advss { + VariableTextEdit::VariableTextEdit(QWidget *parent) : ResizingPlainTextEdit(parent) { @@ -16,3 +18,5 @@ void VariableTextEdit::setPlainText(const StringVariable &string) QPlainTextEdit::setPlainText( QString::fromStdString(string.UnresolvedValue())); } + +} // namespace advss diff --git a/src/utils/variable-text-edit.hpp b/src/utils/variable-text-edit.hpp index dbe168c9..12ae5e91 100644 --- a/src/utils/variable-text-edit.hpp +++ b/src/utils/variable-text-edit.hpp @@ -2,6 +2,8 @@ #include "resizing-text-edit.hpp" #include "variable-string.hpp" +namespace advss { + class VariableTextEdit : public ResizingPlainTextEdit { Q_OBJECT public: @@ -11,3 +13,5 @@ public: private: }; + +} // namespace advss diff --git a/src/utils/variable.cpp b/src/utils/variable.cpp index 0d42c5d7..f584d053 100644 --- a/src/utils/variable.cpp +++ b/src/utils/variable.cpp @@ -4,6 +4,8 @@ #include +namespace advss { + // Keep track of the last time a variable was changed to save some work when // when resolving strings containing variables, etc. static std::chrono::high_resolution_clock::time_point lastVariableChange{}; @@ -284,3 +286,5 @@ void VariableSelection::SetVariable(const std::weak_ptr &variable_) _selection->setCurrentIndex(0); } } + +} // namespace advss diff --git a/src/utils/variable.hpp b/src/utils/variable.hpp index 83d79f3a..cf7a5ece 100644 --- a/src/utils/variable.hpp +++ b/src/utils/variable.hpp @@ -7,6 +7,8 @@ #include #include +namespace advss { + class VariableSelection; class VariableSettingsDialog; @@ -72,3 +74,5 @@ public: void SetVariable(const std::string &); void SetVariable(const std::weak_ptr &); }; + +} // namespace advss diff --git a/src/utils/volume-control.cpp b/src/utils/volume-control.cpp index 2a64d4dd..d1817fc0 100644 --- a/src/utils/volume-control.cpp +++ b/src/utils/volume-control.cpp @@ -9,6 +9,8 @@ #include #include +namespace advss { + using namespace std; #define CLAMP(x, min, max) ((x) < (min) ? (min) : ((x) > (max) ? (max) : (x))) @@ -1249,3 +1251,5 @@ void VolumeMeterTimer::timerEvent(QTimerEvent *) } } } + +} // namespace advss diff --git a/src/utils/volume-control.hpp b/src/utils/volume-control.hpp index a7d409e1..495324cf 100644 --- a/src/utils/volume-control.hpp +++ b/src/utils/volume-control.hpp @@ -11,6 +11,11 @@ #include class QPushButton; +class QLabel; +class QSlider; + +namespace advss { + class VolumeMeterTimer; class VolumeMeter : public QWidget { @@ -271,9 +276,6 @@ protected: QList volumeMeters; }; -class QLabel; -class QSlider; - class VolControl : public QWidget { Q_OBJECT @@ -338,3 +340,5 @@ public: VolumeSlider(obs_fader_t *fader, Qt::Orientation orientation, QWidget *parent = nullptr); }; + +} // namespace advss diff --git a/src/utils/websocket-helpers.cpp b/src/utils/websocket-helpers.cpp index fb18e15f..b87ee040 100644 --- a/src/utils/websocket-helpers.cpp +++ b/src/utils/websocket-helpers.cpp @@ -5,6 +5,8 @@ #include #include +namespace advss { + using websocketpp::lib::placeholders::_1; using websocketpp::lib::placeholders::_2; using websocketpp::lib::bind; @@ -83,10 +85,10 @@ WSConnection::WSConnection() : QObject(nullptr) _client.set_reuse_addr(true); #endif - _client.set_open_handler(bind(&WSConnection::OnOpen, this, ::_1)); + _client.set_open_handler(bind(&WSConnection::OnOpen, this, _1)); _client.set_message_handler( - bind(&WSConnection::OnMessage, this, ::_1, ::_2)); - _client.set_close_handler(bind(&WSConnection::OnClose, this, ::_1)); + bind(&WSConnection::OnMessage, this, _1, _2)); + _client.set_close_handler(bind(&WSConnection::OnClose, this, _1)); } WSConnection::~WSConnection() @@ -356,3 +358,5 @@ void WSConnection::OnClose(connection_hdl) blog(LOG_INFO, "client-connection to %s closed.", _uri.c_str()); _status = Status::DISCONNECTED; } + +} // namespace advss diff --git a/src/utils/websocket-helpers.hpp b/src/utils/websocket-helpers.hpp index 149f2daa..68782776 100644 --- a/src/utils/websocket-helpers.hpp +++ b/src/utils/websocket-helpers.hpp @@ -18,6 +18,8 @@ #include +namespace advss { + using websocketpp::connection_hdl; typedef websocketpp::server server; typedef websocketpp::client client; @@ -75,3 +77,5 @@ private: std::vector _messages; }; + +} // namespace advss diff --git a/src/win/advanced-scene-switcher-win.cpp b/src/win/advanced-scene-switcher-win.cpp index 17ae98de..e2542407 100644 --- a/src/win/advanced-scene-switcher-win.cpp +++ b/src/win/advanced-scene-switcher-win.cpp @@ -16,6 +16,8 @@ #include #include +namespace advss { + #define MAX_SEARCH 1000 // Hotkeys @@ -545,3 +547,5 @@ void PlatformCleanup() mouseInputFilter = nullptr; } } + +} // namespace advss diff --git a/tests/tests.cpp b/tests/tests.cpp index 01081889..3baf96e3 100644 --- a/tests/tests.cpp +++ b/tests/tests.cpp @@ -5,57 +5,57 @@ TEST_CASE("Expressions are evaluated successfully", "[math-helpers]") { - auto expressionResult = EvalMathExpression("1"); + auto expressionResult = advss::EvalMathExpression("1"); auto *doubleValuePtr = std::get_if(&expressionResult); REQUIRE(doubleValuePtr != nullptr); REQUIRE(*doubleValuePtr == 1.0); - expressionResult = EvalMathExpression("-1"); + expressionResult = advss::EvalMathExpression("-1"); doubleValuePtr = std::get_if(&expressionResult); REQUIRE(doubleValuePtr != nullptr); REQUIRE(*doubleValuePtr == -1.0); - expressionResult = EvalMathExpression("1 + 2"); + expressionResult = advss::EvalMathExpression("1 + 2"); doubleValuePtr = std::get_if(&expressionResult); REQUIRE(doubleValuePtr != nullptr); REQUIRE(*doubleValuePtr == 3.0); - expressionResult = EvalMathExpression("1 + 2 * 3"); + expressionResult = advss::EvalMathExpression("1 + 2 * 3"); doubleValuePtr = std::get_if(&expressionResult); REQUIRE(doubleValuePtr != nullptr); REQUIRE(*doubleValuePtr == 7.0); - expressionResult = EvalMathExpression("(1 + 2) * 3"); + expressionResult = advss::EvalMathExpression("(1 + 2) * 3"); doubleValuePtr = std::get_if(&expressionResult); REQUIRE(doubleValuePtr != nullptr); REQUIRE(*doubleValuePtr == 9.0); - expressionResult = EvalMathExpression("(1 - 2) * 3"); + expressionResult = advss::EvalMathExpression("(1 - 2) * 3"); doubleValuePtr = std::get_if(&expressionResult); REQUIRE(doubleValuePtr != nullptr); REQUIRE(*doubleValuePtr == -3.0); - expressionResult = EvalMathExpression("(1-2)*3"); + expressionResult = advss::EvalMathExpression("(1-2)*3"); doubleValuePtr = std::get_if(&expressionResult); REQUIRE(doubleValuePtr != nullptr); REQUIRE(*doubleValuePtr == -3.0); expressionResult = - EvalMathExpression("cos(abs(1 - sqrt(10 - 2 * 3)) - 1)"); + advss::EvalMathExpression("cos(abs(1 - sqrt(10 - 2 * 3)) - 1)"); doubleValuePtr = std::get_if(&expressionResult); REQUIRE(doubleValuePtr != nullptr); REQUIRE(*doubleValuePtr == 1.0); expressionResult = - EvalMathExpression("cos(abs(1 - sqrt(10 -2 * 3)) -1)"); + advss::EvalMathExpression("cos(abs(1 - sqrt(10 -2 * 3)) -1)"); doubleValuePtr = std::get_if(&expressionResult); REQUIRE(doubleValuePtr != nullptr); @@ -64,32 +64,32 @@ TEST_CASE("Expressions are evaluated successfully", "[math-helpers]") TEST_CASE("Invalid expressions are not evaluated", "[math-helpers]") { - auto expressionResult = EvalMathExpression(""); + auto expressionResult = advss::EvalMathExpression(""); auto *doubleValuePtr = std::get_if(&expressionResult); REQUIRE(doubleValuePtr == nullptr); - expressionResult = EvalMathExpression(")"); + expressionResult = advss::EvalMathExpression(")"); doubleValuePtr = std::get_if(&expressionResult); REQUIRE(doubleValuePtr == nullptr); - expressionResult = EvalMathExpression("("); + expressionResult = advss::EvalMathExpression("("); doubleValuePtr = std::get_if(&expressionResult); REQUIRE(doubleValuePtr == nullptr); - expressionResult = EvalMathExpression("()"); + expressionResult = advss::EvalMathExpression("()"); doubleValuePtr = std::get_if(&expressionResult); REQUIRE(doubleValuePtr == nullptr); - expressionResult = EvalMathExpression("1 + 2)"); + expressionResult = advss::EvalMathExpression("1 + 2)"); doubleValuePtr = std::get_if(&expressionResult); REQUIRE(doubleValuePtr == nullptr); - expressionResult = EvalMathExpression("1 + 2 * asdf"); + expressionResult = advss::EvalMathExpression("1 + 2 * asdf"); doubleValuePtr = std::get_if(&expressionResult); REQUIRE(doubleValuePtr == nullptr);