Improve "Studio mode" action

data/locale/de-DE.ini

@@ -495,7 +495,7 @@ AdvSceneSwitcher.action.file.type.write="Schreiben"
 AdvSceneSwitcher.action.file.type.append="Anhängen"
 AdvSceneSwitcher.action.file.entry="{{actions}} in {{filePath}}:"
 AdvSceneSwitcher.action.studioMode="Studio-Modus"
-AdvSceneSwitcher.action.studioMode.type.swap="Vorschau- und Programm-Szene tauschen"
+AdvSceneSwitcher.action.studioMode.type.transitionWithSwap="Vorschau- und Programm-Szene tauschen"
 AdvSceneSwitcher.action.studioMode.type.setScene="Vorschau-Szene einstellen auf"
 AdvSceneSwitcher.action.studioMode.type.enable="Studio-Modus aktivieren"
 AdvSceneSwitcher.action.studioMode.type.disable="Studio-Modus deaktivieren"

data/locale/en-US.ini

@@ -91,12 +91,6 @@ AdvSceneSwitcher.variableTab.lastUsed.text.never="Never"
 AdvSceneSwitcher.variableTab.lastChanged.header="Last changed"
 AdvSceneSwitcher.variableTab.lastChanged.text.none="No change since launch"
 AdvSceneSwitcher.variableTab.lastChanged.tooltip="Times changed: %1\n\nPrevious value: %2"
-AdvSceneSwitcher.variableTab.search.placeholder="Search ..."
-AdvSceneSwitcher.variableTab.search.all="All columns"
-AdvSceneSwitcher.variableTab.search.name="Name column"
-AdvSceneSwitcher.variableTab.search.value="Value column"
-AdvSceneSwitcher.variableTab.addDock="Add dock"
-AdvSceneSwitcher.variableTab.clear="Clear"
 
 # Action Queue Tab
 AdvSceneSwitcher.actionQueueTab.title="Action Queues"
@@ -934,9 +928,6 @@ AdvSceneSwitcher.action.source.type.deinterlaceOrder="Set deinterlace field orde
 AdvSceneSwitcher.action.source.type.openInteractionDialog="Open interaction dialog"
 AdvSceneSwitcher.action.source.type.openFilterDialog="Open filter dialog"
 AdvSceneSwitcher.action.source.type.openPropertiesDialog="Open properties dialog"
-AdvSceneSwitcher.action.source.type.closeInteractionDialog="Close interaction dialog"
-AdvSceneSwitcher.action.source.type.closeFilterDialog="Close filter dialog"
-AdvSceneSwitcher.action.source.type.closePropertiesDialog="Close properties dialog"
 AdvSceneSwitcher.action.source.entry="{{actions}}{{sources}}{{settingsButtons}}{{deinterlaceMode}}{{deinterlaceOrder}}{{refresh}}"
 AdvSceneSwitcher.action.source.entry.settings="{{settings}}{{settingsInputMethod}}{{settingValue}}{{tempVar}}"
 AdvSceneSwitcher.action.source.warning="Warning: Enabling and disabling sources globally cannot be controlled by the OBS UI\nYou might be looking for \"Scene item visibility\""
@@ -958,7 +949,6 @@ AdvSceneSwitcher.action.source.inputMethod.individualTempvar="Set to macro prope
 AdvSceneSwitcher.action.source.inputMethod.json="Set setting JSON string"
 AdvSceneSwitcher.action.source.refresh="Refresh"
 AdvSceneSwitcher.action.source.refresh.tooltip="Repopulate the source settings selection with the settings of the source which's name matches the variable value."
-AdvSceneSwitcher.action.source.dialog.accept="Accept changes"
 AdvSceneSwitcher.action.media="Media"
 AdvSceneSwitcher.action.media.type.play="Play"
 AdvSceneSwitcher.action.media.type.pause="Pause"
@@ -994,16 +984,12 @@ AdvSceneSwitcher.action.macro.type.disableAction="Disable action"
 AdvSceneSwitcher.action.macro.type.enableAction="Enable action"
 AdvSceneSwitcher.action.macro.type.toggleAction="Toggle action"
 AdvSceneSwitcher.action.macro.type.nestedMacro="Nested macro"
-AdvSceneSwitcher.action.macro.actionSelectionType.index="at index"
-AdvSceneSwitcher.action.macro.actionSelectionType.label="with label"
-AdvSceneSwitcher.action.macro.actionSelectionType.id="of action type"
 AdvSceneSwitcher.action.macro.type.nestedMacro.conditionHelp="This section allows you to define macro conditions.\n\nClick the plus button below to add a new condition."
 AdvSceneSwitcher.action.macro.type.nestedMacro.actionHelp="This section allows you to define macro actions.\nThe actions in this section will be performed when the conditions are met.\n\nClick the plus button below to add a new action."
 AdvSceneSwitcher.action.macro.type.nestedMacro.elseActionHelp="This section allows you to define macro actions.\nThe actions in this section will be performed when the conditions are *not* met.\n\nClick the plus button below to add a new action."
-AdvSceneSwitcher.action.macro.layout.run="{{actions}}{{actionSections}}of{{macros}}"
-AdvSceneSwitcher.action.macro.layout.run.condition="{{conditionBehaviors}}of{{conditionMacros}}"
-AdvSceneSwitcher.action.macro.layout.actionState="{{actions}}{{actionSelectionType}}{{actionIndex}}{{label}}{{regex}}{{actionTypes}}in{{actionSections}}section of{{macros}}"
-AdvSceneSwitcher.action.macro.layout.other="{{actions}}{{macros}}"
+AdvSceneSwitcher.action.macro.entry.run="{{actions}}{{actionTypes}}of{{macros}}"
+AdvSceneSwitcher.action.macro.entry.run.condition="{{conditionBehaviors}}of{{conditionMacros}}"
+AdvSceneSwitcher.action.macro.entry.other="{{actions}}{{actionIndex}}{{macros}}"
 AdvSceneSwitcher.action.pluginState="Plugin state"
 AdvSceneSwitcher.action.pluginState.type.stop="Stop the Advanced Scene Switcher plugin"
 AdvSceneSwitcher.action.pluginState.type.noMatch="Change the no-match behaviour:"
@@ -1069,7 +1055,17 @@ AdvSceneSwitcher.action.file.type.write="Write"
 AdvSceneSwitcher.action.file.type.append="Append"
 AdvSceneSwitcher.action.file.entry="{{actions}}to{{filePath}}:"
 AdvSceneSwitcher.action.studioMode="Studio mode"
-AdvSceneSwitcher.action.studioMode.type.swap="Swap preview and program scene"
+AdvSceneSwitcher.action.studioMode.type.transition="Transition"
+AdvSceneSwitcher.action.studioMode.type.transitionWithSwap="Swap preview and program scene"
+AdvSceneSwitcher.action.studioMode.type.transitionSwap.enable="Enable preview/program scene swapping after transition"
+AdvSceneSwitcher.action.studioMode.type.transitionSwap.disable="Disable preview/program scene swapping after transition"
+AdvSceneSwitcher.action.studioMode.type.transitionSwap.toggle="Toggle preview/program scene swapping after transition"
+AdvSceneSwitcher.action.studioMode.type.duplicateScene.enable="Enable scene duplication"
+AdvSceneSwitcher.action.studioMode.type.duplicateScene.disable="Disable scene duplication"
+AdvSceneSwitcher.action.studioMode.type.duplicateScene.toggle="Toggle scene duplication"
+AdvSceneSwitcher.action.studioMode.type.duplicateSource.enable="Enable source duplication"
+AdvSceneSwitcher.action.studioMode.type.duplicateSource.disable="Disable source duplication"
+AdvSceneSwitcher.action.studioMode.type.duplicateSource.toggle="Toggle source duplication"
 AdvSceneSwitcher.action.studioMode.type.setScene="Set preview scene to"
 AdvSceneSwitcher.action.studioMode.type.enable="Enable studio mode"
 AdvSceneSwitcher.action.studioMode.type.disable="Disable studio mode"
@@ -1155,7 +1151,6 @@ AdvSceneSwitcher.action.http.entry.line2="Timeout:{{timeout}}seconds"
 AdvSceneSwitcher.action.variable="Variable"
 AdvSceneSwitcher.action.variable.type.set="Set to value"
 AdvSceneSwitcher.action.variable.type.append="Append"
-AdvSceneSwitcher.action.variable.type.copy="Copy variable"
 AdvSceneSwitcher.action.variable.type.appendVar="Append variable"
 AdvSceneSwitcher.action.variable.type.increment="Increment"
 AdvSceneSwitcher.action.variable.type.decrement="Decrement"
@@ -2323,9 +2318,6 @@ AdvSceneSwitcher.tempVar.mqtt.message="Message"
 AdvSceneSwitcher.tempVar.cursor.x="Cursor position (X)"
 AdvSceneSwitcher.tempVar.cursor.y="Cursor position (Y)"
 
-AdvSceneSwitcher.tempVar.replay.lastSavePath="Last save path"
-AdvSceneSwitcher.tempVar.replay.lastSavePath.description="The file path of the last replay buffer saved."
-
 AdvSceneSwitcher.selectScene="--select scene--"
 AdvSceneSwitcher.selectCanvas="--select canvas--"
 AdvSceneSwitcher.selectPreviousScene="Previous Scene"

data/locale/es-ES.ini

@@ -413,7 +413,7 @@ AdvSceneSwitcher.action.file.type.write="Escribir"
 AdvSceneSwitcher.action.file.type.append="Agregar"
 AdvSceneSwitcher.action.file.entry="{{actions}} a {{filePath}}:"
 AdvSceneSwitcher.action.studioMode="Modo estudio"
-AdvSceneSwitcher.action.studioMode.type.swap="Intercambiar vista previa y escena del programa"
+AdvSceneSwitcher.action.studioMode.type.transitionWithSwap="Intercambiar vista previa y escena del programa"
 AdvSceneSwitcher.action.studioMode.type.setScene="Establecer escena de vista previa en"
 AdvSceneSwitcher.action.studioMode.type.enable="Activar modo estudio"
 AdvSceneSwitcher.action.studioMode.type.disable="Deshabilitar el modo de estudio"

data/locale/fr-FR.ini

@@ -613,7 +613,7 @@ AdvSceneSwitcher.action.file.type.write="Écrire"
 AdvSceneSwitcher.action.file.type.append="Ajouter"
 AdvSceneSwitcher.action.file.entry="{{actions}}vers{{filePath}}:"
 AdvSceneSwitcher.action.studioMode="Mode studio"
-AdvSceneSwitcher.action.studioMode.type.swap="Permuter la scène de prévisualisation et la scène du programme"
+AdvSceneSwitcher.action.studioMode.type.transitionWithSwap="Permuter la scène de prévisualisation et la scène du programme"
 AdvSceneSwitcher.action.studioMode.type.setScene="Définir la scène de prévisualisation sur"
 AdvSceneSwitcher.action.studioMode.type.enable="Activer le mode studio"
 AdvSceneSwitcher.action.studioMode.type.disable="Désactiver le mode studio"

data/locale/ja-JP.ini

@@ -1016,7 +1016,7 @@ AdvSceneSwitcher.action.file="ファイル"
 ; AdvSceneSwitcher.action.file.type.append="Append"
 AdvSceneSwitcher.action.file.entry="{{actions}}から{{filePath}}へ:"
 AdvSceneSwitcher.action.studioMode="スタジオモード"
-AdvSceneSwitcher.action.studioMode.type.swap="プレビューと番組シーンの入れ替え"
+AdvSceneSwitcher.action.studioMode.type.transitionWithSwap="プレビューと番組シーンの入れ替え"
 AdvSceneSwitcher.action.studioMode.type.setScene="プレビューシーンを設定する"
 AdvSceneSwitcher.action.studioMode.type.enable="スタジオモードを有効にする"
 AdvSceneSwitcher.action.studioMode.type.disable="スタジオモードを無効にする"

data/locale/pt-BR.ini

@@ -861,9 +861,9 @@ AdvSceneSwitcher.action.macro.type.stop="Parar ações"
 AdvSceneSwitcher.action.macro.type.disableAction="Desabilitar ação"
 AdvSceneSwitcher.action.macro.type.enableAction="Habilitar ação"
 AdvSceneSwitcher.action.macro.type.toggleAction="Alternar ação"
-AdvSceneSwitcher.action.macro.layout.run="{{actions}}{{actionSections}}de{{macros}}"
-AdvSceneSwitcher.action.macro.layout.run.condition="{{conditionBehaviors}}de{{conditionMacros}}"
-AdvSceneSwitcher.action.macro.layout.other="{{actions}}{{macros}}"
+AdvSceneSwitcher.action.macro.entry.run="{{actions}}{{actionTypes}}de{{macros}}"
+AdvSceneSwitcher.action.macro.entry.run.condition="{{conditionBehaviors}}de{{conditionMacros}}"
+AdvSceneSwitcher.action.macro.entry.other="{{actions}}{{actionIndex}}{{macros}}"
 AdvSceneSwitcher.action.pluginState="Estado do plugin"
 AdvSceneSwitcher.action.pluginState.type.stop="Parar o plugin Advanced Scene Switcher"
 AdvSceneSwitcher.action.pluginState.type.noMatch="Alterar o comportamento em caso de não correspondência:"
@@ -923,7 +923,7 @@ AdvSceneSwitcher.action.file.type.write="Escrever"
 AdvSceneSwitcher.action.file.type.append="Anexar"
 AdvSceneSwitcher.action.file.entry="{{actions}}para{{filePath}}:"
 AdvSceneSwitcher.action.studioMode="Modo estúdio"
-AdvSceneSwitcher.action.studioMode.type.swap="Trocar cena de visualização e programa"
+AdvSceneSwitcher.action.studioMode.type.transitionWithSwap="Trocar cena de visualização e programa"
 AdvSceneSwitcher.action.studioMode.type.setScene="Definir cena de visualização para"
 AdvSceneSwitcher.action.studioMode.type.enable="Habilitar modo estúdio"
 AdvSceneSwitcher.action.studioMode.type.disable="Desabilitar modo estúdio"

data/locale/zh-CN.ini

@@ -920,9 +920,9 @@ AdvSceneSwitcher.action.macro.type.stop="停止操作"
 AdvSceneSwitcher.action.macro.type.disableAction="停用操作"
 AdvSceneSwitcher.action.macro.type.enableAction="启用操作"
 AdvSceneSwitcher.action.macro.type.toggleAction="切换操作开关"
-AdvSceneSwitcher.action.macro.layout.run="{{actions}}{{actionSections}}{{macros}}"
-AdvSceneSwitcher.action.macro.layout.run.condition="{{conditionBehaviors}}{{conditionMacros}}"
-AdvSceneSwitcher.action.macro.layout.other="{{actions}}{{macros}}"
+AdvSceneSwitcher.action.macro.entry.run="{{actions}}{{actionTypes}}{{macros}}"
+AdvSceneSwitcher.action.macro.entry.run.condition="{{conditionBehaviors}}{{conditionMacros}}"
+AdvSceneSwitcher.action.macro.entry.other="{{actions}}{{actionIndex}}{{macros}}"
 AdvSceneSwitcher.action.pluginState="插件状态"
 AdvSceneSwitcher.action.pluginState.type.stop="停止高级场景切换插件"
 AdvSceneSwitcher.action.pluginState.type.noMatch="没有匹配项时:"
@@ -984,7 +984,7 @@ AdvSceneSwitcher.action.file.type.write="覆盖写入"
 AdvSceneSwitcher.action.file.type.append="追加写入"
 AdvSceneSwitcher.action.file.entry="{{actions}} 到 {{filePath}}:"
 AdvSceneSwitcher.action.studioMode="工作室模式"
-AdvSceneSwitcher.action.studioMode.type.swap="切换预览和程序场景"
+AdvSceneSwitcher.action.studioMode.type.transitionWithSwap="切换预览和程序场景"
 AdvSceneSwitcher.action.studioMode.type.setScene="将预览场景设置为"
 AdvSceneSwitcher.action.studioMode.type.enable="启用工作室模式"
 AdvSceneSwitcher.action.studioMode.type.disable="停用工作室模式"

lib/advanced-scene-switcher.cpp

@@ -421,7 +421,7 @@ bool SwitcherData::CheckForMatch(OBSWeakSource &scene,
 
 static void ResetMacros()
 {
-	for (auto &m : GetTopLevelMacros()) {
+	for (auto &m : GetMacros()) {
 		ResetMacroRunCount(m.get());
 		ResetMacroConditionTimers(m.get());
 	}

lib/general.cpp

@@ -459,7 +459,7 @@ void SwitcherData::LoadSettings(obs_data_t *obj)
 	LoadHotkeys(obj);
 	LoadUISettings(obj);
 
-	RunAndClearPostLoadSteps();
+	RunPostLoadSteps();
 
 	// Reset on startup and scene collection change
 	ResetLastOpenedTab();

lib/macro/macro-action-edit.cpp

@@ -117,7 +117,7 @@ void MacroActionEdit::ActionSelectionChanged(const QString &text)
 		*_entryData = MacroActionFactory::Create(id, macro);
 		(*_entryData)->SetIndex(idx);
 		(*_entryData)->PostLoad();
-		RunAndClearPostLoadSteps();
+		RunPostLoadSteps();
 	}
 	auto widget = MacroActionFactory::CreateWidget(id, this, *_entryData);
 	QWidget::connect(widget, SIGNAL(HeaderInfoChanged(const QString &)),

lib/macro/macro-action-macro.cpp

@@ -2,7 +2,6 @@
 #include "help-icon.hpp"
 #include "layout-helpers.hpp"
 #include "macro.hpp"
-#include "macro-action-factory.hpp"
 
 namespace advss {
 
@@ -13,74 +12,6 @@ bool MacroActionMacro::_registered = MacroActionFactory::Register(
 	{MacroActionMacro::Create, MacroActionMacroEdit::Create,
 	 "AdvSceneSwitcher.action.macro"});
 
-void MacroActionMacro::AdjustActionState(Macro *macro) const
-{
-	const auto &macroActions = _useElseSection ? macro->ElseActions()
-						   : macro->Actions();
-
-	std::vector<std::shared_ptr<MacroAction>> actionsToModify;
-	switch (_actionSelectionType) {
-	case SelectionType::INDEX: {
-		const bool isValidAction =
-			(_useElseSection &&
-			 IsValidElseActionIndex(macro, _actionIndex - 1)) ||
-			(!_useElseSection &&
-			 IsValidActionIndex(macro, _actionIndex - 1));
-
-		if (isValidAction) {
-			actionsToModify.emplace_back(
-				macroActions.at(_actionIndex - 1));
-		}
-		break;
-	}
-	case SelectionType::LABEL:
-		for (const auto &action : macroActions) {
-			if (!action->GetUseCustomLabel()) {
-				continue;
-			}
-
-			const auto label = action->GetCustomLabel();
-
-			if (_regex.Enabled()) {
-				if (_regex.Matches(label, _label)) {
-					actionsToModify.emplace_back(action);
-				}
-				continue;
-			}
-
-			if (label == std::string(_label)) {
-				actionsToModify.emplace_back(action);
-			}
-		}
-		break;
-	case SelectionType::ID:
-		for (const auto &action : macroActions) {
-			if (action->GetId() == _actionId) {
-				actionsToModify.emplace_back(action);
-			}
-		}
-		break;
-	default:
-		break;
-	}
-
-	for (const auto &action : actionsToModify) {
-		switch (_action) {
-		case Action::DISABLE_ACTION:
-			action->SetEnabled(false);
-			break;
-		case Action::ENABLE_ACTION:
-			action->SetEnabled(true);
-			break;
-		case Action::TOGGLE_ACTION:
-			action->SetEnabled(!action->Enabled());
-			break;
-		default:
-			break;
-		}
-	}
-}
-
 bool MacroActionMacro::PerformAction()
 {
 	if (_action == Action::NESTED_MACRO) {
@@ -113,9 +44,23 @@ bool MacroActionMacro::PerformAction()
 		macro->Stop();
 		break;
 	case Action::DISABLE_ACTION:
+		if (IsValidMacroSegmentIndex(macro.get(), _actionIndex - 1,
+					     false)) {
+			macro->Actions().at(_actionIndex - 1)->SetEnabled(false);
+		}
+		break;
 	case Action::ENABLE_ACTION:
+		if (IsValidMacroSegmentIndex(macro.get(), _actionIndex - 1,
+					     false)) {
+			macro->Actions().at(_actionIndex - 1)->SetEnabled(true);
+		}
+		break;
 	case Action::TOGGLE_ACTION:
-		AdjustActionState(macro.get());
+		if (IsValidMacroSegmentIndex(macro.get(), _actionIndex - 1,
+					     false)) {
+			auto action = macro->Actions().at(_actionIndex - 1);
+			action->SetEnabled(!action->Enabled());
+		}
 		break;
 	default:
 		break;
@@ -170,14 +115,9 @@ void MacroActionMacro::LogAction() const
 bool MacroActionMacro::Save(obs_data_t *obj) const
 {
 	MacroAction::Save(obj);
-	obs_data_set_int(obj, "action", static_cast<int>(_action));
 	_macro.Save(obj);
-	obs_data_set_int(obj, "actionSelectionType",
-			 static_cast<int>(_actionSelectionType));
 	_actionIndex.Save(obj, "actionIndex");
-	_label.Save(obj, "label");
-	obs_data_set_string(obj, "actionId", _actionId.c_str());
-	_regex.Save(obj);
+	obs_data_set_int(obj, "action", static_cast<int>(_action));
 	_runOptions.Save(obj);
 	OBSDataAutoRelease nestedMacroData = obs_data_create();
 	_nestedMacro->Save(nestedMacroData);
@@ -189,15 +129,10 @@ bool MacroActionMacro::Save(obs_data_t *obj) const
 bool MacroActionMacro::Load(obs_data_t *obj)
 {
 	MacroAction::Load(obj);
+	_macro.Load(obj);
+	_actionIndex.Load(obj, "actionIndex");
 	_action = static_cast<MacroActionMacro::Action>(
 		obs_data_get_int(obj, "action"));
-	_macro.Load(obj);
-	_actionSelectionType = static_cast<SelectionType>(
-		obs_data_get_int(obj, "actionSelectionType"));
-	_actionIndex.Load(obj, "actionIndex");
-	_label.Load(obj, "label");
-	_actionId = obs_data_get_string(obj, "actionId");
-	_regex.Load(obj);
 	_runOptions.Load(obj);
 
 	if (obs_data_has_user_value(obj, "nestedMacro")) {
@@ -248,7 +183,6 @@ std::shared_ptr<MacroAction> MacroActionMacro::Copy() const
 void MacroActionMacro::ResolveVariablesToFixedValues()
 {
 	_actionIndex.ResolveVariables();
-	_label.ResolveVariables();
 }
 
 static void runActionsHelper(Macro *macro, bool runElseActions, bool setInputs,
@@ -332,7 +266,7 @@ static void populateConditionBehaviorSelection(QComboBox *list)
 		"AdvSceneSwitcher.action.macro.type.run.conditions.false"));
 }
 
-static void populateActionSectionSelection(QComboBox *list)
+static void populateActionTypeSelection(QComboBox *list)
 {
 	list->addItem(obs_module_text(
 		"AdvSceneSwitcher.action.macro.type.run.actionType.regular"));
@@ -340,47 +274,19 @@ static void populateActionSectionSelection(QComboBox *list)
 		"AdvSceneSwitcher.action.macro.type.run.actionType.else"));
 }
 
-static void populateActionTypes(QComboBox *list)
-{
-	for (const auto &[id, info] : MacroActionFactory::GetActionTypes()) {
-		list->addItem(obs_module_text(info._name.c_str()),
-			      QString::fromStdString(id));
-	}
-}
-
-static void populateActionSelectionTypes(QComboBox *list)
-{
-	list->addItem(
-		obs_module_text(
-			"AdvSceneSwitcher.action.macro.actionSelectionType.index"),
-		static_cast<int>(MacroActionMacro::SelectionType::INDEX));
-	list->addItem(
-		obs_module_text(
-			"AdvSceneSwitcher.action.macro.actionSelectionType.label"),
-		static_cast<int>(MacroActionMacro::SelectionType::LABEL));
-	list->addItem(
-		obs_module_text(
-			"AdvSceneSwitcher.action.macro.actionSelectionType.id"),
-		static_cast<int>(MacroActionMacro::SelectionType::ID));
-}
-
 MacroActionMacroEdit::MacroActionMacroEdit(
 	QWidget *parent, std::shared_ptr<MacroActionMacro> entryData)
 	: ResizableWidget(parent),
-	  _actions(new QComboBox()),
 	  _macros(new MacroSelection(parent)),
-	  _actionSelectionType(new QComboBox(this)),
 	  _actionIndex(new MacroSegmentSelection(
 		  this, MacroSegmentSelection::Type::ACTION)),
-	  _label(new VariableLineEdit(this)),
-	  _actionTypes(new FilterComboBox(this)),
-	  _regex(new RegexConfigWidget(this)),
+	  _actions(new QComboBox()),
 	  _conditionMacros(new MacroSelection(parent)),
 	  _conditionBehaviors(new QComboBox()),
 	  _reevaluateConditionState(new QCheckBox(
 		  obs_module_text("AdvSceneSwitcher.action.macro.type.run."
 				  "updateConditionMatchState"))),
-	  _actionSections(new QComboBox(this)),
+	  _actionTypes(new QComboBox()),
 	  _skipWhenPaused(new QCheckBox(obs_module_text(
 		  "AdvSceneSwitcher.action.macro.type.run.skipWhenPaused"))),
 	  _setInputs(new QCheckBox(obs_module_text(
@@ -399,9 +305,7 @@ MacroActionMacroEdit::MacroActionMacroEdit(
 {
 	populateActionSelection(_actions);
 	populateConditionBehaviorSelection(_conditionBehaviors);
-	populateActionSectionSelection(_actionSections);
-	populateActionSelectionTypes(_actionSelectionType);
-	populateActionTypes(_actionTypes);
+	populateActionTypeSelection(_actionTypes);
 
 	_conditionMacros->HideSelectedMacro();
 
@@ -409,25 +313,16 @@ MacroActionMacroEdit::MacroActionMacroEdit(
 			 this, SLOT(MacroChanged(const QString &)));
 	QWidget::connect(_actions, SIGNAL(currentIndexChanged(int)), this,
 			 SLOT(ActionChanged(int)));
-	QWidget::connect(_actionSelectionType, SIGNAL(currentIndexChanged(int)),
-			 this, SLOT(ActionSelectionTypeChanged(int)));
 	QWidget::connect(_actionIndex,
 			 SIGNAL(SelectionChanged(const IntVariable &)), this,
 			 SLOT(ActionIndexChanged(const IntVariable &)));
-	QWidget::connect(_label, SIGNAL(editingFinished()), this,
-			 SLOT(LabelChanged()));
-	QWidget::connect(_actionTypes, SIGNAL(currentIndexChanged(int)), this,
-			 SLOT(ActionTypeChanged(int)));
-	QWidget::connect(_regex,
-			 SIGNAL(RegexConfigChanged(const RegexConfig &)), this,
-			 SLOT(RegexChanged(const RegexConfig &)));
 	QWidget::connect(_conditionMacros,
 			 SIGNAL(currentTextChanged(const QString &)), this,
 			 SLOT(ConditionMacroChanged(const QString &)));
 	QWidget::connect(_conditionBehaviors, SIGNAL(currentIndexChanged(int)),
 			 this, SLOT(ConditionBehaviorChanged(int)));
-	QWidget::connect(_actionSections, SIGNAL(currentIndexChanged(int)),
-			 this, SLOT(ActionSectionChanged(int)));
+	QWidget::connect(_actionTypes, SIGNAL(currentIndexChanged(int)), this,
+			 SLOT(ActionTypeChanged(int)));
 	QWidget::connect(_skipWhenPaused, SIGNAL(stateChanged(int)), this,
 			 SLOT(SkipWhenPausedChanged(int)));
 	QWidget::connect(_setInputs, SIGNAL(stateChanged(int)), this,
@@ -480,24 +375,17 @@ void MacroActionMacroEdit::UpdateEntryData()
 	if (!_entryData) {
 		return;
 	}
-
 	_actions->setCurrentIndex(
 		_actions->findData(static_cast<int>(_entryData->_action)));
-	_actionSelectionType->setCurrentIndex(_actionSelectionType->findData(
-		static_cast<int>(_entryData->_actionSelectionType)));
 	_actionIndex->SetValue(_entryData->_actionIndex);
 	_actionIndex->SetMacro(_entryData->_macro.GetMacro());
-	_label->setText(_entryData->_label);
-	_actionTypes->setCurrentIndex(_actionTypes->findData(
-		QString::fromStdString(_entryData->_actionId)));
-	_regex->SetRegexConfig(_entryData->_regex);
 	_macros->SetCurrentMacro(_entryData->_macro);
 	_conditionMacros->SetCurrentMacro(_entryData->_runOptions.macro);
 	_conditionBehaviors->setCurrentIndex(
 		static_cast<int>(_entryData->_runOptions.logic));
 	_reevaluateConditionState->setChecked(
 		_entryData->_runOptions.reevaluateConditionState);
-	_actionSections->setCurrentIndex(
+	_actionTypes->setCurrentIndex(
 		_entryData->_runOptions.runElseActions ? 1 : 0);
 	_skipWhenPaused->setChecked(_entryData->_runOptions.skipWhenPaused);
 	_setInputs->setChecked(_entryData->_runOptions.setInputs);
@@ -536,40 +424,12 @@ void MacroActionMacroEdit::ActionChanged(int idx)
 	SetWidgetVisibility();
 }
 
-void MacroActionMacroEdit::ActionSelectionTypeChanged(int idx)
-{
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_actionSelectionType =
-		static_cast<MacroActionMacro::SelectionType>(
-			_actionSelectionType->itemData(idx).toInt());
-	SetWidgetVisibility();
-}
-
 void MacroActionMacroEdit::ActionIndexChanged(const IntVariable &value)
 {
 	GUARD_LOADING_AND_LOCK();
 	_entryData->_actionIndex = value;
 }
 
-void MacroActionMacroEdit::LabelChanged()
-{
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_label = _label->text().toStdString();
-}
-
-void MacroActionMacroEdit::ActionTypeChanged(int idx)
-{
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_actionId =
-		_actionTypes->itemData(idx).toString().toStdString();
-}
-
-void MacroActionMacroEdit::RegexChanged(const RegexConfig &regex)
-{
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_regex = regex;
-}
-
 void MacroActionMacroEdit::ConditionMacroChanged(const QString &text)
 {
 	GUARD_LOADING_AND_LOCK();
@@ -591,13 +451,10 @@ void MacroActionMacroEdit::ReevaluateConditionStateChanged(int value)
 	SetWidgetVisibility();
 }
 
-void MacroActionMacroEdit::ActionSectionChanged(int useElse)
+void MacroActionMacroEdit::ActionTypeChanged(int value)
 {
 	GUARD_LOADING_AND_LOCK();
-	_entryData->_runOptions.runElseActions = useElse;
-	_entryData->_useElseSection = useElse;
-	_actionIndex->SetType(useElse ? MacroSegmentSelection::Type::ELSE_ACTION
-				      : MacroSegmentSelection::Type::ACTION);
+	_entryData->_runOptions.runElseActions = value;
 }
 
 void MacroActionMacroEdit::SkipWhenPausedChanged(int value)
@@ -626,11 +483,7 @@ void MacroActionMacroEdit::SetWidgetVisibility()
 	_entryLayout->removeWidget(_actions);
 	_entryLayout->removeWidget(_actionIndex);
 	_entryLayout->removeWidget(_macros);
-	_entryLayout->removeWidget(_actionSections);
-	_entryLayout->removeWidget(_label);
-	_entryLayout->removeWidget(_regex);
 	_entryLayout->removeWidget(_actionTypes);
-	_entryLayout->removeWidget(_actionSelectionType);
 	_conditionLayout->removeWidget(_conditionBehaviors);
 	_conditionLayout->removeWidget(_conditionMacros);
 
@@ -641,40 +494,19 @@ void MacroActionMacroEdit::SetWidgetVisibility()
 		{"{{actions}}", _actions},
 		{"{{actionIndex}}", _actionIndex},
 		{"{{macros}}", _macros},
-		{"{{actionSections}}", _actionSections},
+		{"{{actionTypes}}", _actionTypes},
 		{"{{conditionBehaviors}}", _conditionBehaviors},
 		{"{{conditionMacros}}", _conditionMacros},
-		{"{{actionSelectionType}}", _actionSelectionType},
-		{"{{label}}", _label},
-		{"{{regex}}", _regex},
-		{"{{actionTypes}}", _actionTypes},
 
 	};
 
-	const auto action = _entryData->_action;
-	const char *layoutText = "";
-	switch (action) {
-	case MacroActionMacro::Action::PAUSE:
-	case MacroActionMacro::Action::UNPAUSE:
-	case MacroActionMacro::Action::TOGGLE_PAUSE:
-	case MacroActionMacro::Action::RESET_COUNTER:
-	case MacroActionMacro::Action::STOP:
-	case MacroActionMacro::Action::NESTED_MACRO:
-		layoutText = "AdvSceneSwitcher.action.macro.layout.other";
-		break;
-	case MacroActionMacro::Action::RUN_ACTIONS:
-		layoutText = "AdvSceneSwitcher.action.macro.layout.run";
-		break;
-	case MacroActionMacro::Action::DISABLE_ACTION:
-	case MacroActionMacro::Action::ENABLE_ACTION:
-	case MacroActionMacro::Action::TOGGLE_ACTION:
-		layoutText = "AdvSceneSwitcher.action.macro.layout.actionState";
-		break;
-	default:
-		break;
-	}
-
-	PlaceWidgets(obs_module_text(layoutText), _entryLayout, placeholders);
+	PlaceWidgets(
+		obs_module_text(
+			_entryData->_action ==
+					MacroActionMacro::Action::RUN_ACTIONS
+				? "AdvSceneSwitcher.action.macro.entry.run"
+				: "AdvSceneSwitcher.action.macro.entry.other"),
+		_entryLayout, placeholders);
 
 	if (_entryData->_runOptions.logic ==
 	    MacroActionMacro::RunOptions::Logic::IGNORE_CONDITIONS) {
@@ -683,63 +515,56 @@ void MacroActionMacroEdit::SetWidgetVisibility()
 	} else {
 		PlaceWidgets(
 			obs_module_text(
-				"AdvSceneSwitcher.action.macro.layout.run.condition"),
+				"AdvSceneSwitcher.action.macro.entry.run.condition"),
 			_conditionLayout, placeholders);
 	}
 
-	if (action == MacroActionMacro::Action::RUN_ACTIONS ||
-	    action == MacroActionMacro::Action::STOP) {
+	if (_entryData->_action == MacroActionMacro::Action::RUN_ACTIONS ||
+	    _entryData->_action == MacroActionMacro::Action::STOP) {
 		_macros->HideSelectedMacro();
 	} else {
 		_macros->ShowAllMacros();
 	}
 
-	const auto actionSelectionType = _entryData->_actionSelectionType;
 	const bool isModifyingActionState =
-		action == MacroActionMacro::Action::DISABLE_ACTION ||
-		action == MacroActionMacro::Action::ENABLE_ACTION ||
-		action == MacroActionMacro::Action::TOGGLE_ACTION;
-	_actionSelectionType->setVisible(isModifyingActionState);
-	_actionIndex->setVisible(
-		isModifyingActionState &&
-		actionSelectionType == MacroActionMacro::SelectionType::INDEX);
-	_label->setVisible(isModifyingActionState &&
-			   actionSelectionType ==
-				   MacroActionMacro::SelectionType::LABEL);
-	_regex->setVisible(isModifyingActionState &&
-			   actionSelectionType ==
-				   MacroActionMacro::SelectionType::LABEL);
-	_actionTypes->setVisible(isModifyingActionState &&
-				 actionSelectionType ==
-					 MacroActionMacro::SelectionType::ID);
+		_entryData->_action ==
+			MacroActionMacro::Action::DISABLE_ACTION ||
+		_entryData->_action ==
+			MacroActionMacro::Action::ENABLE_ACTION ||
+		_entryData->_action == MacroActionMacro::Action::TOGGLE_ACTION;
+	_actionIndex->setVisible(isModifyingActionState);
 
 	SetLayoutVisible(_conditionLayout,
-			 action == MacroActionMacro::Action::RUN_ACTIONS);
+			 _entryData->_action ==
+				 MacroActionMacro::Action::RUN_ACTIONS);
 	const bool needsAdditionalConditionWidgets =
-		action == MacroActionMacro::Action::RUN_ACTIONS &&
+		_entryData->_action == MacroActionMacro::Action::RUN_ACTIONS &&
 		_entryData->_runOptions.logic !=
 			MacroActionMacro::RunOptions::Logic::IGNORE_CONDITIONS;
 	_conditionMacros->setVisible(needsAdditionalConditionWidgets);
 	SetLayoutVisible(_reevaluateConditionStateLayout,
 			 needsAdditionalConditionWidgets);
 	SetLayoutVisible(_setInputsLayout,
-			 action == MacroActionMacro::Action::RUN_ACTIONS);
-	_inputs->setVisible(action == MacroActionMacro::Action::RUN_ACTIONS &&
+			 _entryData->_action ==
+				 MacroActionMacro::Action::RUN_ACTIONS);
+	_inputs->setVisible(_entryData->_action ==
+				    MacroActionMacro::Action::RUN_ACTIONS &&
 			    _entryData->_runOptions.setInputs);
 	HighlightMacroSettingsButton(
-		action == MacroActionMacro::Action::RUN_ACTIONS &&
+		_entryData->_action == MacroActionMacro::Action::RUN_ACTIONS &&
 		_entryData->_runOptions.setInputs &&
 		!_inputs->HasInputsToSet());
-	_actionSections->setVisible(
-		action == MacroActionMacro::Action::RUN_ACTIONS ||
-		isModifyingActionState);
-	_skipWhenPaused->setVisible(action ==
+	_actionTypes->setVisible(_entryData->_action ==
+				 MacroActionMacro::Action::RUN_ACTIONS);
+	_skipWhenPaused->setVisible(_entryData->_action ==
 				    MacroActionMacro::Action::RUN_ACTIONS);
 
-	_nestedMacro->setVisible(action ==
+	_nestedMacro->setVisible(_entryData->_action ==
 				 MacroActionMacro::Action::NESTED_MACRO);
-	_macros->setVisible(action != MacroActionMacro::Action::NESTED_MACRO);
-	SetResizingEnabled(action == MacroActionMacro::Action::NESTED_MACRO);
+	_macros->setVisible(_entryData->_action !=
+			    MacroActionMacro::Action::NESTED_MACRO);
+	SetResizingEnabled(_entryData->_action ==
+			   MacroActionMacro::Action::NESTED_MACRO);
 
 	if (_nestedMacro->IsEmpty()) {
 		_nestedMacro->ShowAllMacroSections();

lib/macro/macro-action-macro.hpp

@@ -5,9 +5,7 @@
 #include "macro-input.hpp"
 #include "macro-selection.hpp"
 #include "macro-segment-selection.hpp"
-#include "regex-config.hpp"
 #include "resizable-widget.hpp"
-#include "variable-line-edit.hpp"
 
 #include <QCheckBox>
 #include <QHBoxLayout>
@@ -57,23 +55,14 @@ public:
 		TOGGLE_PAUSE,
 		NESTED_MACRO,
 	};
-
-	enum class SelectionType { INDEX, LABEL, ID };
-
 	Action _action = Action::NESTED_MACRO;
-	SelectionType _actionSelectionType = SelectionType::INDEX;
-	bool _useElseSection = false;
 	IntVariable _actionIndex = 1;
-	StringVariable _label = "Custom label";
-	std::string _actionId;
-	RegexConfig _regex;
 	RunOptions _runOptions = {};
 	std::shared_ptr<Macro> _nestedMacro = std::make_shared<Macro>();
 	int _customWidgetHeight = 0;
 
 private:
 	void RunActions(Macro *actionMacro) const;
-	void AdjustActionState(Macro *) const;
 
 	static bool _registered;
 	static const std::string id;
@@ -93,15 +82,11 @@ public:
 private slots:
 	void MacroChanged(const QString &text);
 	void ActionChanged(int value);
-	void ActionSelectionTypeChanged(int value);
 	void ActionIndexChanged(const IntVariable &value);
-	void LabelChanged();
-	void ActionTypeChanged(int value);
-	void RegexChanged(const RegexConfig &);
 	void ConditionMacroChanged(const QString &text);
 	void ConditionBehaviorChanged(int value);
 	void ReevaluateConditionStateChanged(int value);
-	void ActionSectionChanged(int value);
+	void ActionTypeChanged(int value);
 	void SkipWhenPausedChanged(int value);
 	void SetInputsChanged(int value);
 	void InputsChanged(const StringList &);
@@ -113,17 +98,13 @@ private:
 	void SetWidgetVisibility();
 	void SetupMacroInput(Macro *) const;
 
-	QComboBox *_actions;
 	MacroSelection *_macros;
-	QComboBox *_actionSelectionType;
 	MacroSegmentSelection *_actionIndex;
-	VariableLineEdit *_label;
-	FilterComboBox *_actionTypes;
-	RegexConfigWidget *_regex;
+	QComboBox *_actions;
 	MacroSelection *_conditionMacros;
 	QComboBox *_conditionBehaviors;
 	QCheckBox *_reevaluateConditionState;
-	QComboBox *_actionSections;
+	QComboBox *_actionTypes;
 	QCheckBox *_skipWhenPaused;
 	QCheckBox *_setInputs;
 	MacroInputEdit *_inputs;

lib/macro/macro-action-variable.cpp

@@ -286,14 +286,6 @@ bool MacroActionVariable::PerformAction()
 	case Action::APPEND:
 		apppend(*var, _strValue);
 		break;
-	case Action::COPY_VAR: {
-		auto var2 = _variable2.lock();
-		if (!var2) {
-			return true;
-		}
-		var->SetValue(var2->Value());
-		break;
-	}
 	case Action::APPEND_VAR: {
 		auto var2 = _variable2.lock();
 		if (!var2) {
@@ -678,8 +670,6 @@ static inline void populateActionSelection(QComboBox *list)
 		actions = {
 			{MacroActionVariable::Action::SET_VALUE,
 			 "AdvSceneSwitcher.action.variable.type.set"},
-			{MacroActionVariable::Action::COPY_VAR,
-			 "AdvSceneSwitcher.action.variable.type.copy"},
 			{MacroActionVariable::Action::APPEND,
 			 "AdvSceneSwitcher.action.variable.type.append"},
 			{MacroActionVariable::Action::PAD,
@@ -1531,7 +1521,6 @@ void MacroActionVariableEdit::SetWidgetVisibility()
 	}
 
 	_variables2->setVisible(
-		_entryData->_action == MacroActionVariable::Action::COPY_VAR ||
 		_entryData->_action ==
 			MacroActionVariable::Action::APPEND_VAR ||
 		_entryData->_action ==

lib/macro/macro-action-variable.hpp

@@ -55,7 +55,6 @@ public:
 		RANDOM_NUMBER,
 		QUERY_JSON,
 		ARRAY_JSON,
-		COPY_VAR,
 	};
 
 	Action _action = Action::SET_VALUE;

lib/macro/macro-condition-edit.cpp

@@ -239,7 +239,7 @@ void MacroConditionEdit::ConditionSelectionChanged(const QString &text)
 		(*_entryData)->SetIndex(idx);
 		(*_entryData)->SetLogicType(logic);
 		(*_entryData)->PostLoad();
-		RunAndClearPostLoadSteps();
+		RunPostLoadSteps();
 	}
 	auto widget =
 		MacroConditionFactory::CreateWidget(id, this, *_entryData);

lib/macro/macro-condition-macro.cpp

@@ -102,7 +102,7 @@ bool MacroConditionMacro::CheckActionStateCondition()
 	if (!macro) {
 		return false;
 	}
-	if (!IsValidActionIndex(macro.get(), _actionIndex - 1)) {
+	if (!IsValidMacroSegmentIndex(macro.get(), _actionIndex - 1, false)) {
 		return false;
 	}
 	if (_type == Type::ACTION_DISABLED) {

lib/macro/macro-dock.cpp

@@ -110,7 +110,7 @@ void MacroDock::RunClicked()
 		return;
 	}
 
-	auto ret = macro->PerformActions(true, true, true);
+	auto ret = macro->PerformActions(true);
 	if (!ret) {
 		QString err =
 			obs_module_text("AdvSceneSwitcher.macroTab.runFail");

lib/macro/macro-edit.cpp

@@ -1080,7 +1080,7 @@ void MacroEdit::AddMacroAction(Macro *macro, int idx, const std::string &id,
 			macro->Actions().at(idx)->Load(data);
 		}
 		macro->Actions().at(idx)->PostLoad();
-		RunAndClearPostLoadSteps();
+		RunPostLoadSteps();
 		macro->UpdateActionIndices();
 		ui->actionsList->Insert(
 			idx,
@@ -1383,7 +1383,7 @@ void MacroEdit::AddMacroElseAction(Macro *macro, int idx, const std::string &id,
 			macro->ElseActions().at(idx)->Load(data);
 		}
 		macro->ElseActions().at(idx)->PostLoad();
-		RunAndClearPostLoadSteps();
+		RunPostLoadSteps();
 		macro->UpdateElseActionIndices();
 		ui->elseActionsList->Insert(
 			idx, new MacroActionEdit(
@@ -1583,7 +1583,7 @@ void MacroEdit::AddMacroCondition(Macro *macro, int idx, const std::string &id,
 			macro->Conditions().at(idx)->Load(data);
 		}
 		macro->Conditions().at(idx)->PostLoad();
-		RunAndClearPostLoadSteps();
+		RunPostLoadSteps();
 		(*cond)->SetLogicType(logic);
 		macro->UpdateConditionIndices();
 		ui->conditionsList->Insert(

lib/macro/macro-helpers.cpp

@@ -1,6 +1,5 @@
 #include "macro-helpers.hpp"
 #include "macro.hpp"
-#include "macro-action-macro.hpp"
 #include "plugin-state-helpers.hpp"
 
 namespace advss {
@@ -9,60 +8,6 @@ static std::atomic_bool abortMacroWait = {false};
 static std::atomic_bool macroSceneSwitched = {false};
 static std::atomic_int shutdownConditionCount = {0};
 
-static void appendNestedMacros(std::deque<std::shared_ptr<Macro>> &macros,
-			       Macro *macro)
-{
-	if (!macro) {
-		return;
-	}
-
-	const auto iterate = [&macros](const std::deque<
-				       std::shared_ptr<MacroAction>> &actions) {
-		for (const auto &action : actions) {
-			const auto nestedMacroAction =
-				dynamic_cast<MacroActionMacro *>(action.get());
-			if (!nestedMacroAction) {
-				continue;
-			}
-
-			macros.push_back(nestedMacroAction->_nestedMacro);
-			appendNestedMacros(
-				macros, nestedMacroAction->_nestedMacro.get());
-		}
-	};
-
-	iterate(macro->Actions());
-	iterate(macro->ElseActions());
-}
-
-std::deque<std::shared_ptr<Macro>> &GetTopLevelMacros()
-{
-	static std::deque<std::shared_ptr<Macro>> macros;
-	return macros;
-}
-
-std::deque<std::shared_ptr<Macro>> &GetTemporaryMacros()
-{
-	static std::deque<std::shared_ptr<Macro>> tempMacros;
-	return tempMacros;
-}
-
-std::deque<std::shared_ptr<Macro>> GetAllMacros()
-{
-	auto macros = GetTopLevelMacros();
-	for (const auto &topLevelMacro : macros) {
-		appendNestedMacros(macros, topLevelMacro.get());
-	}
-
-	const auto &tempMacros = GetTemporaryMacros();
-	macros.insert(macros.end(), tempMacros.begin(), tempMacros.end());
-	for (const auto &tempMacro : tempMacros) {
-		appendNestedMacros(macros, tempMacro.get());
-	}
-
-	return macros;
-}
-
 std::optional<std::deque<std::shared_ptr<MacroAction>>>
 GetMacroActions(Macro *macro)
 {
@@ -72,15 +17,6 @@ GetMacroActions(Macro *macro)
 	return macro->Actions();
 }
 
-std::optional<std::deque<std::shared_ptr<MacroAction>>>
-GetMacroElseActions(Macro *macro)
-{
-	if (!macro) {
-		return {};
-	}
-	return macro->ElseActions();
-}
-
 std::optional<std::deque<std::shared_ptr<MacroCondition>>>
 GetMacroConditions(Macro *macro)
 {
@@ -208,42 +144,20 @@ void ResetMacroRunCount(Macro *macro)
 	macro->ResetRunCount();
 }
 
-bool IsValidActionIndex(const Macro *m, const int idx)
+bool IsValidMacroSegmentIndex(const Macro *m, const int idx, bool isCondition)
 {
 	if (!m || idx < 0) {
 		return false;
 	}
-
-	if (idx >= (int)m->Actions().size()) {
-		return false;
+	if (isCondition) {
+		if (idx >= (int)m->Conditions().size()) {
+			return false;
+		}
+	} else {
+		if (idx >= (int)m->Actions().size()) {
+			return false;
+		}
 	}
-
-	return true;
-}
-
-bool IsValidElseActionIndex(const Macro *m, const int idx)
-{
-	if (!m || idx < 0) {
-		return false;
-	}
-
-	if (idx >= (int)m->ElseActions().size()) {
-		return false;
-	}
-
-	return true;
-}
-
-bool IsValidConditionIndex(const Macro *m, const int idx)
-{
-	if (!m || idx < 0) {
-		return false;
-	}
-
-	if (idx >= (int)m->Conditions().size()) {
-		return false;
-	}
-
 	return true;
 }
 

lib/macro/macro-helpers.hpp

@@ -18,14 +18,10 @@ class Macro;
 class MacroAction;
 class MacroCondition;
 
-EXPORT std::deque<std::shared_ptr<Macro>> &GetTopLevelMacros();
-std::deque<std::shared_ptr<Macro>> &GetTemporaryMacros();
-EXPORT std::deque<std::shared_ptr<Macro>> GetAllMacros();
+EXPORT std::deque<std::shared_ptr<Macro>> &GetMacros();
 
 EXPORT std::optional<std::deque<std::shared_ptr<MacroAction>>>
 GetMacroActions(Macro *);
-EXPORT std::optional<std::deque<std::shared_ptr<MacroAction>>>
-GetMacroElseActions(Macro *);
 EXPORT std::optional<std::deque<std::shared_ptr<MacroCondition>>>
 GetMacroConditions(Macro *);
 
@@ -72,8 +68,6 @@ EXPORT void InvalidateMacroTempVarValues();
 EXPORT void ResetMacroConditionTimers(Macro *);
 EXPORT void ResetMacroRunCount(Macro *);
 
-bool IsValidActionIndex(const Macro *m, const int idx);
-bool IsValidElseActionIndex(const Macro *m, const int idx);
-bool IsValidConditionIndex(const Macro *m, const int idx);
+bool IsValidMacroSegmentIndex(const Macro *m, const int idx, bool isCondition);
 
 } // namespace advss

lib/macro/macro-segment-selection.cpp

@@ -73,46 +73,35 @@ void MacroSegmentSelection::MacroSegmentOrderChanged()
 }
 
 static QString GetMacroSegmentDescription(Macro *macro, int idx,
-					  MacroSegmentSelection::Type type)
+					  bool isCondition)
 {
 	if (!macro) {
 		return "";
 	}
-
-	MacroSegment *segment;
-
-	switch (type) {
-	case MacroSegmentSelection::Type::CONDITION:
-		if (!IsValidConditionIndex(macro, idx)) {
-			return "";
-		}
-		segment = GetMacroConditions(macro)->at(idx).get();
-		break;
-	case MacroSegmentSelection::Type::ACTION:
-		if (!IsValidActionIndex(macro, idx)) {
-			return "";
-		}
-		segment = GetMacroActions(macro)->at(idx).get();
-		break;
-	case MacroSegmentSelection::Type::ELSE_ACTION:
-		if (!IsValidElseActionIndex(macro, idx)) {
-			return "";
-		}
-		segment = GetMacroElseActions(macro)->at(idx).get();
-		break;
-	default:
+	if (!IsValidMacroSegmentIndex(macro, idx, isCondition)) {
 		return "";
 	}
 
-	const auto idToName = type == MacroSegmentSelection::Type::CONDITION
-				      ? MacroConditionFactory::GetConditionName
-				      : MacroActionFactory::GetActionName;
-	const QString typeStr =
-		obs_module_text(idToName(segment->GetId()).c_str());
-	const QString description =
-		QString::fromStdString(segment->GetShortDesc());
+	MacroSegment *segment;
+	if (isCondition) {
+		segment = GetMacroConditions(macro)->at(idx).get();
+	} else {
+		segment = GetMacroActions(macro)->at(idx).get();
+	}
 
-	QString result = typeStr;
+	QString description = QString::fromStdString(segment->GetShortDesc());
+	QString type;
+	if (isCondition) {
+		type = obs_module_text(MacroConditionFactory::GetConditionName(
+					       segment->GetId())
+					       .c_str());
+	} else {
+		type = obs_module_text(
+			MacroActionFactory::GetActionName(segment->GetId())
+				.c_str());
+	}
+
+	QString result = type;
 	if (!description.isEmpty()) {
 		result += ": " + description;
 	}
@@ -134,25 +123,11 @@ void MacroSegmentSelection::SetupDescription() const
 		return;
 	}
 
-	bool validIndex = false;
-	switch (_type) {
-	case Type::CONDITION:
-		validIndex = IsValidConditionIndex(_macro, index - 1);
-		break;
-	case Type::ACTION:
-		validIndex = IsValidActionIndex(_macro, index - 1);
-		break;
-	case Type::ELSE_ACTION:
-		validIndex = IsValidElseActionIndex(_macro, index - 1);
-		break;
-	default:
-		break;
-	}
-
 	QString description;
-	if (validIndex) {
-		description =
-			GetMacroSegmentDescription(_macro, index - 1, _type);
+	if (IsValidMacroSegmentIndex(_macro, index - 1,
+				     _type == Type::CONDITION)) {
+		description = GetMacroSegmentDescription(
+			_macro, index - 1, _type == Type::CONDITION);
 	} else {
 		description = obs_module_text(
 			"AdvSceneSwitcher.macroSegmentSelection.invalid");
@@ -190,23 +165,8 @@ void MacroSegmentSelection::MarkSelectedSegment()
 	if (index.GetType() == IntVariable::Type::VARIABLE) {
 		return;
 	}
-
-	bool validIndex = false;
-	switch (_type) {
-	case Type::CONDITION:
-		validIndex = IsValidConditionIndex(_macro, index - 1);
-		break;
-	case Type::ACTION:
-		validIndex = IsValidActionIndex(_macro, index - 1);
-		break;
-	case Type::ELSE_ACTION:
-		validIndex = IsValidElseActionIndex(_macro, index - 1);
-		break;
-	default:
-		break;
-	}
-
-	if (!validIndex) {
+	if (!IsValidMacroSegmentIndex(_macro, index - 1,
+				      _type == Type::CONDITION)) {
 		return;
 	}
 

lib/macro/macro-segment-selection.hpp

@@ -8,7 +8,7 @@ class Macro;
 class MacroSegmentSelection : public QWidget {
 	Q_OBJECT
 public:
-	enum class Type { CONDITION, ACTION, ELSE_ACTION };
+	enum class Type { CONDITION, ACTION };
 
 	MacroSegmentSelection(QWidget *parent, Type type,
 			      bool allowVariables = true);

lib/macro/macro-selection.cpp

@@ -14,7 +14,7 @@ MacroSelection::MacroSelection(QWidget *parent)
 	: FilterComboBox(parent,
 			 obs_module_text("AdvSceneSwitcher.selectMacro"))
 {
-	for (const auto &m : GetTopLevelMacros()) {
+	for (const auto &m : GetMacros()) {
 		if (m->IsGroup()) {
 			continue;
 		}

lib/macro/macro-tab.cpp

@@ -150,7 +150,7 @@ static void addGroupSubitems(std::vector<std::shared_ptr<Macro>> &macros,
 	subitems.reserve(group->GroupSize());
 
 	// Find all subitems
-	auto allMacros = GetTopLevelMacros();
+	auto allMacros = GetMacros();
 	for (auto it = allMacros.begin(); it < allMacros.end(); it++) {
 		if ((*it)->Name() != group->Name()) {
 			continue;
@@ -410,17 +410,13 @@ void AdvSceneSwitcher::ImportMacros()
 	int groupSize = 0;
 	std::shared_ptr<Macro> group;
 	std::vector<std::shared_ptr<Macro>> importedMacros;
-	auto &tempMacros = GetTemporaryMacros();
 
 	auto lock = LockContext();
 	for (size_t i = 0; i < count; i++) {
-		tempMacros.clear();
-
 		OBSDataAutoRelease array_obj = obs_data_array_item(array, i);
 		auto macro = std::make_shared<Macro>();
-		tempMacros.emplace_back(macro);
 		macro->Load(array_obj);
-		RunAndClearPostLoadSteps();
+		RunPostLoadSteps();
 
 		if (macroNameExists(macro->Name()) &&
 		    !ResolveMacroImportNameConflict(macro)) {
@@ -429,7 +425,7 @@ void AdvSceneSwitcher::ImportMacros()
 		}
 
 		importedMacros.emplace_back(macro);
-		GetTopLevelMacros().emplace_back(macro);
+		GetMacros().emplace_back(macro);
 		if (groupSize > 0 && !macro->IsGroup()) {
 			Macro::PrepareMoveToGroup(group, macro);
 			groupSize--;
@@ -448,10 +444,9 @@ void AdvSceneSwitcher::ImportMacros()
 	for (const auto &macro : importedMacros) {
 		macro->PostLoad();
 	}
-	RunAndClearPostLoadSteps();
-	tempMacros.clear();
+	RunPostLoadSteps();
 
-	ui->macros->Reset(GetTopLevelMacros(),
+	ui->macros->Reset(GetMacros(),
 			  GetGlobalMacroSettings()._highlightExecuted);
 	disableAddButtonHighlight();
 }
@@ -638,7 +633,7 @@ void AdvSceneSwitcher::SetupMacroTab()
 {
 	ui->macros->installEventFilter(this);
 
-	if (GetTopLevelMacros().size() == 0 && !switcher->disableHints) {
+	if (GetMacros().size() == 0 && !switcher->disableHints) {
 		addPulse = HighlightWidget(ui->macroAdd, QColor(Qt::green));
 	}
 
@@ -646,7 +641,7 @@ void AdvSceneSwitcher::SetupMacroTab()
 					   {ui->macroUp, ui->macroDown}});
 	ui->macroControlLayout->addWidget(macroControls);
 
-	ui->macros->Reset(GetTopLevelMacros(),
+	ui->macros->Reset(GetMacros(),
 			  GetGlobalMacroSettings()._highlightExecuted);
 	connect(ui->macros, SIGNAL(MacroSelectionChanged()), this,
 		SLOT(MacroSelectionChanged()));
@@ -757,7 +752,7 @@ void AdvSceneSwitcher::CopyMacro()
 	newMacro->Load(data);
 	newMacro->PostLoad();
 	newMacro->SetName(name);
-	RunAndClearPostLoadSteps();
+	RunPostLoadSteps();
 	Macro::PrepareMoveToGroup(macro->Parent(), newMacro);
 
 	ui->macros->Add(newMacro, macro);

lib/macro/macro-tree.cpp

@@ -1184,7 +1184,7 @@ bool MacroTree::SelectionEmpty() const
 
 bool MacroTree::GroupsExist() const
 {
-	for (const auto &macro : GetTopLevelMacros()) {
+	for (const auto &macro : GetMacros()) {
 		if (macro->IsGroup()) {
 			return true;
 		}
@@ -1306,7 +1306,7 @@ void MacroTree::UngroupSelectedGroups()
 
 void MacroTree::ExpandAll()
 {
-	for (const auto &macro : GetTopLevelMacros()) {
+	for (const auto &macro : GetMacros()) {
 		if (!macro->IsGroup()) {
 			continue;
 		}
@@ -1316,7 +1316,7 @@ void MacroTree::ExpandAll()
 
 void MacroTree::CollapseAll()
 {
-	for (const auto &macro : GetTopLevelMacros()) {
+	for (const auto &macro : GetMacros()) {
 		if (!macro->IsGroup()) {
 			continue;
 		}

lib/macro/macro.cpp

@@ -17,6 +17,8 @@
 
 namespace advss {
 
+static std::deque<std::shared_ptr<Macro>> macros;
+
 Macro::Macro(const std::string &name) : _dockSettings(this)
 {
 	SetName(name);
@@ -57,7 +59,6 @@ Macro::CreateGroup(const std::string &name,
 
 void Macro::RemoveGroup(std::shared_ptr<Macro> group)
 {
-	auto &macros = GetTopLevelMacros();
 	auto it = std::find(macros.begin(), macros.end(), group);
 	if (it == macros.end()) {
 		return;
@@ -74,7 +75,6 @@ void Macro::RemoveGroup(std::shared_ptr<Macro> group)
 
 void Macro::PrepareMoveToGroup(Macro *group, std::shared_ptr<Macro> item)
 {
-	auto &macros = GetTopLevelMacros();
 	for (const auto &m : macros) {
 		if (m.get() == group) {
 			PrepareMoveToGroup(m, item);
@@ -1114,7 +1114,7 @@ void Macro::SetHotkeysDesc() const
 void SaveMacros(obs_data_t *obj)
 {
 	obs_data_array_t *macroArray = obs_data_array_create();
-	for (const auto &m : GetTopLevelMacros()) {
+	for (const auto &m : macros) {
 		obs_data_t *array_obj = obs_data_create();
 
 		m->Save(array_obj);
@@ -1128,9 +1128,7 @@ void SaveMacros(obs_data_t *obj)
 
 void LoadMacros(obs_data_t *obj)
 {
-	auto &macros = GetTopLevelMacros();
 	macros.clear();
-
 	obs_data_array_t *macroArray = obs_data_get_array(obj, "macros");
 	size_t count = obs_data_array_count(macroArray);
 
@@ -1180,10 +1178,15 @@ void LoadMacros(obs_data_t *obj)
 	}
 }
 
+std::deque<std::shared_ptr<Macro>> &GetMacros()
+{
+	return macros;
+}
+
 bool CheckMacros()
 {
 	bool matchFound = false;
-	for (const auto &m : GetTopLevelMacros()) {
+	for (const auto &m : macros) {
 		if (!m->ConditionsShouldBeChecked()) {
 			vblog(LOG_INFO,
 			      "skipping condition check for macro \"%s\" "
@@ -1210,7 +1213,7 @@ bool RunMacros()
 	// reordered while macros are currently being executed.
 	// For example, this can happen if a macro is performing a wait action,
 	// as the main lock will be unlocked during this time.
-	auto runPhaseMacros = GetTopLevelMacros();
+	auto runPhaseMacros = macros;
 
 	// Avoid deadlocks when opening settings window and calling frontend
 	// API functions at the same time.
@@ -1250,14 +1253,14 @@ bool RunMacros()
 
 void StopAllMacros()
 {
-	for (const auto &m : GetAllMacros()) {
+	for (const auto &m : macros) {
 		m->Stop();
 	}
 }
 
 Macro *GetMacroByName(const char *name)
 {
-	for (const auto &m : GetTopLevelMacros()) {
+	for (const auto &m : macros) {
 		if (m->Name() == name) {
 			return m.get();
 		}
@@ -1273,7 +1276,7 @@ Macro *GetMacroByQString(const QString &name)
 
 std::weak_ptr<Macro> GetWeakMacroByName(const char *name)
 {
-	for (const auto &m : GetTopLevelMacros()) {
+	for (const auto &m : macros) {
 		if (m->Name() == name) {
 			return m;
 		}
@@ -1284,7 +1287,7 @@ std::weak_ptr<Macro> GetWeakMacroByName(const char *name)
 
 void InvalidateMacroTempVarValues()
 {
-	for (const auto &m : GetTopLevelMacros()) {
+	for (const auto &m : macros) {
 		// Do not invalidate the temp vars set during condition checks
 		// or action executions running in parallel to the "main" macro
 		// loop, as otherwise access to the information stored in those
@@ -1299,8 +1302,6 @@ void InvalidateMacroTempVarValues()
 
 std::shared_ptr<Macro> GetMacroWithInvalidConditionInterval()
 {
-	auto &macros = GetTopLevelMacros();
-
 	if (macros.empty()) {
 		return {};
 	}

lib/macro/macro.hpp

@@ -217,6 +217,7 @@ private:
 
 void LoadMacros(obs_data_t *obj);
 void SaveMacros(obs_data_t *obj);
+std::deque<std::shared_ptr<Macro>> &GetMacros();
 bool CheckMacros();
 bool RunMacros();
 void StopAllMacros();

lib/queue/action-queue.cpp

@@ -113,7 +113,7 @@ void ActionQueue::Add(const std::shared_ptr<MacroAction> &action)
 		action->Save(data);
 		copy->Load(data);
 		copy->PostLoad();
-		RunAndClearPostLoadSteps();
+		RunPostLoadSteps();
 		copy->ResolveVariablesToFixedValues();
 		_actions.emplace_back(copy);
 	} else {
@@ -423,7 +423,7 @@ void ImportQueues(obs_data_t *data)
 		importedQueues->emplace_back(queue);
 	}
 
-	QueueUITask(signalImportedQueues, importedQueues);
+	QeueUITask(signalImportedQueues, importedQueues);
 }
 
 std::weak_ptr<ActionQueue> GetWeakActionQueueByName(const std::string &name)

lib/utils/plugin-state-helpers.cpp

@@ -113,13 +113,12 @@ void RunLoadSteps(obs_data_t *obj)
 	}
 }
 
-void RunAndClearPostLoadSteps()
+void RunPostLoadSteps()
 {
 	std::lock_guard<std::mutex> lock(postLoadMutex);
 	for (const auto &func : getPostLoadSteps()) {
 		func();
 	}
-	getPostLoadSteps().clear();
 }
 
 void ClearPostLoadSteps()

lib/utils/plugin-state-helpers.hpp

@@ -14,7 +14,7 @@ EXPORT void AddPostLoadStep(std::function<void()>);
 EXPORT void AddIntervalResetStep(std::function<void()>);
 void RunSaveSteps(obs_data_t *);
 void RunLoadSteps(obs_data_t *);
-EXPORT void RunAndClearPostLoadSteps();
+EXPORT void RunPostLoadSteps();
 void ClearPostLoadSteps();
 
 EXPORT void AddPluginInitStep(std::function<void()>);

lib/utils/resource-table.cpp

@@ -8,7 +8,7 @@
 
 namespace advss {
 
-ResourceTable::ResourceTable(QWidget *parent, const QString &help,
+ResourceTable::ResourceTable(QTabWidget *parent, const QString &help,
 			     const QString &addToolTip,
 			     const QString &removeToolTip,
 			     const QStringList &headers,

lib/utils/resource-table.hpp

@@ -14,7 +14,7 @@ class ADVSS_EXPORT ResourceTable : public QWidget {
 	Q_OBJECT
 
 public:
-	ResourceTable(QWidget *parent, const QString &help,
+	ResourceTable(QTabWidget *parent, const QString &help,
 		      const QString &addToolTip, const QString &removeToolTip,
 		      const QStringList &headers,
 		      const std::function<void()> &openSettings);

lib/utils/scene-selection.cpp

@@ -239,26 +239,22 @@ void SceneSelection::ResolveVariables()
 	_type = Type::SCENE;
 }
 
-static obs_weak_canvas_t *getWeakRefToMainCanvas()
-{
-	static auto canvas = obs_get_main_canvas();
-	static auto weakCanvas = obs_canvas_get_weak_canvas(canvas);
-	[[maybe_unused]] static const bool _ = []() {
-		// Let's just hope we don't have to deal with selecting scenes
-		// when the OBS main canvas gets deleted and release the
-		// references here already to avoid reporting leaks on shutdown
-		obs_canvas_release(canvas);
-		obs_weak_canvas_release(weakCanvas);
-		return true;
-	}();
-	return weakCanvas;
-}
-
 SceneSelection SceneSelectionWidget::CurrentSelection()
 {
 	SceneSelection s;
 
-	s._canvas = _forceMainCanvas ? OBSWeakCanvas(getWeakRefToMainCanvas())
+	static auto mainCanvas = obs_get_main_canvas();
+	static auto mainCanvasWeak = obs_canvas_get_weak_canvas(mainCanvas);
+	[[maybe_unused]] static const bool _ = []() {
+		// Let's just hope we don't have to deal with selecting scenes
+		// when the OBS main canvas gets deleted and release the
+		// references here already to avoid reporting leaks on shutdown
+		obs_canvas_release(mainCanvas);
+		obs_weak_canvas_release(mainCanvasWeak);
+		return true;
+	}();
+
+	s._canvas = _forceMainCanvas ? OBSWeakCanvas(mainCanvasWeak)
 				     : _canvas->GetCanvas();
 
 	const int idx = _scenes->currentIndex();
@@ -334,7 +330,6 @@ static QStringList getCanvasScenesList(obs_weak_canvas_t *weakCanvas)
 
 	QStringList list;
 	obs_canvas_enum_scenes(canvas, enumCanvasScenes, &list);
-	list.sort();
 	return list;
 }
 
@@ -347,10 +342,6 @@ void SceneSelectionWidget::Reset()
 
 void SceneSelectionWidget::PopulateSceneSelection(obs_weak_canvas_t *canvas)
 {
-	if (_forceMainCanvas) {
-		canvas = getWeakRefToMainCanvas();
-	}
-
 	_scenes->clear();
 	if ((_current || _previous)) {
 		const bool isMain = IsMainCanvas(canvas);
@@ -427,7 +418,7 @@ SceneSelectionWidget::SceneSelectionWidget(QWidget *parent, bool variables,
 	layout->setContentsMargins(0, 0, 0, 0);
 
 	if (GetCanvasCount() <= 1) {
-		LockToMainCanvas();
+		_canvas->hide();
 	}
 
 	Resize();

lib/utils/scene-switch-helpers.cpp

@@ -199,17 +199,7 @@ std::chrono::high_resolution_clock::time_point GetLastSceneChangeTime()
 
 OBSWeakSource GetCurrentScene()
 {
-	if (switcher->currentScene) {
-		return switcher->currentScene;
-	}
-
-	// If there wasn't any scene switch yet switcher->currentScene will be
-	// null and we must use obs_frontend_get_current_scene() instead
-	OBSSourceAutoRelease currentSceneSource =
-		obs_frontend_get_current_scene();
-	OBSWeakSourceAutoRelease currentSceneWeakSource =
-		obs_source_get_weak_source(currentSceneSource);
-	return currentSceneWeakSource.Get();
+	return switcher->currentScene;
 }
 
 OBSWeakSource GetPreviousScene()

lib/utils/temp-variable.cpp

@@ -190,6 +190,29 @@ static bool isMatchingNestedMacroAction(MacroAction *action, const Macro *macro)
 	return nestedMacroAction->_nestedMacro.get() == macro;
 }
 
+static void appendNestedMacros(std::deque<std::shared_ptr<Macro>> &macros,
+			       Macro *macro)
+{
+	if (!macro) {
+		return;
+	}
+
+	for (const auto &action : macro->Actions()) {
+		const auto nestedMacroAction =
+			dynamic_cast<MacroActionMacro *>(action.get());
+		if (nestedMacroAction) {
+			macros.push_back(nestedMacroAction->_nestedMacro);
+		}
+	}
+	for (const auto &action : macro->ElseActions()) {
+		const auto nestedMacroAction =
+			dynamic_cast<MacroActionMacro *>(action.get());
+		if (nestedMacroAction) {
+			macros.push_back(nestedMacroAction->_nestedMacro);
+		}
+	}
+}
+
 static Macro *getParentMacro(const Macro *targetMacro,
 			     const std::vector<Macro *> &macros)
 {
@@ -240,10 +263,8 @@ static Macro *getParentMacro(const Macro *targetMacro,
 
 static Macro *getParentMacro(const Macro *macro)
 {
-	const auto &topLevelMacros = GetTopLevelMacros();
 	std::vector<Macro *> macros;
-	macros.reserve(topLevelMacros.size());
-	for (const auto &macro : topLevelMacros) {
+	for (const auto &macro : GetMacros()) {
 		macros.emplace_back(macro.get());
 	}
 	return getParentMacro(macro, macros);
@@ -280,9 +301,8 @@ void TempVariableRef::Save(obs_data_t *obj, Macro *macro,
 
 void TempVariableRef::Load(obs_data_t *obj, Macro *macroPtr, const char *name)
 {
-	const auto macros = GetAllMacros();
 	std::weak_ptr<Macro> macro;
-	for (const auto &macroShared : macros) {
+	for (const auto &macroShared : GetMacros()) {
 		if (macroShared.get() == macroPtr) {
 			macro = macroShared;
 			break;
@@ -320,9 +340,9 @@ void TempVariableRef::PostLoad(int idx, SegmentType type,
 		return;
 	}
 
-	auto macro = childMacro.get();
+	Macro *macro = nullptr;
 	for (int i = 0; i < _depth; i++) {
-		macro = getParentMacro(macro);
+		macro = getParentMacro(childMacro.get());
 	}
 
 	if (!macro) {
@@ -466,9 +486,15 @@ void TempVariableSelection::MacroSegmentsChanged()
 	SetVariable(currentSelection);
 }
 
-void TempVariableSelection::SegmentTempVarsChanged(MacroSegment *)
+void TempVariableSelection::SegmentTempVarsChanged(MacroSegment *segment)
 {
-	MacroSegmentsChanged();
+	const auto currentSegment = GetSegment();
+	const auto currentMacro = currentSegment ? currentSegment->GetMacro()
+						 : nullptr;
+	const auto changeMacro = segment ? segment->GetMacro() : nullptr;
+	if (currentMacro == changeMacro) {
+		MacroSegmentsChanged();
+	}
 }
 
 void TempVariableSelection::HighlightChanged(int idx)

lib/utils/temp-variable.hpp

@@ -75,7 +75,7 @@ private:
 	void PostLoad(int idx, SegmentType, const std::weak_ptr<Macro> &);
 
 	std::string _id = "";
-	std::weak_ptr<MacroSegment> _segment = {};
+	std::weak_ptr<MacroSegment> _segment;
 	int _depth = 0;
 
 	friend TempVariable;

lib/utils/ui-helpers.cpp

@@ -178,7 +178,7 @@ std::string GetThemeTypeName()
 #endif
 }
 
-void QueueUITask(void (*task)(void *param), void *param)
+void QeueUITask(void (*task)(void *param), void *param)
 {
 	obs_queue_task(OBS_TASK_UI, task, param, false);
 }

lib/utils/ui-helpers.hpp

@@ -35,7 +35,7 @@ EXPORT void DisplayTrayMessage(const QString &title, const QString &msg,
 EXPORT std::string GetThemeTypeName();
 EXPORT QWidget *GetSettingsWindow();
 
-EXPORT void QueueUITask(void (*task)(void *param), void *param);
+void QeueUITask(void (*task)(void *param), void *param);
 
 bool IsCursorInWidgetArea(QWidget *widget);
 

lib/variables/variable-tab.cpp

@@ -8,9 +8,6 @@
 #include "ui-helpers.hpp"
 #include "variable.hpp"
 
-#include <obs-frontend-api.h>
-
-#include <QLayout>
 #include <QTimer>
 
 namespace advss {
@@ -19,62 +16,14 @@ static bool registerTab();
 static void setupTab(QTabWidget *);
 static bool registerTabDone = registerTab();
 
-static VariableTable *dockWidget = nullptr;
-static bool addDock = false;
-
-static VariableTable::Settings tabSettings;
-static VariableTable::Settings dockSettings;
-
-static void save(obs_data_t *data)
-{
-	tabSettings.Save(data, "tabSettings");
-	dockSettings.Save(data, "dockSettings");
-	obs_data_set_bool(data, "addVariablesDock", addDock);
-}
-
-static void enableDock(bool enable)
-{
-	if (OBSIsShuttingDown()) {
-		return;
-	}
-
-	obs_frontend_remove_dock("advss-variable-dock");
-
-	addDock = enable;
-	if (!addDock) {
-		return;
-	}
-
-	dockWidget = new VariableTable(dockSettings);
-	dockWidget->HideDockOptions();
-	if (obs_frontend_add_dock_by_id(
-		    "advss-variable-dock",
-		    obs_module_text("AdvSceneSwitcher.variableTab.title"),
-		    dockWidget)) {
-		return;
-	}
-
-	blog(LOG_INFO, "failed to register variable dock!");
-	dockWidget->deleteLater();
-	dockWidget = nullptr;
-}
-
-static void load(obs_data_t *data)
-{
-	tabSettings.Load(data, "tabSettings");
-	dockSettings.Load(data, "dockSettings");
-
-	enableDock(obs_data_get_bool(data, "addVariablesDock"));
-}
+static VariableTable *tabWidget = nullptr;
 
 static bool registerTab()
 {
 	AddPluginInitStep([]() {
-		AddSetupTabCallback("variableTab",
-				    VariableTable::CreateTabTable, setupTab);
+		AddSetupTabCallback("variableTab", VariableTable::Create,
+				    setupTab);
 	});
-	AddSaveStep(save);
-	AddLoadStep(load);
 	return true;
 }
 
@@ -85,14 +34,10 @@ static void setTabVisible(QTabWidget *tabWidget, bool visible)
 		obs_module_text("AdvSceneSwitcher.variableTab.title"));
 }
 
-VariableTable *VariableTable::CreateTabTable()
+VariableTable *VariableTable::Create()
 {
-	return new VariableTable(tabSettings);
-}
-
-void VariableTable::HideDockOptions() const
-{
-	_addDock->hide();
+	tabWidget = new VariableTable();
+	return tabWidget;
 }
 
 void VariableTable::Add()
@@ -218,14 +163,15 @@ static void updateVariableStatus(QTableWidget *table)
 	}
 }
 
-static void openSettingsDialog(VariableTable *table)
+static void openSettingsDialog()
 {
-	auto selectedRows = table->Table()->selectionModel()->selectedRows();
+	auto selectedRows =
+		tabWidget->Table()->selectionModel()->selectedRows();
 	if (selectedRows.empty()) {
 		return;
 	}
 
-	auto cell = table->Table()->item(selectedRows.last().row(), 0);
+	auto cell = tabWidget->Table()->item(selectedRows.last().row(), 0);
 	if (!cell) {
 		return;
 	}
@@ -248,14 +194,15 @@ static void openSettingsDialog(VariableTable *table)
 
 void VariableTable::Remove()
 {
-	auto selectedRows = Table()->selectionModel()->selectedRows();
+	auto selectedRows =
+		tabWidget->Table()->selectionModel()->selectedRows();
 	if (selectedRows.empty()) {
 		return;
 	}
 
 	QStringList varNames;
 	for (const auto &row : selectedRows) {
-		auto cell = Table()->item(row.row(), 0);
+		auto cell = tabWidget->Table()->item(row.row(), 0);
 		if (!cell) {
 			continue;
 		}
@@ -288,52 +235,7 @@ void VariableTable::Remove()
 	}
 }
 
-void VariableTable::Filter()
-{
-	const auto itemMatches = [&](const QTableWidgetItem *item) {
-		if (!item) {
-			return false;
-		}
-
-		if (_settings.searchString.empty()) {
-			return true;
-		}
-
-		const auto text = item->text();
-
-		if (_settings.regex.Enabled()) {
-			return _settings.regex.Matches(text.toStdString(),
-						       _settings.searchString);
-		}
-
-		return text.contains(
-			QString::fromStdString(_settings.searchString),
-			Qt::CaseInsensitive);
-	};
-
-	for (int row = 0; row < Table()->rowCount(); ++row) {
-		bool match = false;
-
-		if (_settings.searchType == Settings::SearchType::ALL) {
-			for (int col = 0; col < Table()->columnCount(); ++col) {
-				if (itemMatches(Table()->item(row, col))) {
-					match = true;
-					break;
-				}
-			}
-		} else {
-			if (itemMatches(Table()->item(
-				    row,
-				    static_cast<int>(_settings.searchType)))) {
-				match = true;
-			}
-		}
-
-		Table()->setRowHidden(row, !match);
-	}
-}
-
-VariableTable::VariableTable(Settings &settings, QWidget *parent)
+VariableTable::VariableTable(QTabWidget *parent)
 	: ResourceTable(
 		  parent, obs_module_text("AdvSceneSwitcher.variableTab.help"),
 		  obs_module_text(
@@ -351,113 +253,13 @@ VariableTable::VariableTable(Settings &settings, QWidget *parent)
 				     "AdvSceneSwitcher.variableTab.lastUsed.header")
 			  << obs_module_text(
 				     "AdvSceneSwitcher.variableTab.lastChanged.header"),
-		  [this]() { openSettingsDialog(this); }),
-	  _searchField(new QLineEdit(this)),
-	  _clear(new QPushButton(this)),
-	  _searchType(new QComboBox(this)),
-	  _regexWidget(new RegexConfigWidget(this)),
-	  _addDock(new QCheckBox(
-		  obs_module_text("AdvSceneSwitcher.variableTab.addDock"))),
-	  _settings(settings)
+		  openSettingsDialog)
 {
-	_clear->setMaximumWidth(22);
-	SetButtonIcon(_clear, GetThemeTypeName() == "Light"
-				      ? "theme:Light/close.svg"
-				      : "theme:Dark/close.svg");
-	_clear->setToolTip(
-		obs_module_text("AdvSceneSwitcher.variableTab.clear"));
-	_clear->setDisabled(_settings.searchString.empty());
-
-	connect(_clear, &QPushButton::clicked, this, [this]() {
-		_searchField->setText("");
-		_clear->setDisabled(true);
-	});
-
 	for (const auto &variable : GetVariables()) {
 		auto v = std::static_pointer_cast<Variable>(variable);
 		AddItemTableRow(Table(), getCellLabels(v.get()));
 	}
 
-	connect(Table(), &QTableWidget::itemChanged, this,
-		[this]() { Filter(); });
-
-	_searchField->setPlaceholderText(obs_module_text(
-		("AdvSceneSwitcher.variableTab.search.placeholder")));
-	_searchField->setText(QString::fromStdString(_settings.searchString));
-	connect(_searchField, &QLineEdit::textChanged, this,
-		[this](const QString &text) {
-			_settings.searchString = text.toStdString();
-			_clear->setDisabled(text.isEmpty());
-			Filter();
-		});
-
-	_searchType->addItem(
-		obs_module_text("AdvSceneSwitcher.variableTab.search.all"),
-		Settings::SearchType::ALL);
-	_searchType->addItem(
-		obs_module_text("AdvSceneSwitcher.variableTab.search.name"),
-		Settings::SearchType::NAME);
-	_searchType->addItem(
-		obs_module_text("AdvSceneSwitcher.variableTab.search.value"),
-		Settings::SearchType::VALUE);
-	_searchType->setCurrentIndex(
-		_searchType->findData(_settings.searchType));
-
-	connect(_searchType, &QComboBox::currentIndexChanged, this, [this]() {
-		_settings.searchType = static_cast<Settings::SearchType>(
-			_searchType->currentData().toInt());
-	});
-
-	_regexWidget->SetRegexConfig(_settings.regex);
-	connect(_regexWidget, &RegexConfigWidget::RegexConfigChanged, this,
-		[this](const RegexConfig &regex) {
-			_settings.regex = regex;
-			Filter();
-		});
-
-	_addDock->setChecked(addDock);
-	connect(_addDock, &QCheckBox::stateChanged, this,
-		[this](int checked) { enableDock(checked); });
-
-	QWidget::connect(VariableSignalManager::Instance(),
-			 &VariableSignalManager::Rename, this,
-			 [this](const QString &oldName,
-				const QString &newName) {
-				 RenameItemTableRow(Table(), oldName, newName);
-			 });
-	QWidget::connect(
-		VariableSignalManager::Instance(), &VariableSignalManager::Add,
-		this, [this](const QString &name) {
-			AddItemTableRow(
-				Table(),
-				getCellLabels(GetVariableByQString(name)));
-			SetHelpVisible(false);
-			HighlightAddButton(false);
-		});
-	QWidget::connect(VariableSignalManager::Instance(),
-			 &VariableSignalManager::Remove, this,
-			 [this](const QString &name) {
-				 RemoveItemTableRow(Table(), name);
-				 if (Table()->rowCount() == 0) {
-					 SetHelpVisible(true);
-					 HighlightAddButton(true);
-				 }
-			 });
-
-	auto timer = new QTimer(this);
-	timer->setInterval(1000);
-	QWidget::connect(timer, &QTimer::timeout,
-			 [this]() { updateVariableStatus(Table()); });
-	timer->start();
-
-	auto searchLayout = new QHBoxLayout();
-	searchLayout->addWidget(_searchField);
-	searchLayout->addWidget(_clear);
-	searchLayout->addWidget(_searchType);
-	searchLayout->addWidget(_regexWidget);
-	searchLayout->addWidget(_addDock);
-	qobject_cast<QVBoxLayout *>(layout())->insertLayout(0, searchLayout);
-
 	SetHelpVisible(GetVariables().empty());
 }
 
@@ -467,27 +269,37 @@ static void setupTab(QTabWidget *tab)
 		setTabVisible(tab, false);
 	}
 
+	QWidget::connect(VariableSignalManager::Instance(),
+			 &VariableSignalManager::Rename, tab,
+			 [](const QString &oldName, const QString &newName) {
+				 RenameItemTableRow(tabWidget->Table(), oldName,
+						    newName);
+			 });
 	QWidget::connect(
 		VariableSignalManager::Instance(), &VariableSignalManager::Add,
-		tab, [tab](const QString &name) { setTabVisible(tab, true); });
-}
+		tab, [tab](const QString &name) {
+			AddItemTableRow(
+				tabWidget->Table(),
+				getCellLabels(GetVariableByQString(name)));
+			tabWidget->SetHelpVisible(false);
+			tabWidget->HighlightAddButton(false);
+			setTabVisible(tab, true);
+		});
+	QWidget::connect(VariableSignalManager::Instance(),
+			 &VariableSignalManager::Remove, tab,
+			 [](const QString &name) {
+				 RemoveItemTableRow(tabWidget->Table(), name);
+				 if (tabWidget->Table()->rowCount() == 0) {
+					 tabWidget->SetHelpVisible(true);
+					 tabWidget->HighlightAddButton(true);
+				 }
+			 });
 
-void VariableTable::Settings::Save(obs_data_t *data, const char *name)
-{
-	OBSDataAutoRelease settings = obs_data_create();
-	obs_data_set_int(settings, "searchType", static_cast<int>(searchType));
-	obs_data_set_string(settings, "searchString", searchString.c_str());
-	regex.Save(settings);
-	obs_data_set_obj(data, name, settings);
-}
-
-void VariableTable::Settings::Load(obs_data_t *data, const char *name)
-{
-	OBSDataAutoRelease settings = obs_data_get_obj(data, name);
-	searchType = static_cast<SearchType>(
-		obs_data_get_int(settings, "searchType"));
-	searchString = obs_data_get_string(settings, "searchString");
-	regex.Load(settings);
+	auto timer = new QTimer(tabWidget);
+	timer->setInterval(1000);
+	QWidget::connect(timer, &QTimer::timeout,
+			 []() { updateVariableStatus(tabWidget->Table()); });
+	timer->start();
 }
 
 } // namespace advss

lib/variables/variable-tab.hpp

@@ -1,8 +1,5 @@
 #pragma once
 #include "resource-table.hpp"
-#include "regex-config.hpp"
-
-#include <QComboBox>
 
 namespace advss {
 
@@ -10,34 +7,14 @@ class VariableTable final : public ResourceTable {
 	Q_OBJECT
 
 public:
-	struct Settings {
-		void Save(obs_data_t *data, const char *name);
-		void Load(obs_data_t *data, const char *name);
-
-		enum SearchType { ALL = -1, NAME = 0, VALUE = 1 };
-
-		SearchType searchType = SearchType::ALL;
-		std::string searchString;
-		RegexConfig regex;
-	};
-
-	VariableTable(Settings &settings, QWidget *parent = nullptr);
-	static VariableTable *CreateTabTable();
-	void HideDockOptions() const;
+	static VariableTable *Create();
 
 private slots:
 	void Add();
 	void Remove();
-	void Filter();
 
 private:
-	QLineEdit *_searchField;
-	QPushButton *_clear;
-	QComboBox *_searchType;
-	RegexConfigWidget *_regexWidget;
-	QCheckBox *_addDock;
-
-	Settings &_settings;
+	VariableTable(QTabWidget *parent = nullptr);
 };
 
 } // namespace advss

lib/variables/variable.cpp

@@ -456,7 +456,7 @@ void ImportVariables(obs_data_t *data)
 
 	obs_data_array_release(array);
 
-	QueueUITask(signalImportedVariables, importedVars);
+	QeueUITask(signalImportedVariables, importedVars);
 }
 
 std::chrono::high_resolution_clock::time_point GetLastVariableChangeTime()

plugins/base/macro-action-hotkey.cpp

@@ -601,10 +601,10 @@ static void populateHotkeyNames(QComboBox *list,
 MacroActionHotkeyEdit::MacroActionHotkeyEdit(
 	QWidget *parent, std::shared_ptr<MacroActionHotkey> entryData)
 	: QWidget(parent),
-	  _actionType(new FilterComboBox()),
-	  _hotkeyType(new FilterComboBox()),
-	  _obsHotkeys(new FilterComboBox()),
-	  _keys(new FilterComboBox()),
+	  _actionType(new QComboBox()),
+	  _hotkeyType(new QComboBox()),
+	  _obsHotkeys(new QComboBox()),
+	  _keys(new QComboBox()),
 	  _leftShift(new QCheckBox(
 		  obs_module_text("AdvSceneSwitcher.action.hotkey.leftShift"))),
 	  _rightShift(new QCheckBox(obs_module_text(

plugins/base/macro-action-hotkey.hpp

@@ -85,14 +85,11 @@ private slots:
 	void DurationChanged(const Duration &);
 	void OnlySendToOBSChanged(int state);
 
-private:
-	void RepopulateOBSHotkeySelection();
-	void SetWidgetVisibility();
-
-	FilterComboBox *_actionType;
-	FilterComboBox *_hotkeyType;
-	FilterComboBox *_obsHotkeys;
-	FilterComboBox *_keys;
+protected:
+	QComboBox *_actionType;
+	QComboBox *_hotkeyType;
+	QComboBox *_obsHotkeys;
+	QComboBox *_keys;
 	QCheckBox *_leftShift;
 	QCheckBox *_rightShift;
 	QCheckBox *_leftCtrl;
@@ -104,10 +101,15 @@ private:
 	DurationSelection *_duration;
 	QCheckBox *_onlySendToOBS;
 	QLabel *_noKeyPressSimulationWarning;
-	QHBoxLayout *_entryLayout;
-	QHBoxLayout *_keyConfigLayout;
 
 	std::shared_ptr<MacroActionHotkey> _entryData;
+
+private:
+	void RepopulateOBSHotkeySelection();
+	void SetWidgetVisibility();
+
+	QHBoxLayout *_entryLayout;
+	QHBoxLayout *_keyConfigLayout;
 	bool _loading = true;
 };
 

plugins/base/macro-action-source.cpp

@@ -7,8 +7,6 @@
 
 #include <obs-frontend-api.h>
 
-#include <QMainWindow>
-
 namespace advss {
 
 const std::string MacroActionSource::id = "source";
@@ -39,12 +37,6 @@ const static std::map<MacroActionSource::Action, std::string> actionTypes = {
 	 "AdvSceneSwitcher.action.source.type.openFilterDialog"},
 	{MacroActionSource::Action::OPEN_PROPERTIES_DIALOG,
 	 "AdvSceneSwitcher.action.source.type.openPropertiesDialog"},
-	{MacroActionSource::Action::CLOSE_INTERACTION_DIALOG,
-	 "AdvSceneSwitcher.action.source.type.closeInteractionDialog"},
-	{MacroActionSource::Action::CLOSE_FILTER_DIALOG,
-	 "AdvSceneSwitcher.action.source.type.closeFilterDialog"},
-	{MacroActionSource::Action::CLOSE_PROPERTIES_DIALOG,
-	 "AdvSceneSwitcher.action.source.type.closePropertiesDialog"},
 };
 
 const static std::map<obs_deinterlace_mode, std::string> deinterlaceModes = {
@@ -116,81 +108,9 @@ static bool isInteractable(obs_source_t *source)
 	return (flags & OBS_SOURCE_INTERACTION) != 0;
 }
 
-static void closeSourceDialog(obs_source_t *source, bool accept,
-			      const char *className)
-{
-	if (!source) {
-		return;
-	}
-
-	auto mainWindow =
-		reinterpret_cast<QMainWindow *>(obs_frontend_get_main_window());
-	if (!mainWindow) {
-		return;
-	}
-
-	for (const auto widget : mainWindow->children()) {
-		auto dialog = qobject_cast<QDialog *>(widget);
-		if (!dialog) {
-			continue;
-		}
-
-		if (dialog->metaObject()->className() != QString(className)) {
-			continue;
-		}
-
-		const char *name = obs_source_get_name(source);
-		if (!name) {
-			continue;
-		}
-
-		if (!dialog->windowTitle().contains(QString(name))) {
-			continue;
-		}
-
-		if (accept) {
-			dialog->accept();
-			return;
-		}
-
-		// dialog->reject() will ask for confirmation
-		// Try to avoid this by finding and pressing the cancel button
-		for (const auto widget : dialog->children()) {
-			auto buttons = qobject_cast<QDialogButtonBox *>(widget);
-			if (!buttons) {
-				continue;
-			}
-
-			for (auto *button : buttons->buttons()) {
-				if (buttons->buttonRole(button) ==
-				    QDialogButtonBox::RejectRole) {
-					button->click();
-					break;
-				}
-			}
-		}
-	}
-}
-
-template<typename F> void QueueUITaskLambda(F &&func)
-{
-	using FnType = std::decay_t<F>;
-	auto *heapFunc = new FnType(std::forward<F>(func));
-
-	QueueUITask(
-		[](void *param) {
-			std::unique_ptr<FnType> fn(
-				static_cast<FnType *>(param));
-			(*fn)();
-		},
-		heapFunc);
-}
-
 bool MacroActionSource::PerformAction()
 {
-	OBSSource s = obs_weak_source_get_source(_source.GetSource());
-	obs_source_release(s);
-
+	auto s = obs_weak_source_get_source(_source.GetSource());
 	switch (_action) {
 	case Action::ENABLE:
 		obs_source_set_enabled(s, true);
@@ -252,31 +172,10 @@ bool MacroActionSource::PerformAction()
 	case Action::OPEN_PROPERTIES_DIALOG:
 		obs_frontend_open_source_properties(s);
 		break;
-	case Action::CLOSE_INTERACTION_DIALOG:
-		if (!isInteractable(s)) {
-			// Nothing to do
-			break;
-		}
-
-		QueueUITaskLambda([&]() {
-			closeSourceDialog(s, true, "OBSBasicInteraction");
-		});
-		break;
-	case Action::CLOSE_FILTER_DIALOG:
-		QueueUITaskLambda([&]() {
-			closeSourceDialog(s, _acceptDialog, "OBSBasicFilters");
-		});
-		break;
-	case Action::CLOSE_PROPERTIES_DIALOG:
-		QueueUITaskLambda([&]() {
-			closeSourceDialog(s, _acceptDialog,
-					  "OBSBasicProperties");
-		});
-		break;
 	default:
 		break;
 	}
-
+	obs_source_release(s);
 	return true;
 }
 
@@ -308,7 +207,6 @@ bool MacroActionSource::Save(obs_data_t *obj) const
 			 static_cast<int>(_deinterlaceMode));
 	obs_data_set_int(obj, "deinterlaceOrder",
 			 static_cast<int>(_deinterlaceOrder));
-	obs_data_set_bool(obj, "acceptDialog", _acceptDialog);
 	return true;
 }
 
@@ -333,7 +231,6 @@ bool MacroActionSource::Load(obs_data_t *obj)
 		obs_data_get_int(obj, "deinterlaceMode"));
 	_deinterlaceOrder = static_cast<obs_deinterlace_field_order>(
 		obs_data_get_int(obj, "deinterlaceOrder"));
-	_acceptDialog = obs_data_get_bool(obj, "acceptDialog");
 	return true;
 }
 
@@ -410,9 +307,7 @@ MacroActionSourceEdit::MacroActionSourceEdit(
 	  _warning(new QLabel(
 		  obs_module_text("AdvSceneSwitcher.action.source.warning"))),
 	  _refreshSettingSelection(new QPushButton(
-		  obs_module_text("AdvSceneSwitcher.action.source.refresh"))),
-	  _acceptDialog(new QCheckBox(obs_module_text(
-		  "AdvSceneSwitcher.action.source.dialog.accept")))
+		  obs_module_text("AdvSceneSwitcher.action.source.refresh")))
 {
 	populateActionSelection(_actions);
 
@@ -452,8 +347,6 @@ MacroActionSourceEdit::MacroActionSourceEdit(
 			 SLOT(SelectionChanged(const SourceSetting &)));
 	QWidget::connect(_refreshSettingSelection, SIGNAL(clicked()), this,
 			 SLOT(RefreshVariableSourceSelectionValue()));
-	QWidget::connect(_acceptDialog, SIGNAL(stateChanged(int)), this,
-			 SLOT(AcceptDialogChanged(int)));
 
 	auto entryLayout = new QHBoxLayout;
 	entryLayout->setContentsMargins(0, 0, 0, 0);
@@ -481,7 +374,6 @@ MacroActionSourceEdit::MacroActionSourceEdit(
 	mainLayout->addLayout(_settingsLayout);
 	mainLayout->addWidget(_warning);
 	mainLayout->addWidget(_settingsString);
-	mainLayout->addWidget(_acceptDialog);
 	auto buttonLayout = new QHBoxLayout;
 	buttonLayout->setContentsMargins(0, 0, 0, 0);
 	buttonLayout->addWidget(_getSettings);
@@ -514,7 +406,6 @@ void MacroActionSourceEdit::UpdateEntryData()
 		static_cast<int>(_entryData->_settingsInputMethod)));
 	_tempVars->SetVariable(_entryData->_tempVar);
 	_manualSettingValue->setPlainText(_entryData->_manualSettingValue);
-	_acceptDialog->setChecked(_entryData->_acceptDialog);
 
 	SetWidgetVisibility();
 }
@@ -640,12 +531,6 @@ void MacroActionSourceEdit::RefreshVariableSourceSelectionValue()
 	_sourceSettings->SetSource(_entryData->_source.GetSource());
 }
 
-void MacroActionSourceEdit::AcceptDialogChanged(int state)
-{
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_acceptDialog = state;
-}
-
 static QString GetIndividualListEntryName()
 {
 	static const auto matchesInput =
@@ -728,12 +613,6 @@ void MacroActionSourceEdit::SetWidgetVisibility()
 		_entryData->_source.GetType() ==
 			SourceSelection::Type::VARIABLE);
 
-	_acceptDialog->setVisible(
-		_entryData->_action ==
-			MacroActionSource::Action::CLOSE_FILTER_DIALOG ||
-		_entryData->_action ==
-			MacroActionSource::Action::CLOSE_PROPERTIES_DIALOG);
-
 	adjustSize();
 	updateGeometry();
 }

plugins/base/macro-action-source.hpp

@@ -5,10 +5,9 @@
 #include "source-selection.hpp"
 #include "source-setting.hpp"
 
-#include <QCheckBox>
-#include <QComboBox>
 #include <QLabel>
 #include <QPushButton>
+#include <QComboBox>
 
 namespace advss {
 
@@ -34,7 +33,6 @@ public:
 		OBS_DEINTERLACE_FIELD_ORDER_TOP;
 	TempVariableRef _tempVar;
 	SourceSetting _setting;
-	bool _acceptDialog = false;
 
 	enum class Action {
 		ENABLE,
@@ -47,9 +45,6 @@ public:
 		OPEN_INTERACTION_DIALOG,
 		OPEN_FILTER_DIALOG,
 		OPEN_PROPERTIES_DIALOG,
-		CLOSE_INTERACTION_DIALOG,
-		CLOSE_FILTER_DIALOG,
-		CLOSE_PROPERTIES_DIALOG,
 	};
 	Action _action = Action::SETTINGS;
 
@@ -96,7 +91,6 @@ private slots:
 	void SelectionChanged(const SourceSetting &);
 	void ManualSettingsValueChanged();
 	void RefreshVariableSourceSelectionValue();
-	void AcceptDialogChanged(int);
 
 signals:
 	void HeaderInfoChanged(const QString &);
@@ -118,7 +112,6 @@ private:
 	QComboBox *_deinterlaceOrder;
 	QLabel *_warning;
 	QPushButton *_refreshSettingSelection;
-	QCheckBox *_acceptDialog;
 
 	std::shared_ptr<MacroActionSource> _entryData;
 	bool _loading = true;

plugins/base/macro-action-studio-mode.cpp

@@ -2,6 +2,7 @@
 #include "layout-helpers.hpp"
 
 #include <obs-frontend-api.h>
+#include <util/config-file.h>
 
 namespace advss {
 
@@ -13,16 +14,64 @@ bool MacroActionSudioMode::_registered = MacroActionFactory::Register(
 	 "AdvSceneSwitcher.action.studioMode"});
 
 const static std::map<MacroActionSudioMode::Action, std::string> actionTypes = {
-	{MacroActionSudioMode::Action::SWAP_SCENE,
-	 "AdvSceneSwitcher.action.studioMode.type.swap"},
-	{MacroActionSudioMode::Action::SET_SCENE,
-	 "AdvSceneSwitcher.action.studioMode.type.setScene"},
+	{MacroActionSudioMode::Action::TRANSITION,
+	 "AdvSceneSwitcher.action.studioMode.type.transition"},
+	{MacroActionSudioMode::Action::TRANSITION_WITH_SWAP,
+	 "AdvSceneSwitcher.action.studioMode.type.transitionWithSwap"},
+	{MacroActionSudioMode::Action::ENALBE_TRANSITION_SWAP,
+	 "AdvSceneSwitcher.action.studioMode.type.transitionSwap.enable"},
+	{MacroActionSudioMode::Action::DISABLE_TRANSITION_SWAP,
+	 "AdvSceneSwitcher.action.studioMode.type.transitionSwap.disable"},
+	{MacroActionSudioMode::Action::TOGGLE_TRANSITION_SWAP,
+	 "AdvSceneSwitcher.action.studioMode.type.transitionSwap.toggle"},
+	{MacroActionSudioMode::Action::ENALBE_DUPLICATE_SCENE,
+	 "AdvSceneSwitcher.action.studioMode.type.duplicateScene.enable"},
+	{MacroActionSudioMode::Action::DISABLE_DUPLICATE_SCENE,
+	 "AdvSceneSwitcher.action.studioMode.type.duplicateScene.disable"},
+	{MacroActionSudioMode::Action::TOGGLE_DUPLICATE_SCENE,
+	 "AdvSceneSwitcher.action.studioMode.type.duplicateScene.toggle"},
+	{MacroActionSudioMode::Action::ENALBE_DUPLICATE_SOURCE,
+	 "AdvSceneSwitcher.action.studioMode.type.duplicateSource.enable"},
+	{MacroActionSudioMode::Action::DISABLE_DUPLICATE_SOURCE,
+	 "AdvSceneSwitcher.action.studioMode.type.duplicateSource.disable"},
+	{MacroActionSudioMode::Action::TOGGLE_DUPLICATE_SOURCE,
+	 "AdvSceneSwitcher.action.studioMode.type.duplicateSource.toggle"},
 	{MacroActionSudioMode::Action::ENABLE_STUDIO_MODE,
 	 "AdvSceneSwitcher.action.studioMode.type.enable"},
 	{MacroActionSudioMode::Action::DISABLE_STUDIO_MODE,
 	 "AdvSceneSwitcher.action.studioMode.type.disable"},
+	{MacroActionSudioMode::Action::TOGGLE_STUDIO_MODE,
+	 "AdvSceneSwitcher.action.studioMode.type.toggle"},
+	{MacroActionSudioMode::Action::SET_SCENE,
+	 "AdvSceneSwitcher.action.studioMode.type.setScene"},
 };
 
+template<typename Func, typename... Args>
+static void setConfigValueHelper(Func func, Args... args)
+{
+	auto config = obs_frontend_get_user_config();
+	func(config, args...);
+	if (config_save(config) != CONFIG_SUCCESS) {
+		blog(LOG_WARNING, "failed to save user config!");
+	}
+}
+
+template<typename Func, typename... Args>
+static auto getConfigValueHelper(Func func, Func defaultFunc, Args... args)
+	-> std::optional<std::invoke_result_t<Func, config_t *, Args...>>
+{
+	using Ret = std::invoke_result_t<Func, config_t *, Args...>;
+
+	auto config = obs_frontend_get_user_config();
+	if (config_has_user_value(config, args...)) {
+		return func(config, args...);
+	}
+	if (config_has_default_value(config, args...)) {
+		return defaultFunc(config, args...);
+	}
+	return std::optional<Ret>{};
+}
+
 // Calling obs_frontend_set_preview_program_mode() directly from a thread that
 // is not the main OBS UI thread will lead to undefined behaviour, so we have
 // to use this helper function instead - copied from obs-websocket plugin
@@ -42,14 +91,78 @@ static void enableStudioMode(bool enable)
 
 bool MacroActionSudioMode::PerformAction()
 {
+	obs_frontend_get_user_config();
 	switch (_action) {
-	case Action::SWAP_SCENE:
+	case Action::TRANSITION:
 		obs_frontend_preview_program_trigger_transition();
 		break;
-	case Action::SET_SCENE: {
-		auto s = obs_weak_source_get_source(_scene.GetScene());
-		obs_frontend_set_current_preview_scene(s);
-		obs_source_release(s);
+	case Action::TRANSITION_WITH_SWAP: {
+		auto swapEnabled = getConfigValueHelper(config_get_bool,
+							config_get_default_bool,
+							"BasicWindow",
+							"SwapScenesMode");
+
+		if (swapEnabled.has_value() && *swapEnabled == true) {
+			obs_frontend_preview_program_trigger_transition();
+			break;
+		}
+
+		setConfigValueHelper(config_set_bool, "BasicWindow",
+				     "SwapScenesMode", true);
+		obs_frontend_preview_program_trigger_transition();
+		setConfigValueHelper(config_set_bool, "BasicWindow",
+				     "SwapScenesMode", false);
+		break;
+	}
+	case Action::ENALBE_TRANSITION_SWAP:
+		setConfigValueHelper(config_set_bool, "BasicWindow",
+				     "SwapScenesMode", true);
+		break;
+	case Action::DISABLE_TRANSITION_SWAP:
+		setConfigValueHelper(config_set_bool, "BasicWindow",
+				     "SwapScenesMode", false);
+		break;
+	case Action::TOGGLE_TRANSITION_SWAP: {
+		const auto enabled = getConfigValueHelper(
+			config_get_bool, config_get_default_bool, "BasicWindow",
+			"SwapScenesMode");
+		setConfigValueHelper(config_set_bool, "BasicWindow",
+				     "SwapScenesMode",
+				     enabled.has_value() && !*enabled);
+		break;
+	}
+	case Action::ENALBE_DUPLICATE_SCENE:
+		setConfigValueHelper(config_set_bool, "BasicWindow",
+				     "SceneDuplicationMode", true);
+		break;
+	case Action::DISABLE_DUPLICATE_SCENE:
+		setConfigValueHelper(config_set_bool, "BasicWindow",
+				     "SceneDuplicationMode", false);
+		break;
+	case Action::TOGGLE_DUPLICATE_SCENE: {
+		const auto enabled = getConfigValueHelper(
+			config_get_bool, config_get_default_bool, "BasicWindow",
+			"SceneDuplicationMode");
+		setConfigValueHelper(config_set_bool, "BasicWindow",
+				     "SceneDuplicationMode",
+				     enabled.has_value() && !*enabled);
+		break;
+	}
+	case Action::ENALBE_DUPLICATE_SOURCE:
+		setConfigValueHelper(config_set_bool, "BasicWindow",
+				     "EditPropertiesMode", true);
+		break;
+	case Action::DISABLE_DUPLICATE_SOURCE:
+		setConfigValueHelper(config_set_bool, "BasicWindow",
+				     "EditPropertiesMode", false);
+		break;
+	case Action::TOGGLE_DUPLICATE_SOURCE: {
+		const auto enabled = getConfigValueHelper(
+			config_get_bool, config_get_default_bool, "BasicWindow",
+			"EditPropertiesMode");
+		setConfigValueHelper(config_set_bool, "BasicWindow",
+				     "EditPropertiesMode",
+				     enabled.has_value() && !*enabled);
 		break;
 	}
 	case Action::ENABLE_STUDIO_MODE:
@@ -58,6 +171,15 @@ bool MacroActionSudioMode::PerformAction()
 	case Action::DISABLE_STUDIO_MODE:
 		enableStudioMode(false);
 		break;
+	case Action::TOGGLE_STUDIO_MODE:
+		enableStudioMode(!obs_frontend_preview_program_mode_active());
+		break;
+	case Action::SET_SCENE: {
+		auto s = obs_weak_source_get_source(_scene.GetScene());
+		obs_frontend_set_current_preview_scene(s);
+		obs_source_release(s);
+		break;
+	}
 	default:
 		break;
 	}
@@ -82,6 +204,7 @@ bool MacroActionSudioMode::Save(obs_data_t *obj) const
 	MacroAction::Save(obj);
 	obs_data_set_int(obj, "action", static_cast<int>(_action));
 	_scene.Save(obj);
+	obs_data_set_int(obj, "version", 1);
 	return true;
 }
 
@@ -90,6 +213,34 @@ bool MacroActionSudioMode::Load(obs_data_t *obj)
 	MacroAction::Load(obj);
 	_action = static_cast<Action>(obs_data_get_int(obj, "action"));
 	_scene.Load(obj);
+
+	if (!obs_data_has_user_value(obj, "version")) {
+		enum class OldAction {
+			SWAP_SCENE,
+			SET_SCENE,
+			ENABLE_STUDIO_MODE,
+			DISABLE_STUDIO_MODE,
+		};
+
+		switch (static_cast<OldAction>(
+			obs_data_get_int(obj, "action"))) {
+		case OldAction::SWAP_SCENE:
+			_action = Action::TRANSITION_WITH_SWAP;
+			break;
+		case OldAction::SET_SCENE:
+			_action = Action::SET_SCENE;
+			break;
+		case OldAction::ENABLE_STUDIO_MODE:
+			_action = Action::ENABLE_STUDIO_MODE;
+			break;
+		case OldAction::DISABLE_STUDIO_MODE:
+			_action = Action::DISABLE_STUDIO_MODE;
+			break;
+		default:
+			break;
+		}
+	}
+
 	return true;
 }
 
@@ -136,15 +287,11 @@ MacroActionStudioModeEdit::MacroActionStudioModeEdit(
 	QWidget::connect(_scenes, SIGNAL(SceneChanged(const SceneSelection &)),
 			 this, SLOT(SceneChanged(const SceneSelection &)));
 
-	std::unordered_map<std::string, QWidget *> widgetPlaceholders = {
-		{"{{actions}}", _actions},
-		{"{{scenes}}", _scenes},
-	};
-	QHBoxLayout *mainLayout = new QHBoxLayout;
+	auto layout = new QHBoxLayout;
 	PlaceWidgets(
 		obs_module_text("AdvSceneSwitcher.action.studioMode.entry"),
-		mainLayout, widgetPlaceholders);
-	setLayout(mainLayout);
+		layout, {{"{{actions}}", _actions}, {"{{scenes}}", _scenes}});
+	setLayout(layout);
 
 	_entryData = entryData;
 	UpdateEntryData();

plugins/base/macro-action-studio-mode.hpp

@@ -18,13 +18,28 @@ public:
 	void ResolveVariablesToFixedValues();
 
 	enum class Action {
-		SWAP_SCENE,
-		SET_SCENE, // TODO: Remove in future version as the
-			   // functionality moved to the scene switch action
-		ENABLE_STUDIO_MODE,
-		DISABLE_STUDIO_MODE,
+		TRANSITION = 10,
+		TRANSITION_WITH_SWAP = 20,
+
+		ENALBE_TRANSITION_SWAP = 30,
+		DISABLE_TRANSITION_SWAP = 40,
+		TOGGLE_TRANSITION_SWAP = 50,
+
+		ENALBE_DUPLICATE_SCENE = 60,
+		DISABLE_DUPLICATE_SCENE = 70,
+		TOGGLE_DUPLICATE_SCENE = 80,
+
+		ENALBE_DUPLICATE_SOURCE = 90,
+		DISABLE_DUPLICATE_SOURCE = 100,
+		TOGGLE_DUPLICATE_SOURCE = 110,
+
+		ENABLE_STUDIO_MODE = 120,
+		DISABLE_STUDIO_MODE = 130,
+		TOGGLE_STUDIO_MODE = 140,
+
+		SET_SCENE = 1000, // Deprecated
 	};
-	Action _action = Action::SWAP_SCENE;
+	Action _action = Action::TRANSITION;
 	SceneSelection _scene;
 
 private:

plugins/base/macro-condition-replay-buffer.cpp

@@ -58,10 +58,6 @@ bool MacroConditionReplayBuffer::ReplayBufferWasSaved()
 
 bool MacroConditionReplayBuffer::CheckCondition()
 {
-	char *lastSavePath = obs_frontend_get_last_replay();
-	SetTempVarValue("lastSavePath", lastSavePath ? lastSavePath : "");
-	bfree(lastSavePath);
-
 	switch (_state) {
 	case Condition::STOP:
 		return !obs_frontend_replay_buffer_active();
@@ -89,16 +85,6 @@ bool MacroConditionReplayBuffer::Load(obs_data_t *obj)
 	return true;
 }
 
-void MacroConditionReplayBuffer::SetupTempVars()
-{
-	MacroCondition::SetupTempVars();
-	AddTempvar(
-		"lastSavePath",
-		obs_module_text("AdvSceneSwitcher.tempVar.replay.lastSavePath"),
-		obs_module_text(
-			"AdvSceneSwitcher.tempVar.replay.lastSavePath.description"));
-}
-
 static inline void populateStateSelection(QComboBox *list)
 {
 	for (const auto &entry : conditions) {

plugins/base/macro-condition-replay-buffer.hpp

@@ -6,7 +6,7 @@
 
 namespace advss {
 
-class MacroConditionReplayBuffer final : public MacroCondition {
+class MacroConditionReplayBuffer : public MacroCondition {
 public:
 	MacroConditionReplayBuffer(Macro *m) : MacroCondition(m) {}
 	bool CheckCondition();
@@ -27,7 +27,6 @@ public:
 	Condition _state = Condition::STOP;
 
 private:
-	void SetupTempVars();
 	bool ReplayBufferWasSaved();
 
 	bool _saveTimeInitialized = false;
@@ -36,7 +35,7 @@ private:
 	static const std::string id;
 };
 
-class MacroConditionReplayBufferEdit final : public QWidget {
+class MacroConditionReplayBufferEdit : public QWidget {
 	Q_OBJECT
 
 public:
@@ -56,10 +55,11 @@ public:
 private slots:
 	void StateChanged(int value);
 
-private:
+protected:
 	QComboBox *_state;
-
 	std::shared_ptr<MacroConditionReplayBuffer> _entryData;
+
+private:
 	bool _loading = true;
 };
 

plugins/base/macro-condition-slideshow.cpp

@@ -252,7 +252,6 @@ MacroConditionSlideshowEdit::MacroConditionSlideshowEdit(
 	setToolTip(obs_module_text(
 		"AdvSceneSwitcher.condition.slideshow.updateInterval.tooltip"));
 	_index->setMinimum(1);
-	_index->setMaximum(9999);
 	populateConditionSelection(_conditions);
 
 	QWidget::connect(_conditions, SIGNAL(currentIndexChanged(int)), this,

tests/mocks/ui-helpers.cpp

@@ -40,7 +40,7 @@ std::string GetThemeTypeName()
 	return "Dark";
 }
 
-void QueueUITask(void (*task)(void *param), void *) {}
+void QeueUITask(void (*task)(void *param), void *) {}
 
 QWidget *GetSettingsWindow()
 {