Restructure includes

The intention of this change is to reduce the interdependency of the
various components to reduce compile time when applying changes.

src/advanced-scene-switcher.cpp

@@ -9,6 +9,7 @@
 #include <obs-frontend-api.h>
 
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "status-control.hpp"
 #include "scene-switch-helpers.hpp"
 #include "curl-helper.hpp"
@@ -742,19 +743,3 @@ extern "C" void InitSceneSwitcher(obs_module_t *module, translateFunc translate)
 }
 
 } // 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()
-{
-	if (!advss::switcher) {
-		return nullptr;
-	}
-	return advss::switcher->GetModule();
-}

src/advanced-scene-switcher.hpp

@@ -1,6 +1,6 @@
 #pragma once
 #include "macro-segment-list.hpp"
-#include "switcher-data.hpp"
+#include "log-helper.hpp"
 
 #include <ui_advanced-scene-switcher.h>
 
@@ -10,6 +10,9 @@ namespace advss {
 
 class MacroActionEdit;
 class MacroConditionEdit;
+class Duration;
+class SequenceWidget;
+struct SceneGroup;
 
 /*******************************************************************************
  * Advanced Scene Switcher window

src/general.cpp

@@ -1,4 +1,5 @@
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "status-control.hpp"
 #include "file-selection.hpp"
 #include "utility.hpp"

src/hotkey.cpp

@@ -1,5 +1,6 @@
 #include "hotkey.hpp"
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include <obs-module.h>
 #include <fstream>
 #include <regex>

src/legacy/scene-group.cpp

@@ -3,6 +3,7 @@
 #include <random>
 
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "name-dialog.hpp"
 #include "utility.hpp"
 

src/legacy/scene-trigger.cpp

@@ -1,8 +1,9 @@
-#include <thread>
-
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
 
+#include <thread>
+
 namespace advss {
 
 bool SceneTrigger::pause = false;

src/legacy/switch-audio.cpp

@@ -1,9 +1,10 @@
-#include <float.h>
-
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "volume-control.hpp"
 #include "utility.hpp"
 
+#include <float.h>
+
 namespace advss {
 
 bool AudioSwitch::pause = false;

src/legacy/switch-executable.cpp

@@ -1,4 +1,5 @@
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "platform-funcs.hpp"
 #include "utility.hpp"
 

src/legacy/switch-file.cpp

@@ -1,3 +1,8 @@
+#include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
+#include "curl-helper.hpp"
+#include "utility.hpp"
+
 #include <QtGlobal>
 #include <QFileDialog>
 #include <QTextStream>
@@ -6,10 +11,6 @@
 #include <regex>
 #include <curl/curl.h>
 
-#include "advanced-scene-switcher.hpp"
-#include "curl-helper.hpp"
-#include "utility.hpp"
-
 namespace advss {
 
 bool FileSwitch::pause = false;

src/legacy/switch-generic.cpp

@@ -1,4 +1,5 @@
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
 
 constexpr auto previous_scene_name = "Previous Scene";

src/legacy/switch-idle.cpp

@@ -1,9 +1,10 @@
-#include <regex>
-
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "platform-funcs.hpp"
 #include "utility.hpp"
 
+#include <regex>
+
 namespace advss {
 
 bool IdleData::pause = false;

src/legacy/switch-media.cpp

@@ -1,4 +1,5 @@
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
 
 namespace advss {

src/legacy/switch-network.cpp

@@ -7,6 +7,7 @@ Most of this code is based on https://github.com/Palakis/obs-websocket
 #include <QMessageBox>
 
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "scene-switch-helpers.hpp"
 #include "utility.hpp"
 

src/legacy/switch-pause.cpp

@@ -1,8 +1,9 @@
-#include <regex>
-
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
 
+#include <regex>
+
 namespace advss {
 
 static QMetaObject::Connection addPulse;

src/legacy/switch-priority.cpp

@@ -1,6 +1,7 @@
-#include <algorithm>
-
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
+
+#include <algorithm>
 
 namespace advss {
 

src/legacy/switch-random.cpp

@@ -1,8 +1,9 @@
-#include <random>
-
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
 
+#include <random>
+
 namespace advss {
 
 bool RandomSwitch::pause = false;

src/legacy/switch-screen-region.cpp

@@ -1,8 +1,9 @@
-#include <QTimer>
-
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
 
+#include <QTimer>
+
 namespace advss {
 
 bool ScreenRegionSwitch::pause = false;

src/legacy/switch-sequence.cpp

@@ -1,10 +1,11 @@
+#include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
+#include "utility.hpp"
+
 #include <QFileDialog>
 #include <QTextStream>
 #include <QScrollArea>
 
-#include "advanced-scene-switcher.hpp"
-#include "utility.hpp"
-
 namespace advss {
 
 constexpr auto max_extend_text_size = 150;

src/legacy/switch-time.cpp

@@ -1,4 +1,5 @@
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
 
 namespace advss {

src/legacy/switch-transitions.cpp

@@ -1,8 +1,9 @@
-#include <thread>
-
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
 
+#include <thread>
+
 namespace advss {
 
 constexpr auto default_def_transition_dealy = 300;

src/legacy/switch-video.cpp

@@ -1,11 +1,12 @@
+#include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
+#include "utility.hpp"
+
 #include <QFileDialog>
 #include <QBuffer>
 #include <QToolTip>
 #include <thread>
 
-#include "advanced-scene-switcher.hpp"
-#include "utility.hpp"
-
 namespace advss {
 
 bool VideoSwitch::pause = false;

src/legacy/switch-window.cpp

@@ -1,9 +1,10 @@
-#include <regex>
-
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "platform-funcs.hpp"
 #include "utility.hpp"
 
+#include <regex>
+
 namespace advss {
 
 bool WindowSwitch::pause = false;

src/macro-core/macro-action-audio.cpp

@@ -1,5 +1,5 @@
 #include "macro-action-audio.hpp"
-#include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -505,7 +505,7 @@ void MacroActionAudioEdit::SourceChanged(const SourceSelection &source)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_audioSource = source;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -517,7 +517,7 @@ void MacroActionAudioEdit::ActionChanged(int idx)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_action = static_cast<MacroActionAudio::Action>(
 		_actions->itemData(idx).toInt());
 	SetWidgetVisibility();
@@ -529,7 +529,7 @@ void MacroActionAudioEdit::SyncOffsetChanged(const NumberVariable<int> &value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_syncOffset = value;
 }
 
@@ -539,7 +539,7 @@ void MacroActionAudioEdit::MonitorTypeChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_monitorType = static_cast<obs_monitoring_type>(value);
 }
 
@@ -549,7 +549,7 @@ void MacroActionAudioEdit::BalanceChanged(const NumberVariable<double> &value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_balance = value;
 }
 
@@ -559,7 +559,7 @@ void MacroActionAudioEdit::VolumeChanged(const NumberVariable<int> &value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_volume = value;
 }
 
@@ -569,7 +569,7 @@ void MacroActionAudioEdit::FadeChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_fade = value;
 	SetWidgetVisibility();
 }
@@ -580,7 +580,7 @@ void MacroActionAudioEdit::DurationChanged(const Duration &dur)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_duration = dur;
 }
 
@@ -590,7 +590,7 @@ void MacroActionAudioEdit::RateChanged(const NumberVariable<double> &value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_rate = value;
 }
 
@@ -600,7 +600,7 @@ void MacroActionAudioEdit::WaitChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_wait = value;
 }
 
@@ -610,7 +610,7 @@ void MacroActionAudioEdit::AbortActiveFadeChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_abortActiveFade = value;
 }
 
@@ -620,7 +620,7 @@ void MacroActionAudioEdit::FadeTypeChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_fadeType = static_cast<MacroActionAudio::FadeType>(value);
 	SetWidgetVisibility();
 }

src/macro-core/macro-action-edit.cpp

@@ -1,4 +1,5 @@
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "macro-action-edit.hpp"
 #include "macro-action-scene-switch.hpp"
 #include "section.hpp"

src/macro-core/macro-action-file.cpp

@@ -1,5 +1,4 @@
 #include "macro-action-file.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 #include <QFile>
@@ -141,7 +140,7 @@ void MacroActionFileEdit::PathChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_file = text.toUtf8().constData();
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -153,7 +152,7 @@ void MacroActionFileEdit::TextChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_text = _text->toPlainText().toStdString();
 
 	adjustSize();
@@ -166,7 +165,7 @@ void MacroActionFileEdit::ActionChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_action = static_cast<FileAction>(value);
 }
 

src/macro-core/macro-action-filter.cpp

@@ -1,5 +1,4 @@
 #include "macro-action-filter.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -185,7 +184,7 @@ void MacroActionFilterEdit::SourceChanged(const SourceSelection &source)
 		return;
 	}
 	{
-		std::lock_guard<std::mutex> lock(switcher->m);
+		auto lock = LockContext();
 		_entryData->_source = source;
 	}
 	_filters->clear();
@@ -199,7 +198,7 @@ void MacroActionFilterEdit::FilterChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_filterName = text.toStdString();
 	_entryData->_filter =
 		GetWeakFilterByQString(_entryData->_source.GetSource(), text);
@@ -213,7 +212,7 @@ void MacroActionFilterEdit::ActionChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_action = static_cast<MacroActionFilter::Action>(value);
 	SetWidgetVisibility(_entryData->_action ==
 			    MacroActionFilter::Action::SETTINGS);
@@ -236,7 +235,7 @@ void MacroActionFilterEdit::SettingsChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_settings = _settings->toPlainText().toStdString();
 
 	adjustSize();

src/macro-core/macro-action-hotkey.cpp

@@ -1,5 +1,4 @@
 #include "macro-action-hotkey.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "platform-funcs.hpp"
 #include "utility.hpp"
 
@@ -512,7 +511,7 @@ void MacroActionHotkeyEdit::LShiftChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_leftShift = state;
 }
 
@@ -522,7 +521,7 @@ void MacroActionHotkeyEdit::RShiftChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_rightShift = state;
 }
 
@@ -532,7 +531,7 @@ void MacroActionHotkeyEdit::LCtrlChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_leftCtrl = state;
 }
 
@@ -542,7 +541,7 @@ void MacroActionHotkeyEdit::RCtrlChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_rightCtrl = state;
 }
 
@@ -552,7 +551,7 @@ void MacroActionHotkeyEdit::LAltChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_leftAlt = state;
 }
 
@@ -562,7 +561,7 @@ void MacroActionHotkeyEdit::RAltChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_rightAlt = state;
 }
 
@@ -572,7 +571,7 @@ void MacroActionHotkeyEdit::LMetaChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_leftMeta = state;
 }
 
@@ -582,7 +581,7 @@ void MacroActionHotkeyEdit::RMetaChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_rightMeta = state;
 }
 
@@ -592,7 +591,7 @@ void MacroActionHotkeyEdit::DurationChanged(const Duration &dur)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_duration = dur;
 }
 
@@ -602,7 +601,7 @@ void MacroActionHotkeyEdit::OnlySendToOBSChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_onlySendToObs = state;
 	SetWarningVisibility();
 }
@@ -613,7 +612,7 @@ void MacroActionHotkeyEdit::KeyChanged(int key)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_key = static_cast<HotkeyType>(key);
 }
 

src/macro-core/macro-action-http.cpp

@@ -1,5 +1,5 @@
 #include "macro-action-http.hpp"
-#include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
 #include "curl-helper.hpp"
 
@@ -224,7 +224,7 @@ void MacroActionHttpEdit::URLChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_url = _url->text().toStdString();
 	emit(HeaderInfoChanged(_url->text()));
 }
@@ -235,7 +235,7 @@ void MacroActionHttpEdit::MethodChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_method = static_cast<MacroActionHttp::Method>(value);
 	SetWidgetVisibility();
 }
@@ -246,7 +246,7 @@ void MacroActionHttpEdit::TimeoutChanged(const Duration &dur)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_timeout = dur;
 }
 
@@ -256,7 +256,7 @@ void MacroActionHttpEdit::SetHeadersChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_setHeaders = value;
 	SetWidgetVisibility();
 }
@@ -267,7 +267,7 @@ void MacroActionHttpEdit::HeadersChanged(const StringList &headers)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_headers = headers;
 	adjustSize();
 	updateGeometry();
@@ -288,7 +288,7 @@ void MacroActionHttpEdit::DataChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_data = _data->toPlainText().toUtf8().constData();
 
 	adjustSize();

src/macro-core/macro-action-macro.cpp

@@ -1,5 +1,5 @@
 #include "macro-action-macro.hpp"
-#include "advanced-scene-switcher.hpp"
+#include "macro.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -157,7 +157,7 @@ void MacroActionMacroEdit::MacroChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_macro = text;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -169,7 +169,7 @@ void MacroActionMacroEdit::ActionChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_action = static_cast<PerformMacroAction>(value);
 
 	if (_entryData->_action == PerformMacroAction::RUN ||

src/macro-core/macro-action-media.cpp

@@ -1,5 +1,4 @@
 #include "macro-action-media.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -154,7 +153,7 @@ void MacroActionMediaEdit::SourceChanged(const SourceSelection &source)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_mediaSource = source;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -166,7 +165,7 @@ void MacroActionMediaEdit::ActionChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_action = static_cast<MediaAction>(value);
 	SetWidgetVisibility();
 }
@@ -177,7 +176,7 @@ void MacroActionMediaEdit::DurationChanged(const Duration &dur)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_seek = dur;
 }
 

src/macro-core/macro-action-plugin-state.cpp

@@ -1,5 +1,5 @@
 #include "macro-action-plugin-state.hpp"
-#include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
 
 #include <thread>
@@ -22,12 +22,12 @@ const static std::map<PluginStateAction, std::string> actionTypes = {
 	 "AdvSceneSwitcher.action.pluginState.type.import"},
 };
 
-const static std::map<NoMatch, std::string> noMatchValues = {
-	{NO_SWITCH,
+const static std::map<SwitcherData::NoMatch, std::string> noMatchValues = {
+	{SwitcherData::NoMatch::NO_SWITCH,
 	 "AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.dontSwitch"},
-	{SWITCH,
+	{SwitcherData::NoMatch::SWITCH,
 	 "AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.switchTo"},
-	{RANDOM_SWITCH,
+	{SwitcherData::NoMatch::RANDOM_SWITCH,
 	 "AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.switchToRandom"},
 };
 
@@ -52,8 +52,9 @@ void importSettings(const std::string &path)
 
 void setNoMatchBehaviour(int value, OBSWeakSource &scene)
 {
-	switcher->switchIfNotMatching = static_cast<NoMatch>(value);
-	if (switcher->switchIfNotMatching == SWITCH) {
+	switcher->switchIfNotMatching =
+		static_cast<SwitcherData::NoMatch>(value);
+	if (switcher->switchIfNotMatching == SwitcherData::NoMatch::SWITCH) {
 		switcher->nonMatchingScene = scene;
 	}
 }
@@ -198,7 +199,7 @@ void MacroActionPluginStateEdit::ActionChanged(int value)
 	}
 
 	{
-		std::lock_guard<std::mutex> lock(switcher->m);
+		auto lock = LockContext();
 		_entryData->_action = static_cast<PluginStateAction>(value);
 		SetWidgetVisibility();
 	}
@@ -213,7 +214,7 @@ void MacroActionPluginStateEdit::ValueChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_value = value;
 	SetWidgetVisibility();
 }
@@ -224,7 +225,7 @@ void MacroActionPluginStateEdit::SceneChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_scene = GetWeakSourceByQString(text);
 }
 
@@ -234,7 +235,7 @@ void MacroActionPluginStateEdit::PathChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_settingsPath = text.toStdString();
 }
 
@@ -253,7 +254,8 @@ void MacroActionPluginStateEdit::SetWidgetVisibility()
 		break;
 	case PluginStateAction::NO_MATCH_BEHAVIOUR:
 		_values->show();
-		if ((NoMatch)_entryData->_value == SWITCH) {
+		if (static_cast<SwitcherData::NoMatch>(_entryData->_value) ==
+		    SwitcherData::NoMatch::SWITCH) {
 			_scenes->show();
 		}
 		break;

src/macro-core/macro-action-profile.cpp

@@ -1,5 +1,4 @@
 #include "macro-action-profile.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -78,7 +77,7 @@ void MacroActionProfileEdit::ProfileChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_profile = text.toStdString();
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));

src/macro-core/macro-action-projector.cpp

@@ -1,7 +1,7 @@
 #include "macro-action-projector.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
+#include <QGuiApplication>
 #include <QScreen>
 
 namespace advss {
@@ -227,7 +227,7 @@ void MacroActionProjectorEdit::SceneChanged(const SceneSelection &s)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_scene = s;
 }
 
@@ -237,7 +237,7 @@ void MacroActionProjectorEdit::SourceChanged(const SourceSelection &source)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_source = source;
 }
 
@@ -247,7 +247,7 @@ void MacroActionProjectorEdit::MonitorChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_monitor = value;
 }
 
@@ -257,7 +257,7 @@ void MacroActionProjectorEdit::WindowTypeChanged(int)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_fullscreen =
 		_windowTypes->currentText() ==
 		obs_module_text("AdvSceneSwitcher.action.projector.fullscreen");
@@ -270,7 +270,7 @@ void MacroActionProjectorEdit::TypeChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_type = static_cast<MacroActionProjector::Type>(value);
 	SetWidgetVisibility();
 }

src/macro-core/macro-action-random.cpp

@@ -1,5 +1,5 @@
 #include "macro-action-random.hpp"
-#include "advanced-scene-switcher.hpp"
+#include "macro.hpp"
 #include "utility.hpp"
 
 #include <cstdlib>
@@ -151,7 +151,7 @@ void MacroActionRandomEdit::Add(const std::string &name)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	MacroRef macro(name);
 	_entryData->_macros.push_back(macro);
 	_allowRepeat->setVisible(ShouldShowAllowRepeat());
@@ -164,7 +164,7 @@ void MacroActionRandomEdit::Remove(int idx)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_macros.erase(std::next(_entryData->_macros.begin(), idx));
 	_allowRepeat->setVisible(ShouldShowAllowRepeat());
 	adjustSize();
@@ -177,7 +177,7 @@ void MacroActionRandomEdit::Replace(int idx, const std::string &name)
 	}
 
 	MacroRef macro(name);
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_macros[idx] = macro;
 	adjustSize();
 }
@@ -188,7 +188,7 @@ void MacroActionRandomEdit::AllowRepeatChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_allowRepeat = value;
 }
 

src/macro-core/macro-action-recording.cpp

@@ -1,5 +1,4 @@
 #include "macro-action-recording.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 #include <util/config-file.h>
@@ -187,7 +186,7 @@ void MacroActionRecordEdit::FolderChanged(const QString &folder)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_folder = folder.toStdString();
 }
 
@@ -197,7 +196,7 @@ void MacroActionRecordEdit::FormatStringChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_fileFormat = _recordFileFormat->text().toStdString();
 }
 
@@ -218,7 +217,7 @@ void MacroActionRecordEdit::ActionChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_action = static_cast<MacroActionRecord::Action>(value);
 	SetWidgetVisibility();
 }

src/macro-core/macro-action-replay-buffer.cpp

@@ -1,5 +1,4 @@
 #include "macro-action-replay-buffer.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -119,7 +118,7 @@ void MacroActionReplayBufferEdit::ActionChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_action = static_cast<ReplayBufferAction>(value);
 	_saveWarning->setVisible(_entryData->_action ==
 				 ReplayBufferAction::SAVE);

src/macro-core/macro-action-run.cpp

@@ -1,5 +1,4 @@
 #include "macro-action-run.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 #include <QProcess>
@@ -82,7 +81,7 @@ void MacroActionRunEdit::ProcessConfigChanged(const ProcessConfig &conf)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_procConfig = conf;
 	adjustSize();
 	updateGeometry();

src/macro-core/macro-action-scene-collection.cpp

@@ -1,5 +1,5 @@
 #include "macro-action-scene-collection.hpp"
-#include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -112,7 +112,7 @@ void MacroActionSceneCollectionEdit::SceneCollectionChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_sceneCollection = text.toStdString();
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));

src/macro-core/macro-action-scene-order.cpp

@@ -1,5 +1,4 @@
 #include "macro-action-scene-order.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -215,7 +214,7 @@ void MacroActionSceneOrderEdit::SceneChanged(const SceneSelection &s)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_scene = s;
 }
 
@@ -225,7 +224,7 @@ void MacroActionSceneOrderEdit::SourceChanged(const SceneItemSelection &item)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_source = item;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -237,7 +236,7 @@ void MacroActionSceneOrderEdit::ActionChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_action = static_cast<SceneOrderAction>(value);
 	_position->setVisible(_entryData->_action ==
 			      SceneOrderAction::POSITION);
@@ -249,7 +248,7 @@ void MacroActionSceneOrderEdit::PositionChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_position = value;
 }
 

src/macro-core/macro-action-scene-switch.cpp

@@ -1,5 +1,5 @@
 #include "macro-action-scene-switch.hpp"
-#include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "scene-switch-helpers.hpp"
 #include "utility.hpp"
 
@@ -234,7 +234,7 @@ void MacroActionSwitchSceneEdit::DurationChanged(const Duration &dur)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_duration = dur;
 }
 
@@ -244,7 +244,7 @@ void MacroActionSwitchSceneEdit::BlockUntilTransitionDoneChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_blockUntilTransitionDone = state;
 }
 
@@ -285,7 +285,7 @@ void MacroActionSwitchSceneEdit::SceneChanged(const SceneSelection &s)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_scene = s;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -297,7 +297,7 @@ void MacroActionSwitchSceneEdit::TransitionChanged(const TransitionSelection &t)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_transition = t;
 	SetDurationVisibility();
 }

src/macro-core/macro-action-scene-transform.cpp

@@ -1,5 +1,4 @@
 #include "macro-action-scene-transform.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -183,7 +182,7 @@ void MacroActionSceneTransformEdit::SceneChanged(const SceneSelection &s)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_scene = s;
 }
 
@@ -193,7 +192,7 @@ void MacroActionSceneTransformEdit::SourceChanged(const SceneItemSelection &item
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_source = item;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -223,7 +222,7 @@ void MacroActionSceneTransformEdit::SettingsChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_settings = _settings->toPlainText().toStdString();
 
 	adjustSize();

src/macro-core/macro-action-scene-visibility.cpp

@@ -1,5 +1,4 @@
 #include "macro-action-scene-visibility.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -248,7 +247,7 @@ void MacroActionSceneVisibilityEdit::SceneChanged(const SceneSelection &s)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_scene = s;
 }
 
@@ -258,7 +257,7 @@ void MacroActionSceneVisibilityEdit::SourceTypeChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_sourceType = static_cast<SceneItemSourceType>(value);
 	SetWidgetVisibility();
 }
@@ -270,7 +269,7 @@ void MacroActionSceneVisibilityEdit::SourceChanged(
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_source = item;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -282,7 +281,7 @@ void MacroActionSceneVisibilityEdit::SourceGroupChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	if (text == obs_module_text("AdvSceneSwitcher.selectItem")) {
 		_entryData->_sourceGroup = "";
 	} else {
@@ -298,7 +297,7 @@ void MacroActionSceneVisibilityEdit::ActionChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_action = static_cast<SceneVisibilityAction>(value);
 }
 

src/macro-core/macro-action-screenshot.cpp

@@ -1,5 +1,4 @@
 #include "macro-action-screenshot.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -212,7 +211,7 @@ void MacroActionScreenshotEdit::SceneChanged(const SceneSelection &s)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_scene = s;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -244,7 +243,7 @@ void MacroActionScreenshotEdit::PathChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_path = text.toStdString();
 }
 
@@ -254,7 +253,7 @@ void MacroActionScreenshotEdit::SourceChanged(const SourceSelection &source)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_source = source;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));

src/macro-core/macro-action-sequence.cpp

@@ -1,5 +1,5 @@
 #include "macro-action-sequence.hpp"
-#include "advanced-scene-switcher.hpp"
+#include "macro.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -177,7 +177,7 @@ void MacroActionSequenceEdit::Add(const std::string &name)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	MacroRef macro(name);
 	_entryData->_macros.push_back(macro);
 	adjustSize();
@@ -189,7 +189,7 @@ void MacroActionSequenceEdit::Remove(int idx)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_macros.erase(std::next(_entryData->_macros.begin(), idx));
 	adjustSize();
 }
@@ -200,13 +200,13 @@ void MacroActionSequenceEdit::Up(int idx)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	std::swap(_entryData->_macros[idx], _entryData->_macros[idx - 1]);
 }
 
 void MacroActionSequenceEdit::Down(int idx)
 {
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	std::swap(_entryData->_macros[idx], _entryData->_macros[idx + 1]);
 }
 
@@ -217,7 +217,7 @@ void MacroActionSequenceEdit::Replace(int idx, const std::string &name)
 	}
 
 	MacroRef macro(name);
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_macros[idx] = macro;
 	adjustSize();
 }
@@ -232,7 +232,7 @@ void MacroActionSequenceEdit::ContinueFromClicked()
 	if (idx == -1) {
 		return;
 	}
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_lastIdx = idx - 1;
 }
 
@@ -242,7 +242,7 @@ void MacroActionSequenceEdit::RestartChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_restart = state;
 }
 

src/macro-core/macro-action-source.cpp

@@ -1,5 +1,4 @@
 #include "macro-action-source.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 Q_DECLARE_METATYPE(advss::SourceSettingButton);
@@ -252,7 +251,7 @@ void MacroActionSourceEdit::SourceChanged(const SourceSelection &source)
 	}
 
 	{
-		std::lock_guard<std::mutex> lock(switcher->m);
+		auto lock = LockContext();
 		_entryData->_source = source;
 	}
 	populateSourceButtonSelection(_settingsButtons,
@@ -267,7 +266,7 @@ void MacroActionSourceEdit::ActionChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_action = static_cast<SourceAction>(value);
 	SetWidgetVisibility();
 }
@@ -278,7 +277,7 @@ void MacroActionSourceEdit::ButtonChanged(int idx)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_button = qvariant_cast<SourceSettingButton>(
 		_settingsButtons->itemData(idx));
 }
@@ -299,7 +298,7 @@ void MacroActionSourceEdit::SettingsChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_settings = _settings->toPlainText().toStdString();
 
 	adjustSize();

src/macro-core/macro-action-streaming.cpp

@@ -1,5 +1,4 @@
 #include "macro-action-streaming.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -119,7 +118,7 @@ void MacroActionStreamEdit::ActionChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_action = static_cast<StreamAction>(value);
 }
 

src/macro-core/macro-action-studio-mode.cpp

@@ -1,5 +1,4 @@
 #include "macro-action-studio-mode.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -151,7 +150,7 @@ void MacroActionSudioModeEdit::SceneChanged(const SceneSelection &s)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_scene = s;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -163,7 +162,7 @@ void MacroActionSudioModeEdit::ActionChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_action = static_cast<StudioModeAction>(value);
 	_scenes->setVisible(_entryData->_action == StudioModeAction::SET_SCENE);
 	emit HeaderInfoChanged(

src/macro-core/macro-action-systray.cpp

@@ -1,5 +1,4 @@
 #include "macro-action-systray.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -67,7 +66,7 @@ void MacroActionSystrayEdit::MessageChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_msg = _msg->text().toStdString();
 }
 

src/macro-core/macro-action-timer.cpp

@@ -1,6 +1,6 @@
 #include "macro-action-timer.hpp"
 #include "macro-condition-timer.hpp"
-#include "advanced-scene-switcher.hpp"
+#include "macro.hpp"
 #include "utility.hpp"
 
 #include <random>
@@ -170,7 +170,7 @@ void MacroActionTimerEdit::ActionTypeChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_actionType = static_cast<TimerAction>(value);
 	SetWidgetVisibility();
 }
@@ -191,7 +191,7 @@ void MacroActionTimerEdit::DurationChanged(const Duration &dur)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_duration = dur;
 }
 
@@ -201,7 +201,7 @@ void MacroActionTimerEdit::MacroChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_macro = text;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));

src/macro-core/macro-action-transition.cpp

@@ -1,5 +1,4 @@
 #include "macro-action-transition.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -294,7 +293,7 @@ void MacroActionTransitionEdit::SourceChanged(const SceneItemSelection &item)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_source = item;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -306,7 +305,7 @@ void MacroActionTransitionEdit::ActionChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_type = static_cast<MacroActionTransition::Type>(value);
 	SetWidgetVisibility();
 	emit HeaderInfoChanged(
@@ -319,7 +318,7 @@ void MacroActionTransitionEdit::SceneChanged(const SceneSelection &s)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_scene = s;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -331,7 +330,7 @@ void MacroActionTransitionEdit::TransitionChanged(const TransitionSelection &t)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_transition = t;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -343,7 +342,7 @@ void MacroActionTransitionEdit::DurationChanged(const Duration &dur)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_duration = dur;
 }
 
@@ -363,7 +362,7 @@ void MacroActionTransitionEdit::SetTransitionChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_setTransitionType = state;
 	_transitions->setEnabled(state);
 	if (state) {
@@ -380,7 +379,7 @@ void MacroActionTransitionEdit::SetDurationChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_setDuration = state;
 	_duration->setEnabled(state);
 }

src/macro-core/macro-action-variable.cpp

@@ -1,6 +1,8 @@
 #include "macro-action-variable.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "macro-condition-edit.hpp"
+#include "switcher-data.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "macro.hpp"
 #include "math-helpers.hpp"
 #include "utility.hpp"
 
@@ -494,7 +496,7 @@ void MacroActionVariableEdit::VariableChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_variable = GetWeakVariableByQString(text);
 }
 
@@ -504,7 +506,7 @@ void MacroActionVariableEdit::Variable2Changed(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_variable2 = GetWeakVariableByQString(text);
 }
 
@@ -514,7 +516,7 @@ void MacroActionVariableEdit::ActionChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_type = static_cast<MacroActionVariable::Type>(value);
 	SetWidgetVisibility();
 
@@ -531,7 +533,7 @@ void MacroActionVariableEdit::StrValueChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_strValue = _strValue->toPlainText().toStdString();
 	adjustSize();
 	updateGeometry();
@@ -543,7 +545,7 @@ void MacroActionVariableEdit::NumValueChanged(double val)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_numValue = val;
 }
 
@@ -553,7 +555,7 @@ void MacroActionVariableEdit::SegmentIndexChanged(int val)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->SetSegmentIndexValue(val - 1);
 	MarkSelectedSegment();
 }
@@ -656,7 +658,7 @@ void MacroActionVariableEdit::SubStringStartChanged(int val)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_subStringStart = val - 1;
 }
 
@@ -666,7 +668,7 @@ void MacroActionVariableEdit::SubStringSizeChanged(int val)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_subStringSize = val;
 }
 
@@ -676,7 +678,7 @@ void MacroActionVariableEdit::RegexChanged(RegexConfig conf)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_regex = conf;
 
 	SetWidgetVisibility();
@@ -688,7 +690,7 @@ void MacroActionVariableEdit::RegexPatternChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_regexPattern = _regexPattern->toPlainText().toStdString();
 	adjustSize();
 	updateGeometry();
@@ -700,7 +702,7 @@ void MacroActionVariableEdit::RegexMatchIdxChanged(int val)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_regexMatchIdx = val - 1;
 }
 
@@ -710,7 +712,7 @@ void MacroActionVariableEdit::FindStrValueChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_findStr = _findStr->toPlainText().toStdString();
 	adjustSize();
 	updateGeometry();
@@ -722,7 +724,7 @@ void MacroActionVariableEdit::ReplaceStrValueChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_replaceStr = _replaceStr->toPlainText().toStdString();
 	adjustSize();
 	updateGeometry();
@@ -734,7 +736,7 @@ void MacroActionVariableEdit::MathExpressionChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_mathExpression = _mathExpression->text().toStdString();
 
 	// In case of invalid expression display an error

src/macro-core/macro-action-virtual-cam.cpp

@@ -1,5 +1,4 @@
 #include "macro-action-virtual-cam.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -108,7 +107,7 @@ void MacroActionVCamEdit::ActionChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_action = static_cast<VCamAction>(value);
 }
 

src/macro-core/macro-action-wait.cpp

@@ -1,5 +1,5 @@
 #include "macro-action-wait.hpp"
-#include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
 
 #include <random>
@@ -174,7 +174,7 @@ void MacroActionWaitEdit::TypeChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	WaitType type = static_cast<WaitType>(value);
 
 	if (type == WaitType::FIXED) {
@@ -192,7 +192,7 @@ void MacroActionWaitEdit::DurationChanged(const Duration &dur)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_duration = dur;
 }
 
@@ -202,7 +202,7 @@ void MacroActionWaitEdit::Duration2Changed(const Duration &dur)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_duration2 = dur;
 }
 

src/macro-core/macro-action-websocket.cpp

@@ -1,5 +1,4 @@
 #include "macro-action-websocket.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -178,7 +177,7 @@ void MacroActionWebsocketEdit::ActionChanged(int index)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_type = static_cast<MacroActionWebsocket::Type>(index);
 	if (_entryData->_type == MacroActionWebsocket::Type::REQUEST) {
 		SetupRequestEdit();
@@ -195,7 +194,7 @@ void MacroActionWebsocketEdit::MessageChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_message = _message->toPlainText().toUtf8().constData();
 
 	adjustSize();
@@ -209,7 +208,7 @@ void MacroActionWebsocketEdit::ConnectionSelectionChanged(
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_connection = GetWeakConnectionByQString(connection);
 	emit(HeaderInfoChanged(connection));
 }

src/macro-core/macro-action.cpp

@@ -1,5 +1,4 @@
 #include "macro-action.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 

src/macro-core/macro-condition-audio.cpp

@@ -1,7 +1,6 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-audio.hpp"
+#include "macro.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
@@ -422,7 +421,7 @@ void MacroConditionAudioEdit::SourceChanged(const SourceSelection &source)
 	}
 
 	{
-		std::lock_guard<std::mutex> lock(switcher->m);
+		auto lock = LockContext();
 		_entryData->_audioSource = source;
 		_entryData->ResetVolmeter();
 	}
@@ -439,7 +438,7 @@ void MacroConditionAudioEdit::VolumeThresholdChanged(
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_volume = vol;
 }
 
@@ -449,7 +448,7 @@ void MacroConditionAudioEdit::SyncOffsetChanged(const NumberVariable<int> &value
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_syncOffset = value;
 }
 
@@ -459,7 +458,7 @@ void MacroConditionAudioEdit::MonitorTypeChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_monitorType = static_cast<obs_monitoring_type>(value);
 }
 
@@ -469,7 +468,7 @@ void MacroConditionAudioEdit::BalanceChanged(const NumberVariable<double> &value
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_balance = value;
 }
 
@@ -479,7 +478,7 @@ void MacroConditionAudioEdit::ConditionChanged(int cond)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	if (_entryData->_checkType ==
 		    MacroConditionAudio::Type::OUTPUT_VOLUME ||
 	    _entryData->_checkType == MacroConditionAudio::Type::BALANCE ||
@@ -499,7 +498,7 @@ void MacroConditionAudioEdit::CheckTypeChanged(int idx)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_checkType = static_cast<MacroConditionAudio::Type>(
 		_checkTypes->itemData(idx).toInt());
 

src/macro-core/macro-condition-audio.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "volume-control.hpp"
 #include "slider-spinbox.hpp"
 #include "source-selection.hpp"

src/macro-core/macro-condition-cursor.cpp

@@ -1,10 +1,10 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-cursor.hpp"
+#include "switcher-data.hpp"
 #include "platform-funcs.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 #include <QScreen>
+#include <QGuiApplication>
 
 namespace advss {
 
@@ -219,7 +219,7 @@ void MacroConditionCursorEdit::ConditionChanged(int index)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_condition = static_cast<MacroConditionCursor::Condition>(
 		_conditions->itemData(index).toInt());
 	SetWidgetVisibility();
@@ -231,7 +231,7 @@ void MacroConditionCursorEdit::ButtonChanged(int index)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_button = static_cast<MacroConditionCursor::Button>(
 		_buttons->itemData(index).toInt());
 }
@@ -242,7 +242,7 @@ void MacroConditionCursorEdit::MinXChanged(const NumberVariable<int> &pos)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_minX = pos;
 	SetupFrame();
 }
@@ -253,7 +253,7 @@ void MacroConditionCursorEdit::MinYChanged(const NumberVariable<int> &pos)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_minY = pos;
 	SetupFrame();
 }
@@ -264,7 +264,7 @@ void MacroConditionCursorEdit::MaxXChanged(const NumberVariable<int> &pos)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_maxX = pos;
 	SetupFrame();
 }
@@ -275,7 +275,7 @@ void MacroConditionCursorEdit::MaxYChanged(const NumberVariable<int> &pos)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_maxY = pos;
 	SetupFrame();
 }

src/macro-core/macro-condition-cursor.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "striped-frame.hpp"
 #include "variable-spinbox.hpp"
 

src/macro-core/macro-condition-date.cpp

@@ -1,7 +1,6 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-date.hpp"
+#include "macro.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 #include <QCalendarWidget>
 
@@ -479,7 +478,7 @@ void MacroConditionDateEdit::DayOfWeekChanged(int day)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_dayOfWeek = static_cast<MacroConditionDate::Day>(day);
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -491,7 +490,7 @@ void MacroConditionDateEdit::ConditionChanged(int cond)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_condition =
 		static_cast<MacroConditionDate::Condition>(cond);
 	SetWidgetStatus();
@@ -505,7 +504,7 @@ void MacroConditionDateEdit::DateChanged(const QDate &date)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->SetDate1(date);
 
 	emit HeaderInfoChanged(
@@ -518,7 +517,7 @@ void MacroConditionDateEdit::TimeChanged(const QTime &time)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->SetTime1(time);
 
 	emit HeaderInfoChanged(
@@ -531,7 +530,7 @@ void MacroConditionDateEdit::Date2Changed(const QDate &date)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->SetDate2(date);
 }
 
@@ -541,7 +540,7 @@ void MacroConditionDateEdit::Time2Changed(const QTime &time)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->SetTime2(time);
 }
 
@@ -551,7 +550,7 @@ void MacroConditionDateEdit::IgnoreDateChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_ignoreDate = !state;
 	SetWidgetStatus();
 }
@@ -562,7 +561,7 @@ void MacroConditionDateEdit::IgnoreTimeChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_ignoreTime = !state;
 	SetWidgetStatus();
 }
@@ -573,7 +572,7 @@ void MacroConditionDateEdit::RepeatChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_repeat = state;
 	_duration->setDisabled(!state);
 	SetWidgetStatus();
@@ -585,7 +584,7 @@ void MacroConditionDateEdit::UpdateOnRepeatChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_updateOnRepeat = state;
 }
 
@@ -595,7 +594,7 @@ void MacroConditionDateEdit::DurationChanged(const Duration &dur)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_duration = dur;
 }
 
@@ -605,7 +604,7 @@ void MacroConditionDateEdit::AdvancedSettingsToggleClicked()
 		return;
 	}
 	{
-		std::lock_guard<std::mutex> lock(switcher->m);
+		auto lock = LockContext();
 		_entryData->_dayOfWeekCheck = !_entryData->_dayOfWeekCheck;
 		_entryData->_condition = MacroConditionDate::Condition::AT;
 	}

src/macro-core/macro-condition-date.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "duration-control.hpp"
 
 #include <QCheckBox>

src/macro-core/macro-condition-edit.cpp

@@ -1,4 +1,5 @@
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "macro-condition-edit.hpp"
 #include "macro-condition-scene.hpp"
 #include "section.hpp"
@@ -235,7 +236,7 @@ void MacroConditionEdit::LogicSelectionChanged(int idx)
 		type = static_cast<LogicType>(idx + logic_root_offset);
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	(*_entryData)->SetLogicType(type);
 }
 
@@ -302,7 +303,7 @@ void MacroConditionEdit::ConditionSelectionChanged(const QString &text)
 	_dur->SetValue(temp);
 	HeaderInfoChanged("");
 	{
-		std::lock_guard<std::mutex> lock(switcher->m);
+		auto lock = LockContext();
 		auto logic = (*_entryData)->GetLogicType();
 		_entryData->reset();
 		*_entryData = MacroConditionFactory::Create(id, macro);
@@ -324,7 +325,7 @@ void MacroConditionEdit::DurationChanged(const Duration &seconds)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	(*_entryData)->SetDuration(seconds);
 }
 
@@ -334,7 +335,7 @@ void MacroConditionEdit::DurationModifierChanged(DurationModifier::Type m)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	(*_entryData)->SetDurationModifier(m);
 }
 
@@ -369,7 +370,7 @@ void AdvSceneSwitcher::AddMacroCondition(int idx)
 		logic = LogicType::ROOT_NONE;
 	}
 	{
-		std::lock_guard<std::mutex> lock(switcher->m);
+		auto lock = LockContext();
 		auto cond = macro->Conditions().emplace(
 			macro->Conditions().begin() + idx,
 			MacroConditionFactory::Create(id, macro.get()));
@@ -421,7 +422,7 @@ void AdvSceneSwitcher::RemoveMacroCondition(int idx)
 	}
 
 	{
-		std::lock_guard<std::mutex> lock(switcher->m);
+		auto lock = LockContext();
 		conditionsList->Remove(idx);
 		macro->Conditions().erase(macro->Conditions().begin() + idx);
 		macro->UpdateConditionIndices();
@@ -481,7 +482,7 @@ void AdvSceneSwitcher::SwapConditions(Macro *m, int pos1, int pos2)
 	}
 
 	bool root = pos1 == 0;
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	iter_swap(m->Conditions().begin() + pos1,
 		  m->Conditions().begin() + pos2);
 	m->UpdateConditionIndices();
@@ -569,7 +570,7 @@ void AdvSceneSwitcher::MacroConditionReorder(int to, int from)
 		return;
 	}
 	{
-		std::lock_guard<std::mutex> lock(switcher->m);
+		auto lock = LockContext();
 		auto condition = macro->Conditions().at(from);
 		if (to == 0) {
 			condition->SetLogicType(LogicType::ROOT_NONE);

src/macro-core/macro-condition-file.cpp

@@ -1,7 +1,6 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-file.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "curl-helper.hpp"
 
 #include <QTextStream>
@@ -331,7 +330,7 @@ void MacroConditionFileEdit::FileTypeChanged(int index)
 		_checkModificationDate->setDisabled(true);
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_fileType = type;
 }
 
@@ -341,7 +340,7 @@ void MacroConditionFileEdit::ConditionChanged(int index)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_condition =
 		static_cast<MacroConditionFile::ConditionType>(index);
 	SetWidgetVisibility();
@@ -353,7 +352,7 @@ void MacroConditionFileEdit::PathChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_file = text.toUtf8().constData();
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -365,7 +364,7 @@ void MacroConditionFileEdit::MatchTextChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_text = _matchText->toPlainText().toUtf8().constData();
 
 	adjustSize();
@@ -378,7 +377,7 @@ void MacroConditionFileEdit::RegexChanged(RegexConfig conf)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_regex = conf;
 	adjustSize();
 	updateGeometry();
@@ -390,7 +389,7 @@ void MacroConditionFileEdit::CheckModificationDateChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_useTime = state;
 }
 
@@ -400,7 +399,7 @@ void MacroConditionFileEdit::OnlyMatchIfChangedChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_onlyMatchIfChanged = state;
 }
 

src/macro-core/macro-condition-file.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "file-selection.hpp"
 #include "variable-text-edit.hpp"
 #include "regex-config.hpp"

src/macro-core/macro-condition-filter.cpp

@@ -1,7 +1,5 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-filter.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 #include <regex>
 
@@ -183,7 +181,7 @@ void MacroConditionFilterEdit::SourceChanged(const SourceSelection &source)
 		return;
 	}
 	{
-		std::lock_guard<std::mutex> lock(switcher->m);
+		auto lock = LockContext();
 		_entryData->_source = source;
 	}
 	_filters->clear();
@@ -197,7 +195,7 @@ void MacroConditionFilterEdit::FilterChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_filterName = text.toStdString();
 	_entryData->_filter =
 		GetWeakFilterByQString(_entryData->_source.GetSource(), text);
@@ -211,7 +209,7 @@ void MacroConditionFilterEdit::ConditionChanged(int index)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_condition =
 		static_cast<MacroConditionFilter::Condition>(index);
 	SetSettingsSelectionVisible(_entryData->_condition ==
@@ -237,7 +235,7 @@ void MacroConditionFilterEdit::SettingsChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_settings = _settings->toPlainText().toStdString();
 
 	adjustSize();
@@ -250,7 +248,7 @@ void MacroConditionFilterEdit::RegexChanged(RegexConfig conf)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_regex = conf;
 
 	adjustSize();

src/macro-core/macro-condition-filter.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "variable-text-edit.hpp"
 #include "regex-config.hpp"
 #include "source-selection.hpp"

src/macro-core/macro-condition-hotkey.cpp

@@ -1,7 +1,5 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-hotkey.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
@@ -88,7 +86,7 @@ void MacroConditionHotkeyEdit::NameChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	const auto name = _name->text().toStdString();
 	// In case a hotkey is used by multiple conditions create a new hotkey
 	// with the new description or get an existing hotkey matching this

src/macro-core/macro-condition-hotkey.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "hotkey.hpp"
 
 #include <QWidget>

src/macro-core/macro-condition-idle.cpp

@@ -1,8 +1,6 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-idle.hpp"
 #include "platform-funcs.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
@@ -62,7 +60,7 @@ void MacroConditionIdleEdit::DurationChanged(const Duration &dur)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_duration = dur;
 }
 

src/macro-core/macro-condition-idle.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "duration-control.hpp"
 
 #include <QWidget>

src/macro-core/macro-condition-macro.cpp

@@ -1,7 +1,6 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-macro.hpp"
+#include "macro.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
@@ -419,7 +418,7 @@ void MacroConditionMacroEdit::MacroChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_macro = text;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -431,7 +430,7 @@ void MacroConditionMacroEdit::CountChanged(const NumberVariable<int> &value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_count = value;
 }
 
@@ -441,7 +440,7 @@ void MacroConditionMacroEdit::CountConditionChanged(int cond)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_counterCondition =
 		static_cast<MacroConditionMacro::CounterCondition>(cond);
 }
@@ -469,7 +468,7 @@ void MacroConditionMacroEdit::TypeChanged(int type)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_type = static_cast<MacroConditionMacro::Type>(type);
 
 	switch (_entryData->_type) {
@@ -530,7 +529,7 @@ void MacroConditionMacroEdit::MultiStateConditionChanged(int cond)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_multiSateCondition =
 		static_cast<MacroConditionMacro::MultiStateCondition>(cond);
 }
@@ -542,7 +541,7 @@ void MacroConditionMacroEdit::MultiStateCountChanged(
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_multiSateCount = value;
 }
 
@@ -552,7 +551,7 @@ void MacroConditionMacroEdit::Add(const std::string &name)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	MacroRef macro(name);
 	_entryData->_macros.push_back(macro);
 	adjustSize();
@@ -564,7 +563,7 @@ void MacroConditionMacroEdit::Remove(int idx)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_macros.erase(std::next(_entryData->_macros.begin(), idx));
 	adjustSize();
 }
@@ -576,7 +575,7 @@ void MacroConditionMacroEdit::Replace(int idx, const std::string &name)
 	}
 
 	MacroRef macro(name);
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_macros[idx] = macro;
 	adjustSize();
 }

src/macro-core/macro-condition-macro.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "macro-selection.hpp"
 #include "macro-list.hpp"
 #include "variable-spinbox.hpp"

src/macro-core/macro-condition-media.cpp

@@ -1,7 +1,6 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-media.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
@@ -467,7 +466,7 @@ void MacroConditionMediaEdit::SourceTypeChanged(int idx)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_sourceType = static_cast<MacroConditionMedia::Type>(
 		_sourceTypes->itemData(idx).toInt());
 
@@ -488,7 +487,7 @@ void MacroConditionMediaEdit::SourceChanged(const SourceSelection &source)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_sourceGroup.clear();
 	_entryData->_sourceType = MacroConditionMedia::Type::SOURCE;
 	_entryData->ClearSignalHandler();
@@ -505,7 +504,7 @@ void MacroConditionMediaEdit::SceneChanged(const SceneSelection &s)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_scene = s;
 	_entryData->UpdateMediaSourcesOfSceneList();
 	emit HeaderInfoChanged(
@@ -532,7 +531,7 @@ void MacroConditionMediaEdit::StateChanged(int index)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_state = getMediaStateFromIdx(index);
 	if (_entryData->_sourceType != MacroConditionMedia::Type::SOURCE) {
 		_entryData->UpdateMediaSourcesOfSceneList();
@@ -552,7 +551,7 @@ void MacroConditionMediaEdit::TimeRestrictionChanged(int index)
 		_time->setDisabled(false);
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_restriction =
 		static_cast<MacroConditionMedia::Time>(index);
 	if (_entryData->_sourceType != MacroConditionMedia::Type::SOURCE) {
@@ -566,7 +565,7 @@ void MacroConditionMediaEdit::TimeChanged(const Duration &dur)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_time = dur;
 	if (_entryData->_sourceType != MacroConditionMedia::Type::SOURCE) {
 		_entryData->UpdateMediaSourcesOfSceneList();
@@ -579,7 +578,7 @@ void MacroConditionMediaEdit::OnChangeChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_onlyMatchOnChagne = value;
 	if (_entryData->_sourceType != MacroConditionMedia::Type::SOURCE) {
 		_entryData->UpdateMediaSourcesOfSceneList();

src/macro-core/macro-condition-media.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "duration-control.hpp"
 #include "scene-selection.hpp"
 #include "source-selection.hpp"

src/macro-core/macro-condition-obs-stats.cpp

@@ -1,7 +1,5 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-obs-stats.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
@@ -481,7 +479,7 @@ void MacroConditionStatsEdit::ValueChanged(const NumberVariable<double> &value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_value = value;
 }
 
@@ -492,7 +490,7 @@ void MacroConditionStatsEdit::StatsTypeChanged(int type)
 	}
 
 	{
-		std::lock_guard<std::mutex> lock(switcher->m);
+		auto lock = LockContext();
 		_entryData->_type =
 			static_cast<MacroConditionStats::Type>(type);
 		SetWidgetVisibility();
@@ -508,7 +506,7 @@ void MacroConditionStatsEdit::ConditionChanged(int cond)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_condition =
 		static_cast<MacroConditionStats::Condition>(cond);
 }

src/macro-core/macro-condition-obs-stats.hpp

@@ -1,8 +1,9 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
+#include "variable-spinbox.hpp"
+
 #include <QWidget>
 #include <QComboBox>
-#include <variable-spinbox.hpp>
 #include <util/platform.h>
 
 namespace advss {

src/macro-core/macro-condition-plugin-state.cpp

@@ -1,7 +1,6 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-plugin-state.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
@@ -144,7 +143,7 @@ void MacroConditionPluginStateEdit::ConditionChanged(int idx)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	if (_entryData->_condition ==
 	    MacroConditionPluginState::Condition::OBS_SHUTDOWN) {
 		switcher->shutdownConditionCount--;

src/macro-core/macro-condition-plugin-state.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include <QWidget>
 #include <QComboBox>
 

src/macro-core/macro-condition-process.cpp

@@ -1,8 +1,7 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-process.hpp"
+#include "switcher-data.hpp"
 #include "platform-funcs.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 #include <regex>
 
@@ -107,7 +106,7 @@ void MacroConditionProcessEdit::ProcessChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_process = text.toStdString();
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -119,7 +118,7 @@ void MacroConditionProcessEdit::FocusChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_focus = state;
 	SetWidgetVisibility();
 }

src/macro-core/macro-condition-process.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 
 #include <QComboBox>
 #include <QCheckBox>

src/macro-core/macro-condition-profile.cpp

@@ -1,7 +1,5 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-profile.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
@@ -69,7 +67,7 @@ void MacroConditionProfileEdit::ProfileChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_profile = text.toStdString();
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));

src/macro-core/macro-condition-profile.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
+
 #include <QWidget>
 #include <QComboBox>
 

src/macro-core/macro-condition-recording.cpp

@@ -1,7 +1,5 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-recording.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
@@ -90,7 +88,7 @@ void MacroConditionRecordEdit::StateChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_recordState = static_cast<RecordState>(value);
 }
 

src/macro-core/macro-condition-recording.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
+
 #include <QWidget>
 #include <QComboBox>
 

src/macro-core/macro-condition-replay-buffer.cpp

@@ -1,7 +1,6 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-replay-buffer.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
@@ -96,7 +95,7 @@ void MacroConditionReplayBufferEdit::StateChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_state = static_cast<ReplayBufferState>(value);
 }
 

src/macro-core/macro-condition-replay-buffer.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
+
 #include <QWidget>
 #include <QComboBox>
 

src/macro-core/macro-condition-run.cpp

@@ -1,7 +1,5 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-run.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 #include <QProcess>
 #include <QDesktopServices>
@@ -185,7 +183,7 @@ void MacroConditionRunEdit::TimeoutChanged(const Duration &dur)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_timeout = dur;
 }
 
@@ -195,7 +193,7 @@ void MacroConditionRunEdit::CheckExitCodeChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_checkExitCode = state;
 }
 
@@ -205,7 +203,7 @@ void MacroConditionRunEdit::ExitCodeChanged(int exitCode)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_exitCode = exitCode;
 }
 
@@ -215,7 +213,7 @@ void MacroConditionRunEdit::ProcessConfigChanged(const ProcessConfig &conf)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_procConfig = conf;
 	adjustSize();
 	updateGeometry();

src/macro-core/macro-condition-run.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "process-config.hpp"
 #include "duration-control.hpp"
 

src/macro-core/macro-condition-scene-order.cpp

@@ -1,7 +1,5 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-scene-order.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
@@ -270,7 +268,7 @@ void MacroConditionSceneOrderEdit::SceneChanged(const SceneSelection &s)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_scene = s;
 }
 
@@ -280,7 +278,7 @@ void MacroConditionSceneOrderEdit::SourceChanged(const SceneItemSelection &item)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_source = item;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -292,7 +290,7 @@ void MacroConditionSceneOrderEdit::Source2Changed(const SceneItemSelection &item
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_source2 = item;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -304,7 +302,7 @@ void MacroConditionSceneOrderEdit::ConditionChanged(int index)
 		return;
 	}
 	{
-		std::lock_guard<std::mutex> lock(switcher->m);
+		auto lock = LockContext();
 		_entryData->_condition =
 			static_cast<MacroConditionSceneOrder::Condition>(index);
 	}
@@ -330,7 +328,7 @@ void MacroConditionSceneOrderEdit::PositionChanged(
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_position = value;
 }
 

src/macro-core/macro-condition-scene-order.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "scene-selection.hpp"
 #include "scene-item-selection.hpp"
 #include "variable-spinbox.hpp"

src/macro-core/macro-condition-scene-transform.cpp

@@ -1,7 +1,5 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-scene-transform.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
@@ -152,7 +150,7 @@ void MacroConditionSceneTransformEdit::SceneChanged(const SceneSelection &s)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_scene = s;
 }
 
@@ -163,7 +161,7 @@ void MacroConditionSceneTransformEdit::SourceChanged(
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_source = item;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -198,7 +196,7 @@ void MacroConditionSceneTransformEdit::SettingsChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_settings = _settings->toPlainText().toStdString();
 
 	adjustSize();
@@ -211,7 +209,7 @@ void MacroConditionSceneTransformEdit::RegexChanged(RegexConfig conf)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_regex = conf;
 
 	adjustSize();

src/macro-core/macro-condition-scene-transform.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "scene-selection.hpp"
 #include "scene-item-selection.hpp"
 #include "variable-text-edit.hpp"

src/macro-core/macro-condition-scene-visibility.cpp

@@ -1,7 +1,5 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-scene-visibility.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 #include <regex>
 
@@ -181,7 +179,7 @@ void MacroConditionSceneVisibilityEdit::SourceChanged(
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_source = item;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -193,7 +191,7 @@ void MacroConditionSceneVisibilityEdit::SceneChanged(const SceneSelection &s)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_scene = s;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -205,7 +203,7 @@ void MacroConditionSceneVisibilityEdit::ConditionChanged(int index)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_condition =
 		static_cast<MacroConditionSceneVisibility::Condition>(index);
 	if (_entryData->_condition ==

src/macro-core/macro-condition-scene-visibility.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "scene-selection.hpp"
 #include "scene-item-selection.hpp"
 

src/macro-core/macro-condition-scene.cpp

@@ -1,7 +1,6 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-scene.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
@@ -181,7 +180,7 @@ void MacroConditionSceneEdit::SceneChanged(const SceneSelection &s)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_scene = s;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -193,7 +192,7 @@ void MacroConditionSceneEdit::TypeChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_type = static_cast<MacroConditionScene::Type>(value);
 	SetWidgetVisibility();
 }
@@ -204,7 +203,7 @@ void MacroConditionSceneEdit::PatternChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_pattern = _pattern->text().toStdString();
 }
 
@@ -214,7 +213,7 @@ void MacroConditionSceneEdit::UseTransitionTargetSceneChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_useTransitionTargetScene = state;
 }
 

src/macro-core/macro-condition-scene.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "scene-selection.hpp"
 
 #include <QWidget>

src/macro-core/macro-condition-source.cpp

@@ -1,7 +1,5 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-source.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
@@ -157,7 +155,7 @@ void MacroConditionSourceEdit::SourceChanged(const SourceSelection &source)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_source = source;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -169,7 +167,7 @@ void MacroConditionSourceEdit::ConditionChanged(int index)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_condition = static_cast<SourceCondition>(index);
 	SetSettingsSelectionVisible(_entryData->_condition ==
 				    SourceCondition::SETTINGS);
@@ -195,7 +193,7 @@ void MacroConditionSourceEdit::SettingsChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_settings = _settings->toPlainText().toStdString();
 
 	adjustSize();
@@ -208,7 +206,7 @@ void MacroConditionSourceEdit::RegexChanged(RegexConfig conf)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_regex = conf;
 
 	adjustSize();

src/macro-core/macro-condition-source.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "variable-text-edit.hpp"
 #include "regex-config.hpp"
 #include "source-selection.hpp"

src/macro-core/macro-condition-streaming.cpp

@@ -1,7 +1,6 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-streaming.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
@@ -109,7 +108,7 @@ void MacroConditionStreamEdit::StateChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_streamState = static_cast<StreamState>(value);
 }
 

src/macro-core/macro-condition-streaming.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
+
 #include <QWidget>
 #include <QComboBox>