Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-04-18 16:17:23 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix random order of various macro entries

Browse Source
This commit is contained in:
WarmUpTill 2021-05-15 00:40:43 +02:00 committed by WarmUpTill
parent cef513f775
commit 3abeb936b3
14 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/headers/macro.hpp
View File

@ -2,7 +2,7 @@
#include <string>
#include <deque>
#include <memory>
#include <unordered_map>
#include <map>
#include <obs.hpp>
#include <obs-module.h>
@ -42,7 +42,7 @@ public:
LogicType GetLogicType() { return _logic; }
void SetLogicType(LogicType logic) { _logic = logic; }
static const std::unordered_map<LogicType, LogicTypeInfo> logicTypes;
static const std::map<LogicType, LogicTypeInfo> logicTypes;
private:
LogicType _logic;

2
src/macro-action-audio.cpp
View File

@ -9,7 +9,7 @@ bool MacroActionAudio::_registered = MacroActionFactory::Register(
{MacroActionAudio::Create, MacroActionAudioEdit::Create,
"AdvSceneSwitcher.action.audio"});
const static std::unordered_map<AudioAction, std::string> actionTypes = {
const static std::map<AudioAction, std::string> actionTypes = {
{AudioAction::MUTE, "AdvSceneSwitcher.action.audio.type.mute"},
{AudioAction::UNMUTE, "AdvSceneSwitcher.action.audio.type.unmute"},
};

2
src/macro-action-recording.cpp
View File

@ -9,7 +9,7 @@ bool MacroActionRecord::_registered = MacroActionFactory::Register(
{MacroActionRecord::Create, MacroActionRecordEdit::Create,
"AdvSceneSwitcher.action.recording"});
const static std::unordered_map<RecordAction, std::string> actionTypes = {
const static std::map<RecordAction, std::string> actionTypes = {
{RecordAction::STOP, "AdvSceneSwitcher.action.recording.type.stop"},
{RecordAction::START, "AdvSceneSwitcher.action.recording.type.start"},
{RecordAction::PAUSE, "AdvSceneSwitcher.action.recording.type.pause"},

2
src/macro-action-replay-buffer.cpp
View File

@ -9,7 +9,7 @@ bool MacroActionReplayBuffer::_registered = MacroActionFactory::Register(
{MacroActionReplayBuffer::Create, MacroActionReplayBufferEdit::Create,
"AdvSceneSwitcher.action.replay"});
const static std::unordered_map<ReplayBufferAction, std::string> actionTypes = {
const static std::map<ReplayBufferAction, std::string> actionTypes = {
{ReplayBufferAction::STOP, "AdvSceneSwitcher.action.replay.type.stop"},
{ReplayBufferAction::START,
"AdvSceneSwitcher.action.replay.type.start"},

2
src/macro-action-streaming.cpp
View File

@ -9,7 +9,7 @@ bool MacroActionStream::_registered = MacroActionFactory::Register(
{MacroActionStream::Create, MacroActionStreamEdit::Create,
"AdvSceneSwitcher.action.streaming"});
const static std::unordered_map<StreamAction, std::string> actionTypes = {
const static std::map<StreamAction, std::string> actionTypes = {
{StreamAction::STOP, "AdvSceneSwitcher.action.streaming.type.stop"},
{StreamAction::START, "AdvSceneSwitcher.action.streaming.type.start"},
};

2
src/macro-action-wait.cpp
View File

@ -11,7 +11,7 @@ bool MacroActionWait::_registered = MacroActionFactory::Register(
{MacroActionWait::Create, MacroActionWaitEdit::Create,
"AdvSceneSwitcher.action.wait"});
static std::unordered_map<WaitType, std::string> waitTypes = {
static std::map<WaitType, std::string> waitTypes = {
{WaitType::FIXED, "AdvSceneSwitcher.action.wait.type.fixed"},
{WaitType::RANDOM, "AdvSceneSwitcher.action.wait.type.random"},
};

2
src/macro-condition-audio.cpp
View File

@ -10,7 +10,7 @@ bool MacroConditionAudio::_registered = MacroConditionFactory::Register(
{MacroConditionAudio::Create, MacroConditionAudioEdit::Create,
"AdvSceneSwitcher.condition.audio"});
static std::unordered_map<AudioCondition, std::string> audioConditionTypes = {
static std::map<AudioCondition, std::string> audioConditionTypes = {
{AudioCondition::ABOVE, "AdvSceneSwitcher.ondition.audio.state.above"},
{AudioCondition::BELOW, "AdvSceneSwitcher.ondition.audio.state.below"},
};

25
src/macro-condition-media.cpp
View File

@ -10,21 +10,20 @@ bool MacroConditionMedia::_registered = MacroConditionFactory::Register(
{MacroConditionMedia::Create, MacroConditionMediaEdit::Create,
"AdvSceneSwitcher.condition.media"});
static std::unordered_map<MediaTimeRestriction, std::string>
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<MediaTimeRestriction, std::string> 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<MediaState, std::string> mediaStates = {
static std::map<MediaState, std::string> mediaStates = {
{MediaState::OBS_MEDIA_STATE_NONE,
"AdvSceneSwitcher.mediaTab.states.none"},
{MediaState::OBS_MEDIA_STATE_PLAYING,

7
src/macro-condition-plugin-state.cpp
View File

@ -11,10 +11,9 @@ bool MacroConditionPluginState::_registered = MacroConditionFactory::Register(
MacroConditionPluginStateEdit::Create,
"AdvSceneSwitcher.condition.pluginState"});
static std::unordered_map<PluginStateCondition, std::string>
pluginStateConditionTypes = {
{PluginStateCondition::SCENESWITCHED,
"AdvSceneSwitcher.condition.pluginState.state.sceneSwitched"},
static std::map<PluginStateCondition, std::string> pluginStateConditionTypes = {
{PluginStateCondition::SCENESWITCHED,
"AdvSceneSwitcher.condition.pluginState.state.sceneSwitched"},
};
bool MacroConditionPluginState::CheckCondition()

2
src/macro-condition-recording.cpp
View File

@ -10,7 +10,7 @@ bool MacroConditionRecord::_registered = MacroConditionFactory::Register(
{MacroConditionRecord::Create, MacroConditionRecordEdit::Create,
"AdvSceneSwitcher.condition.record"});
static std::unordered_map<RecordState, std::string> recordStates = {
static std::map<RecordState, std::string> recordStates = {
{RecordState::STOP, "AdvSceneSwitcher.condition.record.state.stop"},
{RecordState::PAUSE, "AdvSceneSwitcher.condition.record.state.pause"},
{RecordState::START, "AdvSceneSwitcher.condition.record.state.start"},

2
src/macro-condition-scene.cpp
View File

@ -10,7 +10,7 @@ bool MacroConditionScene::_registered = MacroConditionFactory::Register(
{MacroConditionScene::Create, MacroConditionSceneEdit::Create,
"AdvSceneSwitcher.condition.scene"});
static std::unordered_map<SceneType, std::string> sceneTypes = {
static std::map<SceneType, std::string> sceneTypes = {
{SceneType::CURRENT, "AdvSceneSwitcher.condition.scene.type.current"},
{SceneType::PREVIOUS, "AdvSceneSwitcher.condition.scene.type.previous"},
};

2
src/macro-condition-streaming.cpp
View File

@ -10,7 +10,7 @@ bool MacroConditionStream::_registered = MacroConditionFactory::Register(
{MacroConditionStream::Create, MacroConditionStreamEdit::Create,
"AdvSceneSwitcher.condition.stream"});
static std::unordered_map<StreamState, std::string> streamStates = {
static std::map<StreamState, std::string> streamStates = {
{StreamState::STOP, "AdvSceneSwitcher.condition.stream.state.stop"},
{StreamState::START, "AdvSceneSwitcher.condition.stream.state.start"},
};

2
src/macro-condition-video.cpp
View File

@ -15,7 +15,7 @@ bool MacroConditionVideo::_registered = MacroConditionFactory::Register(
{MacroConditionVideo::Create, MacroConditionVideoEdit::Create,
"AdvSceneSwitcher.condition.video"});
static std::unordered_map<VideoCondition, std::string> conditionTypes = {
static std::map<VideoCondition, std::string> conditionTypes = {
{VideoCondition::MATCH,
"AdvSceneSwitcher.condition.video.condition.match"},
{VideoCondition::DIFFER,

2
src/macro.cpp
View File

@ -4,7 +4,7 @@
#include "headers/macro-condition-edit.hpp"
#include "headers/macro-action-switch-scene.hpp"
const std::unordered_map<LogicType, LogicTypeInfo> MacroCondition::logicTypes = {
const std::map<LogicType, LogicTypeInfo> MacroCondition::logicTypes = {
{LogicType::NONE, {"AdvSceneSwitcher.logic.none"}},
{LogicType::AND, {"AdvSceneSwitcher.logic.and"}},
{LogicType::OR, {"AdvSceneSwitcher.logic.or"}},