From 6c1eb3ffab01b0175b765e0fe8f51ded535ac232 Mon Sep 17 00:00:00 2001 From: WarmUpTill Date: Sat, 15 May 2021 00:40:43 +0200 Subject: [PATCH] Fix random order of various macro entries --- src/headers/macro.hpp | 4 ++-- src/macro-action-audio.cpp | 2 +- src/macro-action-recording.cpp | 2 +- src/macro-action-replay-buffer.cpp | 2 +- src/macro-action-streaming.cpp | 2 +- src/macro-action-wait.cpp | 2 +- src/macro-condition-audio.cpp | 2 +- src/macro-condition-media.cpp | 25 ++++++++++++------------- src/macro-condition-plugin-state.cpp | 7 +++---- src/macro-condition-recording.cpp | 2 +- src/macro-condition-scene.cpp | 2 +- src/macro-condition-streaming.cpp | 2 +- src/macro-condition-video.cpp | 2 +- src/macro.cpp | 2 +- 14 files changed, 28 insertions(+), 30 deletions(-) diff --git a/src/headers/macro.hpp b/src/headers/macro.hpp index ebd23b3a..bdc586e2 100644 --- a/src/headers/macro.hpp +++ b/src/headers/macro.hpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include @@ -42,7 +42,7 @@ public: LogicType GetLogicType() { return _logic; } void SetLogicType(LogicType logic) { _logic = logic; } - static const std::unordered_map logicTypes; + static const std::map logicTypes; private: LogicType _logic; diff --git a/src/macro-action-audio.cpp b/src/macro-action-audio.cpp index 9d7d2b53..8614e842 100644 --- a/src/macro-action-audio.cpp +++ b/src/macro-action-audio.cpp @@ -9,7 +9,7 @@ bool MacroActionAudio::_registered = MacroActionFactory::Register( {MacroActionAudio::Create, MacroActionAudioEdit::Create, "AdvSceneSwitcher.action.audio"}); -const static std::unordered_map actionTypes = { +const static std::map actionTypes = { {AudioAction::MUTE, "AdvSceneSwitcher.action.audio.type.mute"}, {AudioAction::UNMUTE, "AdvSceneSwitcher.action.audio.type.unmute"}, }; diff --git a/src/macro-action-recording.cpp b/src/macro-action-recording.cpp index 9aaccf6a..9c79ee8b 100644 --- a/src/macro-action-recording.cpp +++ b/src/macro-action-recording.cpp @@ -9,7 +9,7 @@ bool MacroActionRecord::_registered = MacroActionFactory::Register( {MacroActionRecord::Create, MacroActionRecordEdit::Create, "AdvSceneSwitcher.action.recording"}); -const static std::unordered_map actionTypes = { +const static std::map actionTypes = { {RecordAction::STOP, "AdvSceneSwitcher.action.recording.type.stop"}, {RecordAction::START, "AdvSceneSwitcher.action.recording.type.start"}, {RecordAction::PAUSE, "AdvSceneSwitcher.action.recording.type.pause"}, diff --git a/src/macro-action-replay-buffer.cpp b/src/macro-action-replay-buffer.cpp index d028c90a..942f4156 100644 --- a/src/macro-action-replay-buffer.cpp +++ b/src/macro-action-replay-buffer.cpp @@ -9,7 +9,7 @@ bool MacroActionReplayBuffer::_registered = MacroActionFactory::Register( {MacroActionReplayBuffer::Create, MacroActionReplayBufferEdit::Create, "AdvSceneSwitcher.action.replay"}); -const static std::unordered_map actionTypes = { +const static std::map actionTypes = { {ReplayBufferAction::STOP, "AdvSceneSwitcher.action.replay.type.stop"}, {ReplayBufferAction::START, "AdvSceneSwitcher.action.replay.type.start"}, diff --git a/src/macro-action-streaming.cpp b/src/macro-action-streaming.cpp index e1617ad5..09b689de 100644 --- a/src/macro-action-streaming.cpp +++ b/src/macro-action-streaming.cpp @@ -9,7 +9,7 @@ bool MacroActionStream::_registered = MacroActionFactory::Register( {MacroActionStream::Create, MacroActionStreamEdit::Create, "AdvSceneSwitcher.action.streaming"}); -const static std::unordered_map actionTypes = { +const static std::map actionTypes = { {StreamAction::STOP, "AdvSceneSwitcher.action.streaming.type.stop"}, {StreamAction::START, "AdvSceneSwitcher.action.streaming.type.start"}, }; diff --git a/src/macro-action-wait.cpp b/src/macro-action-wait.cpp index 536cd238..f30914d2 100644 --- a/src/macro-action-wait.cpp +++ b/src/macro-action-wait.cpp @@ -11,7 +11,7 @@ bool MacroActionWait::_registered = MacroActionFactory::Register( {MacroActionWait::Create, MacroActionWaitEdit::Create, "AdvSceneSwitcher.action.wait"}); -static std::unordered_map waitTypes = { +static std::map waitTypes = { {WaitType::FIXED, "AdvSceneSwitcher.action.wait.type.fixed"}, {WaitType::RANDOM, "AdvSceneSwitcher.action.wait.type.random"}, }; diff --git a/src/macro-condition-audio.cpp b/src/macro-condition-audio.cpp index d1251ceb..c25f7b96 100644 --- a/src/macro-condition-audio.cpp +++ b/src/macro-condition-audio.cpp @@ -10,7 +10,7 @@ bool MacroConditionAudio::_registered = MacroConditionFactory::Register( {MacroConditionAudio::Create, MacroConditionAudioEdit::Create, "AdvSceneSwitcher.condition.audio"}); -static std::unordered_map audioConditionTypes = { +static std::map audioConditionTypes = { {AudioCondition::ABOVE, "AdvSceneSwitcher.ondition.audio.state.above"}, {AudioCondition::BELOW, "AdvSceneSwitcher.ondition.audio.state.below"}, }; diff --git a/src/macro-condition-media.cpp b/src/macro-condition-media.cpp index fbcf44e4..828718d5 100644 --- a/src/macro-condition-media.cpp +++ b/src/macro-condition-media.cpp @@ -10,21 +10,20 @@ bool MacroConditionMedia::_registered = MacroConditionFactory::Register( {MacroConditionMedia::Create, MacroConditionMediaEdit::Create, "AdvSceneSwitcher.condition.media"}); -static std::unordered_map - mediaTimeRestrictions = { - {MediaTimeRestriction::TIME_RESTRICTION_NONE, - "AdvSceneSwitcher.mediaTab.timeRestriction.none"}, - {MediaTimeRestriction::TIME_RESTRICTION_SHORTER, - "AdvSceneSwitcher.mediaTab.timeRestriction.shorter"}, - {MediaTimeRestriction::TIME_RESTRICTION_LONGER, - "AdvSceneSwitcher.mediaTab.timeRestriction.longer"}, - {MediaTimeRestriction::TIME_RESTRICTION_REMAINING_SHORTER, - "AdvSceneSwitcher.mediaTab.timeRestriction.remainShorter"}, - {MediaTimeRestriction::TIME_RESTRICTION_REMAINING_LONGER, - "AdvSceneSwitcher.mediaTab.timeRestriction.remainLonger"}, +static std::map mediaTimeRestrictions = { + {MediaTimeRestriction::TIME_RESTRICTION_NONE, + "AdvSceneSwitcher.mediaTab.timeRestriction.none"}, + {MediaTimeRestriction::TIME_RESTRICTION_SHORTER, + "AdvSceneSwitcher.mediaTab.timeRestriction.shorter"}, + {MediaTimeRestriction::TIME_RESTRICTION_LONGER, + "AdvSceneSwitcher.mediaTab.timeRestriction.longer"}, + {MediaTimeRestriction::TIME_RESTRICTION_REMAINING_SHORTER, + "AdvSceneSwitcher.mediaTab.timeRestriction.remainShorter"}, + {MediaTimeRestriction::TIME_RESTRICTION_REMAINING_LONGER, + "AdvSceneSwitcher.mediaTab.timeRestriction.remainLonger"}, }; -static std::unordered_map mediaStates = { +static std::map mediaStates = { {MediaState::OBS_MEDIA_STATE_NONE, "AdvSceneSwitcher.mediaTab.states.none"}, {MediaState::OBS_MEDIA_STATE_PLAYING, diff --git a/src/macro-condition-plugin-state.cpp b/src/macro-condition-plugin-state.cpp index fc660116..ac69b8da 100644 --- a/src/macro-condition-plugin-state.cpp +++ b/src/macro-condition-plugin-state.cpp @@ -11,10 +11,9 @@ bool MacroConditionPluginState::_registered = MacroConditionFactory::Register( MacroConditionPluginStateEdit::Create, "AdvSceneSwitcher.condition.pluginState"}); -static std::unordered_map - pluginStateConditionTypes = { - {PluginStateCondition::SCENESWITCHED, - "AdvSceneSwitcher.condition.pluginState.state.sceneSwitched"}, +static std::map pluginStateConditionTypes = { + {PluginStateCondition::SCENESWITCHED, + "AdvSceneSwitcher.condition.pluginState.state.sceneSwitched"}, }; bool MacroConditionPluginState::CheckCondition() diff --git a/src/macro-condition-recording.cpp b/src/macro-condition-recording.cpp index f18ef38b..cd23f5ce 100644 --- a/src/macro-condition-recording.cpp +++ b/src/macro-condition-recording.cpp @@ -10,7 +10,7 @@ bool MacroConditionRecord::_registered = MacroConditionFactory::Register( {MacroConditionRecord::Create, MacroConditionRecordEdit::Create, "AdvSceneSwitcher.condition.record"}); -static std::unordered_map recordStates = { +static std::map recordStates = { {RecordState::STOP, "AdvSceneSwitcher.condition.record.state.stop"}, {RecordState::PAUSE, "AdvSceneSwitcher.condition.record.state.pause"}, {RecordState::START, "AdvSceneSwitcher.condition.record.state.start"}, diff --git a/src/macro-condition-scene.cpp b/src/macro-condition-scene.cpp index 4e19f8fa..095bb26d 100644 --- a/src/macro-condition-scene.cpp +++ b/src/macro-condition-scene.cpp @@ -10,7 +10,7 @@ bool MacroConditionScene::_registered = MacroConditionFactory::Register( {MacroConditionScene::Create, MacroConditionSceneEdit::Create, "AdvSceneSwitcher.condition.scene"}); -static std::unordered_map sceneTypes = { +static std::map sceneTypes = { {SceneType::CURRENT, "AdvSceneSwitcher.condition.scene.type.current"}, {SceneType::PREVIOUS, "AdvSceneSwitcher.condition.scene.type.previous"}, }; diff --git a/src/macro-condition-streaming.cpp b/src/macro-condition-streaming.cpp index e31116c2..3ccfed81 100644 --- a/src/macro-condition-streaming.cpp +++ b/src/macro-condition-streaming.cpp @@ -10,7 +10,7 @@ bool MacroConditionStream::_registered = MacroConditionFactory::Register( {MacroConditionStream::Create, MacroConditionStreamEdit::Create, "AdvSceneSwitcher.condition.stream"}); -static std::unordered_map streamStates = { +static std::map streamStates = { {StreamState::STOP, "AdvSceneSwitcher.condition.stream.state.stop"}, {StreamState::START, "AdvSceneSwitcher.condition.stream.state.start"}, }; diff --git a/src/macro-condition-video.cpp b/src/macro-condition-video.cpp index 9fa76aae..fa4b40a6 100644 --- a/src/macro-condition-video.cpp +++ b/src/macro-condition-video.cpp @@ -15,7 +15,7 @@ bool MacroConditionVideo::_registered = MacroConditionFactory::Register( {MacroConditionVideo::Create, MacroConditionVideoEdit::Create, "AdvSceneSwitcher.condition.video"}); -static std::unordered_map conditionTypes = { +static std::map conditionTypes = { {VideoCondition::MATCH, "AdvSceneSwitcher.condition.video.condition.match"}, {VideoCondition::DIFFER, diff --git a/src/macro.cpp b/src/macro.cpp index a333f14f..e0dda440 100644 --- a/src/macro.cpp +++ b/src/macro.cpp @@ -4,7 +4,7 @@ #include "headers/macro-condition-edit.hpp" #include "headers/macro-action-switch-scene.hpp" -const std::unordered_map MacroCondition::logicTypes = { +const std::map MacroCondition::logicTypes = { {LogicType::NONE, {"AdvSceneSwitcher.logic.none"}}, {LogicType::AND, {"AdvSceneSwitcher.logic.and"}}, {LogicType::OR, {"AdvSceneSwitcher.logic.or"}},