Add audio condition check if source is enabled on a specific track

CMakeLists.txt

@@ -173,8 +173,6 @@ target_sources(
           lib/macro/macro-signals.hpp
           lib/macro/macro-tab.cpp
           lib/macro/macro-tree.cpp
-          lib/macro/macro-undo-redo.cpp
-          lib/macro/macro-undo-redo.hpp
           lib/macro/macro-tree.hpp
           lib/macro/macro-websocket-trigger.cpp
           lib/macro/macro.cpp

data/locale/en-US.ini

@@ -198,17 +198,6 @@ AdvSceneSwitcher.macroTab.groupNameExists="The name \"%1\" is already used by a
 AdvSceneSwitcher.macroTab.removeSingleMacroPopup.text="Are you sure you want to remove \"%1\"?"
 AdvSceneSwitcher.macroTab.removeMultipleMacrosPopup.text="Are you sure you want to remove %1 macros/groups?"
 AdvSceneSwitcher.macroTab.removeGroupPopup.text="Are you sure you want to remove \"%1\" group and all its elements?"
-AdvSceneSwitcher.undo.renameMacro="Rename Macro '%1'"
-AdvSceneSwitcher.undo.addMacro="Add Macro '%1'"
-AdvSceneSwitcher.undo.removeMacro="Remove Macro '%1'"
-AdvSceneSwitcher.undo.addSegment="Add %1 in '%2'"
-AdvSceneSwitcher.undo.removeSegment="Remove %1 in '%2'"
-AdvSceneSwitcher.undo.groupMacros="Group Macros '%1'"
-AdvSceneSwitcher.undo.ungroupMacros="Ungroup Macros '%1'"
-AdvSceneSwitcher.undo.removeMacroGroup="Remove Macro Group '%1'"
-AdvSceneSwitcher.undo.segment.action="Action"
-AdvSceneSwitcher.undo.segment.elseAction="Else Action"
-AdvSceneSwitcher.undo.segment.condition="Condition"
 AdvSceneSwitcher.macroTab.contextMenuAdd="Add"
 AdvSceneSwitcher.macroTab.copy="Duplicate Macro"
 AdvSceneSwitcher.macroTab.group="Group Selected Macros"
@@ -353,7 +342,9 @@ AdvSceneSwitcher.condition.audio.type.volume="Configured volume level"
 AdvSceneSwitcher.condition.audio.type.syncOffset="Sync offset"
 AdvSceneSwitcher.condition.audio.type.monitor="Audio monitoring"
 AdvSceneSwitcher.condition.audio.type.balance="Audio balance"
+AdvSceneSwitcher.condition.audio.type.track="Audio track"
 AdvSceneSwitcher.condition.audio.entry="{{checkType}}of{{audioSources}}is{{condition}}{{volume}}{{volumeDB}}{{percentDBToggle}}{{syncOffset}}{{monitorTypes}}"
+AdvSceneSwitcher.condition.audio.layout.track="{{audioSources}}is enabled on{{checkType}}{{track}}"
 AdvSceneSwitcher.condition.cursor="Cursor"
 AdvSceneSwitcher.condition.cursor.type.region="is in region"
 AdvSceneSwitcher.condition.cursor.type.moving="is moving"
@@ -2375,6 +2366,7 @@ AdvSceneSwitcher.tempVar.audio.muted="Source muted"
 AdvSceneSwitcher.tempVar.audio.sync_offset="Source audio sync offset"
 AdvSceneSwitcher.tempVar.audio.monitor="Source audio monitor type"
 AdvSceneSwitcher.tempVar.audio.balance="Source audio balance"
+AdvSceneSwitcher.tempVar.audio.trackEnabled="Audio track enabled"
 
 AdvSceneSwitcher.tempVar.clipboard.mimeType.primary="Primary clipboard item MIME type"
 AdvSceneSwitcher.tempVar.clipboard.mimeType.primary.description="Highest priority MIME type of the current item stored in clipboard, if available."

lib/macro/macro-edit.cpp

@@ -1,7 +1,6 @@
 #include "macro-edit.hpp"
 
 #include "condition-logic.hpp"
-#include "macro-undo-redo.hpp"
 #include "cursor-shape-changer.hpp"
 #include "macro-action-edit.hpp"
 #include "macro-action-macro.hpp"
@@ -258,92 +257,6 @@ std::shared_ptr<Macro> MacroEdit::GetMacro() const
 	return _currentMacro;
 }
 
-void MacroEdit::InsertSegmentWidget(SegmentType type, int idx)
-{
-	auto macro = _currentMacro;
-	if (!macro) {
-		return;
-	}
-
-	switch (type) {
-	case SegmentType::ACTION: {
-		if (idx < 0 || idx > (int)macro->Actions().size()) {
-			break;
-		}
-		ui->actionsList->Insert(
-			idx, new MacroActionEdit(this, &macro->Actions()[idx]));
-		SetActionData(*macro);
-		ui->actionsList->SetHelpMsgVisible(false);
-		break;
-	}
-	case SegmentType::ELSE_ACTION: {
-		if (idx < 0 || idx > (int)macro->ElseActions().size()) {
-			break;
-		}
-		ui->elseActionsList->Insert(
-			idx,
-			new MacroActionEdit(this, &macro->ElseActions()[idx]));
-		SetElseActionData(*macro);
-		ui->elseActionsList->SetHelpMsgVisible(false);
-		break;
-	}
-	case SegmentType::CONDITION: {
-		if (idx < 0 || idx > (int)macro->Conditions().size()) {
-			break;
-		}
-		ui->conditionsList->Insert(
-			idx,
-			new MacroConditionEdit(this, &macro->Conditions()[idx],
-					       idx == 0));
-		if (idx == 0 && macro->Conditions().size() > 1) {
-			static_cast<MacroConditionEdit *>(
-				ui->conditionsList->WidgetAt(1))
-				->SetRootNode(false);
-		}
-		SetConditionData(*macro);
-		ui->conditionsList->SetHelpMsgVisible(false);
-		break;
-	}
-	}
-}
-
-void MacroEdit::RemoveSegmentWidget(SegmentType type, int idx)
-{
-	auto macro = _currentMacro;
-	if (!macro) {
-		return;
-	}
-
-	switch (type) {
-	case SegmentType::ACTION:
-		if (idx >= 0 &&
-		    idx < ui->actionsList->ContentLayout()->count()) {
-			ui->actionsList->Remove(idx);
-			SetActionData(*macro);
-		}
-		break;
-	case SegmentType::ELSE_ACTION:
-		if (idx >= 0 &&
-		    idx < ui->elseActionsList->ContentLayout()->count()) {
-			ui->elseActionsList->Remove(idx);
-			SetElseActionData(*macro);
-		}
-		break;
-	case SegmentType::CONDITION:
-		if (idx >= 0 &&
-		    idx < ui->conditionsList->ContentLayout()->count()) {
-			ui->conditionsList->Remove(idx);
-			if (idx == 0 && !macro->Conditions().empty()) {
-				static_cast<MacroConditionEdit *>(
-					ui->conditionsList->WidgetAt(0))
-					->SetRootNode(true);
-			}
-			SetConditionData(*macro);
-		}
-		break;
-	}
-}
-
 void MacroEdit::ClearSegmentWidgetCacheFor(Macro *macro) const
 {
 	ui->conditionsList->ClearWidgetsFromCacheFor(macro);
@@ -382,7 +295,7 @@ isValidMacroSegmentIdx(const std::deque<std::shared_ptr<MacroSegment>> &list,
 	return (idx > 0 || (unsigned)idx < list.size());
 }
 
-void MacroEdit::SetupMacroSegmentSelection(SegmentType type, int idx)
+void MacroEdit::SetupMacroSegmentSelection(MacroSection type, int idx)
 {
 	auto macro = _currentMacro;
 	if (!macro) {
@@ -395,7 +308,7 @@ void MacroEdit::SetupMacroSegmentSelection(SegmentType type, int idx)
 	std::deque<std::shared_ptr<MacroSegment>> segments;
 
 	switch (type) {
-	case MacroEdit::SegmentType::CONDITION:
+	case MacroEdit::MacroSection::CONDITIONS:
 		setList = ui->conditionsList;
 		setIdx = &currentConditionIdx;
 		segments = {macro->Conditions().begin(),
@@ -406,7 +319,7 @@ void MacroEdit::SetupMacroSegmentSelection(SegmentType type, int idx)
 		resetIdx1 = &currentActionIdx;
 		resetIdx2 = &currentElseActionIdx;
 		break;
-	case MacroEdit::SegmentType::ACTION:
+	case MacroEdit::MacroSection::ACTIONS:
 		setList = ui->actionsList;
 		setIdx = &currentActionIdx;
 		segments = {macro->Actions().begin(), macro->Actions().end()};
@@ -416,7 +329,7 @@ void MacroEdit::SetupMacroSegmentSelection(SegmentType type, int idx)
 		resetIdx1 = &currentConditionIdx;
 		resetIdx2 = &currentElseActionIdx;
 		break;
-	case MacroEdit::SegmentType::ELSE_ACTION:
+	case MacroEdit::MacroSection::ELSE_ACTIONS:
 		setList = ui->elseActionsList;
 		setIdx = &currentElseActionIdx;
 		segments = {macro->ElseActions().begin(),
@@ -1052,7 +965,7 @@ void MacroEdit::UpMacroSegmentHotkey()
 	int conditionSize = macro->Conditions().size();
 
 	if (currentActionIdx == -1 && currentConditionIdx == -1) {
-		if (lastInteracted == SegmentType::CONDITION) {
+		if (lastInteracted == MacroSection::CONDITIONS) {
 			if (conditionSize == 0) {
 				MacroActionSelectionChanged(0);
 			} else {
@@ -1108,7 +1021,7 @@ void MacroEdit::DownMacroSegmentHotkey()
 	int conditionSize = macro->Conditions().size();
 
 	if (currentActionIdx == -1 && currentConditionIdx == -1) {
-		if (lastInteracted == SegmentType::CONDITION) {
+		if (lastInteracted == MacroSection::CONDITIONS) {
 			if (conditionSize == 0) {
 				MacroActionSelectionChanged(0);
 			} else {
@@ -1185,7 +1098,6 @@ void MacroEdit::AddMacroAction(Macro *macro, int idx, const std::string &id,
 			idx, new MacroActionEdit(this, &macro->Actions()[idx]));
 		SetActionData(*macro);
 	}
-	RegisterSegmentAddUndoRedo(macro, SegmentType::ACTION, idx);
 	HighlightAction(idx);
 	ui->actionsList->SetHelpMsgVisible(false);
 	emit(MacroSegmentOrderChanged());
@@ -1251,19 +1163,6 @@ void MacroEdit::RemoveMacroAction(int idx)
 		return;
 	}
 
-	{
-		OBSDataAutoRelease segData = obs_data_create();
-		std::string segId;
-		{
-			auto lock = LockContext();
-			macro->Actions().at(idx)->Save(segData);
-			segId = macro->Actions().at(idx)->GetId();
-		}
-		RegisterSegmentRemoveUndoRedo(macro.get(), SegmentType::ACTION,
-					      idx, segId, segData,
-					      (int)Logic::Type::ROOT_NONE);
-	}
-
 	{
 		auto lock = LockContext();
 		ui->actionsList->Remove(idx);
@@ -1274,7 +1173,7 @@ void MacroEdit::RemoveMacroAction(int idx)
 		SetActionData(*macro);
 	}
 	MacroActionSelectionChanged(-1);
-	lastInteracted = SegmentType::ACTION;
+	lastInteracted = MacroSection::ACTIONS;
 	emit(MacroSegmentOrderChanged());
 }
 
@@ -1454,7 +1353,7 @@ void MacroEdit::MoveMacroActionDown(int idx)
 
 void MacroEdit::MacroElseActionSelectionChanged(int idx)
 {
-	SetupMacroSegmentSelection(SegmentType::ELSE_ACTION, idx);
+	SetupMacroSegmentSelection(MacroSection::ELSE_ACTIONS, idx);
 }
 
 void MacroEdit::MacroElseActionReorder(int to, int from)
@@ -1507,7 +1406,6 @@ void MacroEdit::AddMacroElseAction(Macro *macro, int idx, const std::string &id,
 			new MacroActionEdit(this, &macro->ElseActions()[idx]));
 		SetElseActionData(*macro);
 	}
-	RegisterSegmentAddUndoRedo(macro, SegmentType::ELSE_ACTION, idx);
 	HighlightElseAction(idx);
 	ui->elseActionsList->SetHelpMsgVisible(false);
 	emit(MacroSegmentOrderChanged());
@@ -1557,20 +1455,6 @@ void MacroEdit::RemoveMacroElseAction(int idx)
 		return;
 	}
 
-	{
-		OBSDataAutoRelease segData = obs_data_create();
-		std::string segId;
-		{
-			auto lock = LockContext();
-			macro->ElseActions().at(idx)->Save(segData);
-			segId = macro->ElseActions().at(idx)->GetId();
-		}
-		RegisterSegmentRemoveUndoRedo(macro.get(),
-					      SegmentType::ELSE_ACTION, idx,
-					      segId, segData,
-					      (int)Logic::Type::ROOT_NONE);
-	}
-
 	{
 		auto lock = LockContext();
 		ui->elseActionsList->Remove(idx);
@@ -1581,7 +1465,7 @@ void MacroEdit::RemoveMacroElseAction(int idx)
 		SetElseActionData(*macro);
 	}
 	MacroElseActionSelectionChanged(-1);
-	lastInteracted = SegmentType::ELSE_ACTION;
+	lastInteracted = MacroSection::ELSE_ACTIONS;
 	emit(MacroSegmentOrderChanged());
 }
 
@@ -1642,7 +1526,7 @@ void MacroEdit::MoveMacroElseActionDown(int idx)
 
 void MacroEdit::MacroActionSelectionChanged(int idx)
 {
-	SetupMacroSegmentSelection(SegmentType::ACTION, idx);
+	SetupMacroSegmentSelection(MacroSection::ACTIONS, idx);
 }
 
 void MacroEdit::MacroActionReorder(int to, int from)
@@ -1733,7 +1617,6 @@ void MacroEdit::AddMacroCondition(Macro *macro, int idx, const std::string &id,
 					       idx == 0));
 		SetConditionData(*macro);
 	}
-	RegisterSegmentAddUndoRedo(macro, SegmentType::CONDITION, idx);
 	HighlightCondition(idx);
 	ui->conditionsList->SetHelpMsgVisible(false);
 	emit(MacroSegmentOrderChanged());
@@ -1769,21 +1652,6 @@ void MacroEdit::RemoveMacroCondition(int idx)
 		return;
 	}
 
-	{
-		OBSDataAutoRelease segData = obs_data_create();
-		std::string segId;
-		int logic;
-		{
-			auto lock = LockContext();
-			macro->Conditions().at(idx)->Save(segData);
-			segId = macro->Conditions().at(idx)->GetId();
-			logic = (int)macro->Conditions().at(idx)->GetLogicType();
-		}
-		RegisterSegmentRemoveUndoRedo(macro.get(),
-					      SegmentType::CONDITION, idx,
-					      segId, segData, logic);
-	}
-
 	{
 		auto lock = LockContext();
 		ui->conditionsList->Remove(idx);
@@ -1799,7 +1667,7 @@ void MacroEdit::RemoveMacroCondition(int idx)
 		SetConditionData(*macro);
 	}
 	MacroConditionSelectionChanged(-1);
-	lastInteracted = SegmentType::CONDITION;
+	lastInteracted = MacroSection::CONDITIONS;
 	emit(MacroSegmentOrderChanged());
 }
 
@@ -1924,7 +1792,7 @@ void MacroEdit::MoveMacroConditionDown(int idx)
 
 void MacroEdit::MacroConditionSelectionChanged(int idx)
 {
-	SetupMacroSegmentSelection(SegmentType::CONDITION, idx);
+	SetupMacroSegmentSelection(MacroSection::CONDITIONS, idx);
 }
 
 void MacroEdit::MacroConditionReorder(int to, int from)

lib/macro/macro-edit.hpp

@@ -12,15 +12,11 @@ class MacroEdit : public QWidget {
 	Q_OBJECT
 
 public:
-	enum class SegmentType { CONDITION, ACTION, ELSE_ACTION };
-
 	MacroEdit(QWidget *parent, QStringList helpMsg = {});
 	void SetMacro(const std::shared_ptr<Macro> &);
 	std::shared_ptr<Macro> GetMacro() const;
 	void ClearSegmentWidgetCacheFor(Macro *) const;
 	void SetControlsDisabled(bool disable) const;
-	void InsertSegmentWidget(SegmentType type, int idx);
-	void RemoveSegmentWidget(SegmentType type, int idx);
 	void HighlightAction(int idx, QColor color = QColor(Qt::green)) const;
 	void HighlightElseAction(int idx,
 				 QColor color = QColor(Qt::green)) const;
@@ -116,12 +112,14 @@ protected:
 	bool eventFilter(QObject *obj, QEvent *event) override;
 
 private:
+	enum class MacroSection { CONDITIONS, ACTIONS, ELSE_ACTIONS };
+
 	void PopulateMacroActions(Macro &m, uint32_t afterIdx = 0);
 	void PopulateMacroElseActions(Macro &m, uint32_t afterIdx = 0);
 	void PopulateMacroConditions(Macro &m, uint32_t afterIdx = 0);
 	void ScrollAndFocusNewSegment(MacroSegmentList *list, int newIdx,
 				      int *currentIdx);
-	void SetupMacroSegmentSelection(SegmentType type, int idx);
+	void SetupMacroSegmentSelection(MacroSection type, int idx);
 	void
 	SetupContextMenu(const QPoint &pos,
 			 const std::function<void(MacroEdit *, int)> &remove,
@@ -133,7 +131,7 @@ private:
 	void RunSegmentHighlightChecks();
 	bool ElseSectionIsVisible() const;
 
-	SegmentType lastInteracted = SegmentType::CONDITION;
+	MacroSection lastInteracted = MacroSection::CONDITIONS;
 	int currentConditionIdx = -1;
 	int currentActionIdx = -1;
 	int currentElseActionIdx = -1;

lib/macro/macro-segment-list.cpp

@@ -201,8 +201,6 @@ bool MacroSegmentList::PopulateWidgetsFromCache(const Macro *macro)
 		_contentLayout->addWidget(widget);
 		widget->show();
 	}
-	// Widgets are now owned by the layout again, so the cache entry is stale.
-	_widgetCache.erase(it);
 
 	adjustSize();
 	updateGeometry();
@@ -465,17 +463,7 @@ void MacroSegmentList::SetupVisibleMacroSegmentWidgets()
 
 	const auto viewportRect = viewport()->rect();
 
-	for (int i = 0; i < _contentLayout->count(); ++i) {
-		auto item = _contentLayout->itemAt(i);
-		if (!item) {
-			continue;
-		}
-
-		auto segment = dynamic_cast<MacroSegmentEdit *>(item->widget());
-		if (!segment) {
-			continue;
-		}
-
+	for (auto segment : widget()->findChildren<MacroSegmentEdit *>()) {
 		const auto pos = segment->mapTo(viewport(), QPoint(0, 0));
 		const QRect rect(pos, segment->size());
 		if (!viewportRect.intersects(rect)) {

lib/macro/macro-tab.cpp

@@ -7,7 +7,6 @@
 #include "macro-settings.hpp"
 #include "macro-signals.hpp"
 #include "macro-tree.hpp"
-#include "macro-undo-redo.hpp"
 #include "macro.hpp"
 #include "math-helpers.hpp"
 #include "name-dialog.hpp"
@@ -123,7 +122,6 @@ void AdvSceneSwitcher::on_macroAdd_clicked()
 		ui->macros->Add(newMacro);
 		MacroSignalManager::Instance()->Add(
 			QString::fromStdString(name));
-		RegisterMacroAddUndoRedo(name);
 		return;
 	}
 
@@ -133,7 +131,6 @@ void AdvSceneSwitcher::on_macroAdd_clicked()
 		ui->macros->AddToGroup(newMacro, selectedMacro);
 		MacroSignalManager::Instance()->Add(
 			QString::fromStdString(name));
-		RegisterMacroAddUndoRedo(name);
 		return;
 	}
 
@@ -142,14 +139,12 @@ void AdvSceneSwitcher::on_macroAdd_clicked()
 		ui->macros->Add(newMacro, selectedMacro);
 		MacroSignalManager::Instance()->Add(
 			QString::fromStdString(name));
-		RegisterMacroAddUndoRedo(name);
 		return;
 	}
 
 	Macro::PrepareMoveToGroup(selectedMacroGroup, newMacro);
 	ui->macros->Add(newMacro, selectedMacro);
 	MacroSignalManager::Instance()->Add(QString::fromStdString(name));
-	RegisterMacroAddUndoRedo(name);
 }
 
 static void addGroupSubitems(std::vector<std::shared_ptr<Macro>> &macros,
@@ -190,12 +185,6 @@ void AdvSceneSwitcher::RemoveMacro(std::shared_ptr<Macro> &macro)
 		}
 	}
 
-	if (macro->IsGroup()) {
-		RegisterGroupDeleteUndoRedo(macro.get());
-	} else {
-		RegisterMacroRemoveUndoRedo(macro.get());
-	}
-
 	if (macro->IsGroup()) {
 		std::vector<std::shared_ptr<Macro>> macros = {macro};
 		addGroupSubitems(macros, macro);
@@ -252,16 +241,13 @@ void AdvSceneSwitcher::RemoveSelectedMacros()
 void AdvSceneSwitcher::RenameMacro(std::shared_ptr<Macro> &macro,
 				   const QString &name)
 {
-	const std::string oldName = macro->Name();
-	const std::string newName = name.toStdString();
+	auto oldName = QString::fromStdString(macro->Name());
 	{
 		auto lock = LockContext();
-		macro->SetName(newName);
+		macro->SetName(name.toStdString());
 	}
 
-	RegisterMacroRenameUndoRedo(oldName, newName);
-	MacroSignalManager::Instance()->Rename(QString::fromStdString(oldName),
-					       name);
+	MacroSignalManager::Instance()->Rename(oldName, name);
 }
 
 void AdvSceneSwitcher::on_macroRemove_clicked()

lib/macro/macro-tree.cpp

@@ -1,5 +1,4 @@
 #include "macro-tree.hpp"
-#include "macro-undo-redo.hpp"
 
 #include "macro-helpers.hpp"
 #include "macro-search.hpp"
@@ -825,8 +824,6 @@ void MacroTreeModel::GroupSelectedItems(QModelIndexList &indices)
 
 	Reset(_macros);
 	assert(IsInValidState());
-
-	RegisterGroupCreateUndoRedo(name.toStdString());
 }
 
 void MacroTreeModel::UngroupSelectedGroups(QModelIndexList &indices)
@@ -840,7 +837,6 @@ void MacroTreeModel::UngroupSelectedGroups(QModelIndexList &indices)
 		std::shared_ptr<Macro> item = _macros[ModelIndexToMacroIndex(
 			indices[i].row(), _macros)];
 		if (item->IsGroup()) {
-			RegisterGroupRemoveUndoRedo(item->Name());
 			Macro::RemoveGroup(item);
 		}
 	}

lib/macro/macro-undo-redo.cpp

@@ -1,931 +0,0 @@
-#include "macro-undo-redo.hpp"
-
-#include "advanced-scene-switcher.hpp"
-#include "condition-logic.hpp"
-#include "macro-action-factory.hpp"
-#include "macro-condition-factory.hpp"
-#include "macro-edit.hpp"
-#include "macro-helpers.hpp"
-#include "macro-segment-list.hpp"
-#include "macro-settings.hpp"
-#include "macro-signals.hpp"
-#include "macro.hpp"
-#include "obs-module-helper.hpp"
-#include "plugin-state-helpers.hpp"
-#include "sync-helpers.hpp"
-
-#include <obs-frontend-api.h>
-#include <obs.hpp>
-
-#include <QString>
-
-namespace advss {
-
-using SegmentType = MacroEdit::SegmentType;
-
-// ---------------------------------------------------------------------------
-// Internal helpers
-// ---------------------------------------------------------------------------
-
-enum class SegmentOp { ADD, REMOVE };
-
-static const char *segmentTypeName(SegmentType type)
-{
-	switch (type) {
-	case SegmentType::ACTION:
-		return obs_module_text("AdvSceneSwitcher.undo.segment.action");
-	case SegmentType::ELSE_ACTION:
-		return obs_module_text(
-			"AdvSceneSwitcher.undo.segment.elseAction");
-	case SegmentType::CONDITION:
-		return obs_module_text(
-			"AdvSceneSwitcher.undo.segment.condition");
-	}
-	return "";
-}
-
-static std::string fmtUndoName(const char *key, const std::string &arg1)
-{
-	return QString(obs_module_text(key))
-		.arg(QString::fromStdString(arg1))
-		.toStdString();
-}
-
-static std::string fmtUndoName(const char *key, const char *arg1,
-			       const std::string &arg2)
-{
-	return QString(obs_module_text(key))
-		.arg(arg1)
-		.arg(QString::fromStdString(arg2))
-		.toStdString();
-}
-
-static void updateMacroEditSegment(AdvSceneSwitcher *window,
-				   const std::string &macroName, SegmentOp op,
-				   SegmentType type, int idx)
-{
-	if (!SettingsWindowIsOpened()) {
-		return;
-	}
-	auto *const macroEdit = window->ui->macroEdit;
-	const auto current = macroEdit->GetMacro();
-	if (!current || current->Name() != macroName) {
-		return;
-	}
-
-	// std::deque invalidates all element addresses on any insert or erase.
-	// Re-point every existing widget before inserting/removing one, so none
-	// hold stale pointers.
-	macroEdit->SetActionData(*current);
-	macroEdit->SetElseActionData(*current);
-	macroEdit->SetConditionData(*current);
-
-	if (op == SegmentOp::ADD) {
-		macroEdit->InsertSegmentWidget(type, idx);
-	} else {
-		macroEdit->RemoveSegmentWidget(type, idx);
-	}
-}
-
-// ---------------------------------------------------------------------------
-// Macro-level undo/redo callbacks
-// ---------------------------------------------------------------------------
-
-// Callback data format for deletion: {"name": "MacroName"}
-static void deleteMacroByName(const char *jsonData)
-{
-	OBSDataAutoRelease data = obs_data_create_from_json(jsonData);
-	if (!data) {
-		return;
-	}
-
-	const std::string name = obs_data_get_string(data, "name");
-	const auto macro = GetWeakMacroByName(name.c_str()).lock();
-	if (!macro) {
-		return;
-	}
-
-	auto *const window = AdvSceneSwitcher::window;
-	if (SettingsWindowIsOpened() && window) {
-		window->ui->macroEdit->ClearSegmentWidgetCacheFor(macro.get());
-		MacroSegmentList::SetCachingEnabled(false);
-		window->ui->macros->Remove(macro);
-		MacroSegmentList::SetCachingEnabled(true);
-	} else {
-		auto lock = LockContext();
-		auto &macros = GetTopLevelMacros();
-		const auto it = std::find(macros.begin(), macros.end(), macro);
-		if (it != macros.end()) {
-			macros.erase(it);
-		}
-	}
-
-	MacroSignalManager::Instance()->Remove(QString::fromStdString(name));
-}
-
-// Callback data format for restoration:
-// {"index": N, "parent_group": "GroupName", "macro": {...}}
-static void restoreMacroFromData(const char *jsonData)
-{
-	OBSDataAutoRelease data = obs_data_create_from_json(jsonData);
-	if (!data) {
-		return;
-	}
-
-	const int index = (int)obs_data_get_int(data, "index");
-	const std::string parentGroup =
-		obs_data_get_string(data, "parent_group");
-	OBSDataAutoRelease macroData = obs_data_get_obj(data, "macro");
-	if (!macroData) {
-		return;
-	}
-
-	auto macro = std::make_shared<Macro>();
-	std::string macroName;
-	{
-		auto lock = LockContext();
-		macro->Load(macroData);
-		macro->PostLoad();
-		RunAndClearPostLoadSteps();
-
-		if (!parentGroup.empty()) {
-			const auto parent =
-				GetWeakMacroByName(parentGroup.c_str()).lock();
-			if (parent) {
-				Macro::PrepareMoveToGroup(parent, macro);
-			}
-		}
-
-		auto &macros = GetTopLevelMacros();
-		const int insertIdx = std::min(index, (int)macros.size());
-		macros.insert(macros.begin() + insertIdx, macro);
-		macroName = macro->Name();
-	}
-
-	auto *const window = AdvSceneSwitcher::window;
-	if (SettingsWindowIsOpened() && window) {
-		window->ui->macros->Reset(
-			GetTopLevelMacros(),
-			GetGlobalMacroSettings()._highlightExecuted);
-	}
-
-	MacroSignalManager::Instance()->Add(QString::fromStdString(macroName));
-}
-
-// ---------------------------------------------------------------------------
-// Group-delete undo/redo callbacks
-// ---------------------------------------------------------------------------
-
-// Callback data format:
-// {"group_name": "...", "group_index": N, "group_data": {...},
-//  "children": [{"data": {...}}, ...]}
-static void deleteGroupWithChildrenFromData(const char *jsonData)
-{
-	OBSDataAutoRelease data = obs_data_create_from_json(jsonData);
-	if (!data) {
-		return;
-	}
-
-	const std::string groupName = obs_data_get_string(data, "group_name");
-	const auto group = GetWeakMacroByName(groupName.c_str()).lock();
-	if (!group || !group->IsGroup()) {
-		return;
-	}
-
-	const auto children = GetGroupMacroEntries(group.get());
-
-	auto *const window = AdvSceneSwitcher::window;
-	if (SettingsWindowIsOpened() && window) {
-		window->ui->macroEdit->ClearSegmentWidgetCacheFor(group.get());
-		for (const auto &child : children) {
-			window->ui->macroEdit->ClearSegmentWidgetCacheFor(
-				child.get());
-		}
-		MacroSegmentList::SetCachingEnabled(false);
-		window->ui->macros->Remove(group);
-		MacroSegmentList::SetCachingEnabled(true);
-	} else {
-		auto lock = LockContext();
-		auto &macros = GetTopLevelMacros();
-		const auto it = std::find(macros.begin(), macros.end(), group);
-		if (it != macros.end()) {
-			macros.erase(it, std::next(it, 1 + group->GroupSize()));
-		}
-	}
-
-	for (const auto &child : children) {
-		MacroSignalManager::Instance()->Remove(
-			QString::fromStdString(child->Name()));
-	}
-	MacroSignalManager::Instance()->Remove(
-		QString::fromStdString(groupName));
-}
-
-static void restoreGroupWithChildrenFromData(const char *jsonData)
-{
-	OBSDataAutoRelease data = obs_data_create_from_json(jsonData);
-	if (!data) {
-		return;
-	}
-
-	const int groupIndex = (int)obs_data_get_int(data, "group_index");
-	OBSDataAutoRelease groupData = obs_data_get_obj(data, "group_data");
-	OBSDataArrayAutoRelease childArray =
-		obs_data_get_array(data, "children");
-
-	std::string groupName;
-	bool collapsed = false;
-	if (groupData) {
-		groupName = obs_data_get_string(groupData, "name");
-		OBSDataAutoRelease gd =
-			obs_data_get_obj(groupData, "groupData");
-		if (gd) {
-			collapsed = obs_data_get_bool(gd, "collapsed");
-		}
-	}
-
-	std::vector<std::shared_ptr<Macro>> children;
-	const size_t count = obs_data_array_count(childArray);
-	for (size_t i = 0; i < count; i++) {
-		OBSDataAutoRelease entry = obs_data_array_item(childArray, i);
-		OBSDataAutoRelease childData = obs_data_get_obj(entry, "data");
-		if (!childData) {
-			continue;
-		}
-		auto child = std::make_shared<Macro>();
-		{
-			auto lock = LockContext();
-			child->Load(childData);
-			child->PostLoad();
-			RunAndClearPostLoadSteps();
-		}
-		children.push_back(child);
-	}
-
-	std::string restoredGroupName;
-	{
-		auto lock = LockContext();
-		auto group = Macro::CreateGroup(groupName, children);
-		group->SetCollapsed(collapsed);
-		restoredGroupName = group->Name();
-
-		auto &macros = GetTopLevelMacros();
-		const int insertIdx = std::min(groupIndex, (int)macros.size());
-		macros.insert(macros.begin() + insertIdx, group);
-		int offset = 1;
-		for (const auto &child : children) {
-			macros.insert(macros.begin() + insertIdx + offset,
-				      child);
-			offset++;
-		}
-	}
-
-	auto *const window = AdvSceneSwitcher::window;
-	if (SettingsWindowIsOpened() && window) {
-		window->ui->macros->Reset(
-			GetTopLevelMacros(),
-			GetGlobalMacroSettings()._highlightExecuted);
-	}
-
-	MacroSignalManager::Instance()->Add(
-		QString::fromStdString(restoredGroupName));
-	for (const auto &child : children) {
-		MacroSignalManager::Instance()->Add(
-			QString::fromStdString(child->Name()));
-	}
-}
-
-// ---------------------------------------------------------------------------
-// Group-level undo/redo callbacks
-// ---------------------------------------------------------------------------
-
-// Callback data format for both group and ungroup:
-// {"group_name": "...", "group_index": N, "children": [{"name": "..."}, ...]}
-static void removeGroupFromData(const char *jsonData)
-{
-	OBSDataAutoRelease data = obs_data_create_from_json(jsonData);
-	if (!data) {
-		return;
-	}
-
-	const std::string groupName = obs_data_get_string(data, "group_name");
-	const auto group = GetWeakMacroByName(groupName.c_str()).lock();
-	if (!group || !group->IsGroup()) {
-		return;
-	}
-
-	{
-		auto lock = LockContext();
-		Macro::RemoveGroup(group);
-	}
-
-	auto *const window = AdvSceneSwitcher::window;
-	if (SettingsWindowIsOpened() && window) {
-		window->ui->macros->Reset(
-			GetTopLevelMacros(),
-			GetGlobalMacroSettings()._highlightExecuted);
-	}
-
-	MacroSignalManager::Instance()->Remove(
-		QString::fromStdString(groupName));
-}
-
-static void restoreGroupFromData(const char *jsonData)
-{
-	OBSDataAutoRelease data = obs_data_create_from_json(jsonData);
-	if (!data) {
-		return;
-	}
-
-	const std::string groupName = obs_data_get_string(data, "group_name");
-	const int groupIndex = (int)obs_data_get_int(data, "group_index");
-	OBSDataArrayAutoRelease childArray =
-		obs_data_get_array(data, "children");
-
-	std::vector<std::shared_ptr<Macro>> children;
-	const size_t count = obs_data_array_count(childArray);
-	for (size_t i = 0; i < count; i++) {
-		OBSDataAutoRelease item = obs_data_array_item(childArray, i);
-		const std::string name = obs_data_get_string(item, "name");
-		const auto macro = GetWeakMacroByName(name.c_str()).lock();
-		if (macro) {
-			children.push_back(macro);
-		}
-	}
-
-	{
-		auto lock = LockContext();
-		auto group = Macro::CreateGroup(groupName, children);
-
-		auto &macros = GetTopLevelMacros();
-		const int insertIdx = std::min(groupIndex, (int)macros.size());
-		macros.insert(macros.begin() + insertIdx, group);
-
-		int offset = 1;
-		for (const auto &child : children) {
-			const auto it =
-				std::find(macros.begin(), macros.end(), child);
-			if (it != macros.end()) {
-				macros.erase(it);
-			}
-			macros.insert(macros.begin() + insertIdx + offset,
-				      child);
-			offset++;
-		}
-	}
-
-	auto *const window = AdvSceneSwitcher::window;
-	if (SettingsWindowIsOpened() && window) {
-		window->ui->macros->Reset(
-			GetTopLevelMacros(),
-			GetGlobalMacroSettings()._highlightExecuted);
-	}
-
-	MacroSignalManager::Instance()->Add(QString::fromStdString(groupName));
-}
-
-// ---------------------------------------------------------------------------
-// Segment-level undo/redo callbacks
-// ---------------------------------------------------------------------------
-
-// Callback data format for segment removal:
-// {"macro": "Name", "type": N, "index": N}
-static void removeSegmentFromData(const char *jsonData)
-{
-	OBSDataAutoRelease data = obs_data_create_from_json(jsonData);
-	if (!data) {
-		return;
-	}
-
-	const std::string macroName = obs_data_get_string(data, "macro");
-	const int type = (int)obs_data_get_int(data, "type");
-	const int index = (int)obs_data_get_int(data, "index");
-
-	const auto macro = GetWeakMacroByName(macroName.c_str()).lock();
-	if (!macro) {
-		return;
-	}
-
-	{
-		auto lock = LockContext();
-		switch ((SegmentType)type) {
-		case SegmentType::ACTION:
-			if (index >= 0 &&
-			    index < (int)macro->Actions().size()) {
-				macro->Actions().erase(
-					macro->Actions().begin() + index);
-				SetMacroAbortWait(true);
-				GetMacroWaitCV().notify_all();
-				macro->UpdateActionIndices();
-			}
-			break;
-		case SegmentType::ELSE_ACTION:
-			if (index >= 0 &&
-			    index < (int)macro->ElseActions().size()) {
-				macro->ElseActions().erase(
-					macro->ElseActions().begin() + index);
-				SetMacroAbortWait(true);
-				GetMacroWaitCV().notify_all();
-				macro->UpdateElseActionIndices();
-			}
-			break;
-		case SegmentType::CONDITION:
-			if (index >= 0 &&
-			    index < (int)macro->Conditions().size()) {
-				macro->Conditions().erase(
-					macro->Conditions().begin() + index);
-				macro->UpdateConditionIndices();
-				if (index == 0 &&
-				    !macro->Conditions().empty()) {
-					macro->Conditions().at(0)->SetLogicType(
-						Logic::Type::ROOT_NONE);
-				}
-			}
-			break;
-		}
-	}
-
-	if (auto *window = AdvSceneSwitcher::window) {
-		updateMacroEditSegment(window, macroName, SegmentOp::REMOVE,
-				       (SegmentType)type, index);
-	}
-}
-
-// Callback data format for segment addition:
-// {"macro": "Name", "type": N, "index": N, "id": "...", "logic": N,
-//  "segment": {...}}
-static void addSegmentFromData(const char *jsonData)
-{
-	OBSDataAutoRelease data = obs_data_create_from_json(jsonData);
-	if (!data) {
-		return;
-	}
-
-	const std::string macroName = obs_data_get_string(data, "macro");
-	const int type = (int)obs_data_get_int(data, "type");
-	const int index = (int)obs_data_get_int(data, "index");
-	const std::string id = obs_data_get_string(data, "id");
-	const int logic = (int)obs_data_get_int(data, "logic");
-	OBSDataAutoRelease segData = obs_data_get_obj(data, "segment");
-
-	const auto macro = GetWeakMacroByName(macroName.c_str()).lock();
-	if (!macro) {
-		return;
-	}
-
-	{
-		auto lock = LockContext();
-		switch ((SegmentType)type) {
-		case SegmentType::ACTION: {
-			if (index < 0 || index > (int)macro->Actions().size()) {
-				break;
-			}
-			macro->Actions().emplace(
-				macro->Actions().begin() + index,
-				MacroActionFactory::Create(id, macro.get()));
-			if (segData) {
-				macro->Actions().at(index)->Load(segData);
-			}
-			macro->Actions().at(index)->PostLoad();
-			RunAndClearPostLoadSteps();
-			macro->UpdateActionIndices();
-			break;
-		}
-		case SegmentType::ELSE_ACTION: {
-			if (index < 0 ||
-			    index > (int)macro->ElseActions().size()) {
-				break;
-			}
-			macro->ElseActions().emplace(
-				macro->ElseActions().begin() + index,
-				MacroActionFactory::Create(id, macro.get()));
-			if (segData) {
-				macro->ElseActions().at(index)->Load(segData);
-			}
-			macro->ElseActions().at(index)->PostLoad();
-			RunAndClearPostLoadSteps();
-			macro->UpdateElseActionIndices();
-			break;
-		}
-		case SegmentType::CONDITION: {
-			if (index < 0 ||
-			    index > (int)macro->Conditions().size()) {
-				break;
-			}
-			macro->Conditions().emplace(
-				macro->Conditions().begin() + index,
-				MacroConditionFactory::Create(id, macro.get()));
-			if (segData) {
-				macro->Conditions().at(index)->Load(segData);
-			}
-			macro->Conditions().at(index)->PostLoad();
-			RunAndClearPostLoadSteps();
-			macro->Conditions().at(index)->SetLogicType(
-				(Logic::Type)logic);
-			macro->UpdateConditionIndices();
-			break;
-		}
-		}
-	}
-
-	if (auto *window = AdvSceneSwitcher::window) {
-		updateMacroEditSegment(window, macroName, SegmentOp::ADD,
-				       (SegmentType)type, index);
-	}
-}
-
-// ---------------------------------------------------------------------------
-// Rename undo/redo callback
-// ---------------------------------------------------------------------------
-
-// Callback data format: {"old_name": "...", "new_name": "..."}
-// Used for both undo (new->old) and redo (old->new) by swapping order in
-// obs_frontend_add_undo_redo_action.
-static void renameMacroFromData(const char *jsonData)
-{
-	OBSDataAutoRelease data = obs_data_create_from_json(jsonData);
-	if (!data) {
-		return;
-	}
-
-	const std::string oldName = obs_data_get_string(data, "old_name");
-	const std::string newName = obs_data_get_string(data, "new_name");
-
-	const auto macro = GetWeakMacroByName(oldName.c_str()).lock();
-	if (!macro) {
-		return;
-	}
-
-	{
-		auto lock = LockContext();
-		macro->SetName(newName);
-	}
-
-	MacroSignalManager::Instance()->Rename(QString::fromStdString(oldName),
-					       QString::fromStdString(newName));
-
-	auto *const window = AdvSceneSwitcher::window;
-	if (SettingsWindowIsOpened() && window) {
-		window->ui->macros->Reset(
-			GetTopLevelMacros(),
-			GetGlobalMacroSettings()._highlightExecuted);
-	}
-}
-
-// ---------------------------------------------------------------------------
-// Public registration functions
-// ---------------------------------------------------------------------------
-
-void RegisterMacroAddUndoRedo(const std::string &macroName)
-{
-	const auto macro = GetWeakMacroByName(macroName.c_str()).lock();
-	if (!macro || macro->IsGroup()) {
-		return;
-	}
-
-	const auto &macros = GetTopLevelMacros();
-	int index = -1;
-	for (int i = 0; i < (int)macros.size(); i++) {
-		if (macros[i]->Name() == macroName) {
-			index = i;
-			break;
-		}
-	}
-	if (index < 0) {
-		return;
-	}
-
-	std::string parentGroup;
-	if (macro->Parent()) {
-		parentGroup = macro->Parent()->Name();
-	}
-
-	OBSDataAutoRelease macroData = obs_data_create();
-	macro->Save(macroData);
-
-	OBSDataAutoRelease undoData = obs_data_create();
-	obs_data_set_string(undoData, "name", macroName.c_str());
-
-	OBSDataAutoRelease redoData = obs_data_create();
-	obs_data_set_int(redoData, "index", index);
-	obs_data_set_string(redoData, "parent_group", parentGroup.c_str());
-	obs_data_set_obj(redoData, "macro", macroData);
-
-	const std::string actionName =
-		fmtUndoName("AdvSceneSwitcher.undo.addMacro", macroName);
-	obs_frontend_add_undo_redo_action(actionName.c_str(),
-					  &deleteMacroByName,
-					  &restoreMacroFromData,
-					  obs_data_get_json(undoData),
-					  obs_data_get_json(redoData), false);
-}
-
-bool RegisterMacroRemoveUndoRedo(Macro *macro)
-{
-	if (!macro || macro->IsGroup()) {
-		return false;
-	}
-
-	const std::string macroName = macro->Name();
-
-	const auto &macros = GetTopLevelMacros();
-	int index = -1;
-	for (int i = 0; i < (int)macros.size(); i++) {
-		if (macros[i].get() == macro) {
-			index = i;
-			break;
-		}
-	}
-	if (index < 0) {
-		return false;
-	}
-
-	std::string parentGroup;
-	if (macro->Parent()) {
-		parentGroup = macro->Parent()->Name();
-	}
-
-	OBSDataAutoRelease macroData = obs_data_create();
-	macro->Save(macroData);
-
-	OBSDataAutoRelease undoData = obs_data_create();
-	obs_data_set_int(undoData, "index", index);
-	obs_data_set_string(undoData, "parent_group", parentGroup.c_str());
-	obs_data_set_obj(undoData, "macro", macroData);
-
-	OBSDataAutoRelease redoData = obs_data_create();
-	obs_data_set_string(redoData, "name", macroName.c_str());
-
-	const std::string actionName =
-		fmtUndoName("AdvSceneSwitcher.undo.removeMacro", macroName);
-	obs_frontend_add_undo_redo_action(actionName.c_str(),
-					  &restoreMacroFromData,
-					  &deleteMacroByName,
-					  obs_data_get_json(undoData),
-					  obs_data_get_json(redoData), false);
-	return true;
-}
-
-void RegisterSegmentAddUndoRedo(Macro *macro, SegmentType type, int index)
-{
-	if (!macro) {
-		return;
-	}
-
-	const std::string macroName = macro->Name();
-	std::string id;
-	int logic = (int)Logic::Type::ROOT_NONE;
-	OBSDataAutoRelease segData = obs_data_create();
-
-	{
-		auto lock = LockContext();
-		switch (type) {
-		case SegmentType::ACTION:
-			if (index < (int)macro->Actions().size()) {
-				macro->Actions().at(index)->Save(segData);
-				id = macro->Actions().at(index)->GetId();
-			}
-			break;
-		case SegmentType::ELSE_ACTION:
-			if (index < (int)macro->ElseActions().size()) {
-				macro->ElseActions().at(index)->Save(segData);
-				id = macro->ElseActions().at(index)->GetId();
-			}
-			break;
-		case SegmentType::CONDITION:
-			if (index < (int)macro->Conditions().size()) {
-				macro->Conditions().at(index)->Save(segData);
-				id = macro->Conditions().at(index)->GetId();
-				logic = (int)macro->Conditions()
-						.at(index)
-						->GetLogicType();
-			}
-			break;
-		}
-	}
-
-	OBSDataAutoRelease undoData = obs_data_create();
-	obs_data_set_string(undoData, "macro", macroName.c_str());
-	obs_data_set_int(undoData, "type", (int)type);
-	obs_data_set_int(undoData, "index", index);
-
-	OBSDataAutoRelease redoData = obs_data_create();
-	obs_data_set_string(redoData, "macro", macroName.c_str());
-	obs_data_set_int(redoData, "type", (int)type);
-	obs_data_set_int(redoData, "index", index);
-	obs_data_set_string(redoData, "id", id.c_str());
-	obs_data_set_int(redoData, "logic", logic);
-	obs_data_set_obj(redoData, "segment", segData);
-
-	const std::string actionName =
-		fmtUndoName("AdvSceneSwitcher.undo.addSegment",
-			    segmentTypeName(type), macroName);
-	obs_frontend_add_undo_redo_action(actionName.c_str(),
-					  &removeSegmentFromData,
-					  &addSegmentFromData,
-					  obs_data_get_json(undoData),
-					  obs_data_get_json(redoData), false);
-}
-
-void RegisterSegmentRemoveUndoRedo(Macro *macro, SegmentType type, int index,
-				   const std::string &segmentId,
-				   obs_data_t *segmentData, int logic)
-{
-	if (!macro) {
-		return;
-	}
-
-	const std::string macroName = macro->Name();
-
-	OBSDataAutoRelease undoData = obs_data_create();
-	obs_data_set_string(undoData, "macro", macroName.c_str());
-	obs_data_set_int(undoData, "type", (int)type);
-	obs_data_set_int(undoData, "index", index);
-	obs_data_set_string(undoData, "id", segmentId.c_str());
-	obs_data_set_int(undoData, "logic", logic);
-	obs_data_set_obj(undoData, "segment", segmentData);
-
-	OBSDataAutoRelease redoData = obs_data_create();
-	obs_data_set_string(redoData, "macro", macroName.c_str());
-	obs_data_set_int(redoData, "type", (int)type);
-	obs_data_set_int(redoData, "index", index);
-
-	const std::string actionName =
-		fmtUndoName("AdvSceneSwitcher.undo.removeSegment",
-			    segmentTypeName(type), macroName);
-	obs_frontend_add_undo_redo_action(actionName.c_str(),
-					  &addSegmentFromData,
-					  &removeSegmentFromData,
-					  obs_data_get_json(undoData),
-					  obs_data_get_json(redoData), false);
-}
-
-static OBSDataArrayAutoRelease
-buildChildArray(const std::vector<std::shared_ptr<Macro>> &children)
-{
-	OBSDataArrayAutoRelease arr = obs_data_array_create();
-	for (const auto &child : children) {
-		OBSDataAutoRelease item = obs_data_create();
-		obs_data_set_string(item, "name", child->Name().c_str());
-		obs_data_array_push_back(arr, item);
-	}
-	return arr;
-}
-
-void RegisterGroupCreateUndoRedo(const std::string &groupName)
-{
-	const auto group = GetWeakMacroByName(groupName.c_str()).lock();
-	if (!group || !group->IsGroup()) {
-		return;
-	}
-
-	const auto &macros = GetTopLevelMacros();
-	int groupIndex = -1;
-	for (int i = 0; i < (int)macros.size(); i++) {
-		if (macros[i].get() == group.get()) {
-			groupIndex = i;
-			break;
-		}
-	}
-	if (groupIndex < 0) {
-		return;
-	}
-
-	const auto children = GetGroupMacroEntries(group.get());
-	OBSDataArrayAutoRelease childArray = buildChildArray(children);
-
-	OBSDataAutoRelease undoData = obs_data_create();
-	obs_data_set_string(undoData, "group_name", groupName.c_str());
-	obs_data_set_int(undoData, "group_index", groupIndex);
-	obs_data_set_array(undoData, "children", childArray);
-
-	OBSDataAutoRelease redoData = obs_data_create();
-	obs_data_set_string(redoData, "group_name", groupName.c_str());
-	obs_data_set_int(redoData, "group_index", groupIndex);
-	obs_data_set_array(redoData, "children", childArray);
-
-	const std::string actionName =
-		fmtUndoName("AdvSceneSwitcher.undo.groupMacros", groupName);
-	obs_frontend_add_undo_redo_action(actionName.c_str(),
-					  &removeGroupFromData,
-					  &restoreGroupFromData,
-					  obs_data_get_json(undoData),
-					  obs_data_get_json(redoData), false);
-}
-
-void RegisterGroupRemoveUndoRedo(const std::string &groupName)
-{
-	const auto group = GetWeakMacroByName(groupName.c_str()).lock();
-	if (!group || !group->IsGroup()) {
-		return;
-	}
-
-	const auto &macros = GetTopLevelMacros();
-	int groupIndex = -1;
-	for (int i = 0; i < (int)macros.size(); i++) {
-		if (macros[i].get() == group.get()) {
-			groupIndex = i;
-			break;
-		}
-	}
-	if (groupIndex < 0) {
-		return;
-	}
-
-	const auto children = GetGroupMacroEntries(group.get());
-	OBSDataArrayAutoRelease childArray = buildChildArray(children);
-
-	OBSDataAutoRelease undoData = obs_data_create();
-	obs_data_set_string(undoData, "group_name", groupName.c_str());
-	obs_data_set_int(undoData, "group_index", groupIndex);
-	obs_data_set_array(undoData, "children", childArray);
-
-	OBSDataAutoRelease redoData = obs_data_create();
-	obs_data_set_string(redoData, "group_name", groupName.c_str());
-	obs_data_set_int(redoData, "group_index", groupIndex);
-	obs_data_set_array(redoData, "children", childArray);
-
-	const std::string actionName =
-		fmtUndoName("AdvSceneSwitcher.undo.ungroupMacros", groupName);
-	obs_frontend_add_undo_redo_action(actionName.c_str(),
-					  &restoreGroupFromData,
-					  &removeGroupFromData,
-					  obs_data_get_json(undoData),
-					  obs_data_get_json(redoData), false);
-}
-
-void RegisterGroupDeleteUndoRedo(Macro *macro)
-{
-	if (!macro || !macro->IsGroup()) {
-		return;
-	}
-
-	const std::string groupName = macro->Name();
-
-	const auto &macros = GetTopLevelMacros();
-	int groupIndex = -1;
-	for (int i = 0; i < (int)macros.size(); i++) {
-		if (macros[i].get() == macro) {
-			groupIndex = i;
-			break;
-		}
-	}
-	if (groupIndex < 0) {
-		return;
-	}
-
-	OBSDataAutoRelease groupData = obs_data_create();
-	macro->Save(groupData);
-
-	const auto children = GetGroupMacroEntries(macro);
-	OBSDataArrayAutoRelease childArray = obs_data_array_create();
-	for (const auto &child : children) {
-		OBSDataAutoRelease childData = obs_data_create();
-		child->Save(childData);
-		OBSDataAutoRelease entry = obs_data_create();
-		obs_data_set_obj(entry, "data", childData);
-		obs_data_array_push_back(childArray, entry);
-	}
-
-	OBSDataAutoRelease undoData = obs_data_create();
-	obs_data_set_string(undoData, "group_name", groupName.c_str());
-	obs_data_set_int(undoData, "group_index", groupIndex);
-	obs_data_set_obj(undoData, "group_data", groupData);
-	obs_data_set_array(undoData, "children", childArray);
-
-	OBSDataAutoRelease redoData = obs_data_create();
-	obs_data_set_string(redoData, "group_name", groupName.c_str());
-	obs_data_set_int(redoData, "group_index", groupIndex);
-	obs_data_set_obj(redoData, "group_data", groupData);
-	obs_data_set_array(redoData, "children", childArray);
-
-	const std::string actionName = fmtUndoName(
-		"AdvSceneSwitcher.undo.removeMacroGroup", groupName);
-	obs_frontend_add_undo_redo_action(actionName.c_str(),
-					  &restoreGroupWithChildrenFromData,
-					  &deleteGroupWithChildrenFromData,
-					  obs_data_get_json(undoData),
-					  obs_data_get_json(redoData), false);
-}
-
-void RegisterMacroRenameUndoRedo(const std::string &oldName,
-				 const std::string &newName)
-{
-	OBSDataAutoRelease undoData = obs_data_create();
-	obs_data_set_string(undoData, "old_name", newName.c_str());
-	obs_data_set_string(undoData, "new_name", oldName.c_str());
-
-	OBSDataAutoRelease redoData = obs_data_create();
-	obs_data_set_string(redoData, "old_name", oldName.c_str());
-	obs_data_set_string(redoData, "new_name", newName.c_str());
-
-	const std::string actionName =
-		fmtUndoName("AdvSceneSwitcher.undo.renameMacro", oldName);
-	obs_frontend_add_undo_redo_action(actionName.c_str(),
-					  &renameMacroFromData,
-					  &renameMacroFromData,
-					  obs_data_get_json(undoData),
-					  obs_data_get_json(redoData), false);
-}
-
-} // namespace advss

lib/macro/macro-undo-redo.hpp

@@ -1,24 +0,0 @@
-#pragma once
-#include "macro-edit.hpp"
-
-#include <obs-data.h>
-#include <string>
-
-namespace advss {
-
-class Macro;
-
-void RegisterMacroAddUndoRedo(const std::string &macroName);
-bool RegisterMacroRemoveUndoRedo(Macro *macro);
-void RegisterSegmentAddUndoRedo(Macro *macro, MacroEdit::SegmentType type,
-				int index);
-void RegisterSegmentRemoveUndoRedo(Macro *macro, MacroEdit::SegmentType type,
-				   int index, const std::string &segmentId,
-				   obs_data_t *segmentData, int logic);
-void RegisterMacroRenameUndoRedo(const std::string &oldName,
-				 const std::string &newName);
-void RegisterGroupCreateUndoRedo(const std::string &groupName);
-void RegisterGroupRemoveUndoRedo(const std::string &groupName);
-void RegisterGroupDeleteUndoRedo(Macro *macro);
-
-} // namespace advss

plugins/base/macro-condition-audio.cpp

@@ -25,6 +25,8 @@ const static std::map<MacroConditionAudio::Type, std::string> checkTypes = {
 	 "AdvSceneSwitcher.condition.audio.type.monitor"},
 	{MacroConditionAudio::Type::BALANCE,
 	 "AdvSceneSwitcher.condition.audio.type.balance"},
+	{MacroConditionAudio::Type::TRACK,
+	 "AdvSceneSwitcher.condition.audio.type.track"},
 };
 
 const static std::map<MacroConditionAudio::OutputCondition, std::string>
@@ -245,6 +247,20 @@ bool MacroConditionAudio::CheckBalance()
 	return ret && source;
 }
 
+bool MacroConditionAudio::CheckTrack()
+{
+	if (!_audioSource.GetSource()) {
+		return false;
+	}
+
+	OBSSourceAutoRelease source =
+		obs_weak_source_get_source(_audioSource.GetSource());
+	uint32_t mixers = obs_source_get_audio_mixers(source);
+	bool enabled = (mixers >> (uint32_t)(_track - 1)) & 1u;
+	SetTempVarValue("track_enabled", enabled ? "true" : "false");
+	return enabled && source;
+}
+
 bool MacroConditionAudio::CheckCondition()
 {
 	bool ret = false;
@@ -264,6 +280,9 @@ bool MacroConditionAudio::CheckCondition()
 	case Type::BALANCE:
 		ret = CheckBalance();
 		break;
+	case Type::TRACK:
+		ret = CheckTrack();
+		break;
 	}
 
 	if (GetVariableValue().empty()) {
@@ -281,6 +300,7 @@ bool MacroConditionAudio::Save(obs_data_t *obj) const
 	_volumePercent.Save(obj, "volume");
 	_syncOffset.Save(obj, "syncOffset");
 	_balance.Save(obj, "balance");
+	_track.Save(obj, "track");
 	obs_data_set_int(obj, "checkType", static_cast<int>(_checkType));
 	obs_data_set_int(obj, "outputCondition",
 			 static_cast<int>(_outputCondition));
@@ -346,6 +366,7 @@ bool MacroConditionAudio::Load(obs_data_t *obj)
 		_useDb = obs_data_get_bool(obj, "useDb");
 		_volumeDB.Load(obj, "volumeDB");
 	}
+	_track.Load(obj, "track");
 	return true;
 }
 
@@ -421,6 +442,12 @@ void MacroConditionAudio::SetupTempVars()
 			   obs_module_text(
 				   "AdvSceneSwitcher.tempVar.audio.balance"));
 		break;
+	case Type::TRACK:
+		AddTempvar(
+			"track_enabled",
+			obs_module_text(
+				"AdvSceneSwitcher.tempVar.audio.trackEnabled"));
+		break;
 	default:
 		break;
 	}
@@ -468,6 +495,7 @@ static QStringList getAudioSourcesList()
 MacroConditionAudioEdit::MacroConditionAudioEdit(
 	QWidget *parent, std::shared_ptr<MacroConditionAudio> entryData)
 	: QWidget(parent),
+	  _layout(new QHBoxLayout),
 	  _checkTypes(new QComboBox()),
 	  _sources(new SourceSelectionWidget(this, getAudioSourcesList, true)),
 	  _condition(new QComboBox()),
@@ -476,7 +504,8 @@ MacroConditionAudioEdit::MacroConditionAudioEdit(
 	  _percentDBToggle(new QPushButton),
 	  _syncOffset(new VariableSpinBox()),
 	  _monitorTypes(new QComboBox),
-	  _balance(new SliderSpinBox(0., 1., ""))
+	  _balance(new SliderSpinBox(0., 1., "")),
+	  _track(new VariableSpinBox())
 {
 	_volumePercent->setSuffix("%");
 	_volumePercent->setMaximum(100);
@@ -491,6 +520,9 @@ MacroConditionAudioEdit::MacroConditionAudioEdit(
 	_syncOffset->setMaximum(20000);
 	_syncOffset->setSuffix("ms");
 
+	_track->setMinimum(1);
+	_track->setMaximum(32);
+
 	QWidget::connect(_checkTypes, SIGNAL(currentIndexChanged(int)), this,
 			 SLOT(CheckTypeChanged(int)));
 	QWidget::connect(
@@ -519,27 +551,16 @@ MacroConditionAudioEdit::MacroConditionAudioEdit(
 		this, SLOT(VolumeDBChanged(const NumberVariable<double> &)));
 	QWidget::connect(_percentDBToggle, SIGNAL(clicked()), this,
 			 SLOT(PercentDBClicked()));
+	QWidget::connect(
+		_track,
+		SIGNAL(NumberVariableChanged(const NumberVariable<int> &)),
+		this, SLOT(TrackChanged(const NumberVariable<int> &)));
 
 	populateCheckTypes(_checkTypes);
 	PopulateMonitorTypeSelection(_monitorTypes);
 
-	QHBoxLayout *switchLayout = new QHBoxLayout;
-	std::unordered_map<std::string, QWidget *> widgetPlaceholders = {
-		{"{{checkType}}", _checkTypes},
-		{"{{audioSources}}", _sources},
-		{"{{volume}}", _volumePercent},
-		{"{{syncOffset}}", _syncOffset},
-		{"{{monitorTypes}}", _monitorTypes},
-		{"{{balance}}", _balance},
-		{"{{condition}}", _condition},
-		{"{{volumeDB}}", _volumeDB},
-		{"{{percentDBToggle}}", _percentDBToggle},
-	};
-	PlaceWidgets(obs_module_text("AdvSceneSwitcher.condition.audio.entry"),
-		     switchLayout, widgetPlaceholders);
-
 	QVBoxLayout *mainLayout = new QVBoxLayout;
-	mainLayout->addLayout(switchLayout);
+	mainLayout->addLayout(_layout);
 	mainLayout->addWidget(_balance);
 	setLayout(mainLayout);
 
@@ -608,6 +629,12 @@ void MacroConditionAudioEdit::BalanceChanged(const NumberVariable<double> &value
 	_entryData->_balance = value;
 }
 
+void MacroConditionAudioEdit::TrackChanged(const NumberVariable<int> &value)
+{
+	GUARD_LOADING_AND_LOCK();
+	_entryData->_track = value;
+}
+
 void MacroConditionAudioEdit::VolumeDBChanged(
 	const NumberVariable<double> &value)
 {
@@ -692,6 +719,8 @@ void MacroConditionAudioEdit::CheckTypeChanged(int idx)
 	} else if (_entryData->GetType() ==
 		   MacroConditionAudio::Type::CONFIGURED_VOLUME) {
 		populateVolumeConditionSelection(_condition);
+	} else if (_entryData->GetType() == MacroConditionAudio::Type::TRACK) {
+		_condition->clear();
 	}
 	SetWidgetVisibility();
 }
@@ -708,6 +737,7 @@ void MacroConditionAudioEdit::UpdateEntryData()
 	_syncOffset->SetValue(_entryData->_syncOffset);
 	_monitorTypes->setCurrentIndex(_entryData->_monitorType);
 	_balance->SetDoubleValue(_entryData->_balance);
+	_track->SetValue(_entryData->_track);
 	_checkTypes->setCurrentIndex(
 		_checkTypes->findData(static_cast<int>(_entryData->GetType())));
 
@@ -748,26 +778,63 @@ void MacroConditionAudioEdit::SetWidgetVisibility()
 		return;
 	}
 
+	_layout->removeWidget(_checkTypes);
+	_layout->removeWidget(_sources);
+	_layout->removeWidget(_condition);
+	_layout->removeWidget(_volumePercent);
+	_layout->removeWidget(_volumeDB);
+	_layout->removeWidget(_percentDBToggle);
+	_layout->removeWidget(_syncOffset);
+	_layout->removeWidget(_monitorTypes);
+	_layout->removeWidget(_track);
+	ClearLayout(_layout);
+
+	const std::unordered_map<std::string, QWidget *> placeholders = {
+		{"{{checkType}}", _checkTypes},
+		{"{{audioSources}}", _sources},
+		{"{{condition}}", _condition},
+		{"{{volume}}", _volumePercent},
+		{"{{volumeDB}}", _volumeDB},
+		{"{{percentDBToggle}}", _percentDBToggle},
+		{"{{syncOffset}}", _syncOffset},
+		{"{{monitorTypes}}", _monitorTypes},
+		{"{{track}}", _track},
+	};
+
+	const bool isTrack = _entryData->GetType() ==
+			     MacroConditionAudio::Type::TRACK;
+	PlaceWidgets(
+		obs_module_text(
+			isTrack ? "AdvSceneSwitcher.condition.audio.layout.track"
+				: "AdvSceneSwitcher.condition.audio.entry"),
+		_layout, placeholders);
+
 	_condition->setVisible(
-		_entryData->GetType() ==
-			MacroConditionAudio::Type::OUTPUT_VOLUME ||
-		_entryData->GetType() ==
-			MacroConditionAudio::Type::CONFIGURED_VOLUME ||
-		_entryData->GetType() == MacroConditionAudio::Type::BALANCE ||
-		_entryData->GetType() ==
-			MacroConditionAudio::Type::SYNC_OFFSET);
-	_syncOffset->setVisible(_entryData->GetType() ==
-				MacroConditionAudio::Type::SYNC_OFFSET);
-	_monitorTypes->setVisible(_entryData->GetType() ==
-				  MacroConditionAudio::Type::MONITOR);
+		!isTrack &&
+		(_entryData->GetType() ==
+			 MacroConditionAudio::Type::OUTPUT_VOLUME ||
+		 _entryData->GetType() ==
+			 MacroConditionAudio::Type::CONFIGURED_VOLUME ||
+		 _entryData->GetType() == MacroConditionAudio::Type::BALANCE ||
+		 _entryData->GetType() ==
+			 MacroConditionAudio::Type::SYNC_OFFSET));
+	_syncOffset->setVisible(!isTrack &&
+				_entryData->GetType() ==
+					MacroConditionAudio::Type::SYNC_OFFSET);
+	_monitorTypes->setVisible(!isTrack &&
+				  _entryData->GetType() ==
+					  MacroConditionAudio::Type::MONITOR);
+	_track->setVisible(isTrack);
+	_volumePercent->setVisible(!isTrack && HasVolumeControl() &&
+				   !_entryData->_useDb);
+	_volumeDB->setVisible(!isTrack && HasVolumeControl() &&
+			      _entryData->_useDb);
+	_percentDBToggle->setText(_entryData->_useDb ? "dB" : "%");
+	_percentDBToggle->setVisible(!isTrack && HasVolumeControl());
 	_balance->setVisible(_entryData->GetType() ==
 			     MacroConditionAudio::Type::BALANCE);
 	_volMeter->setVisible(_entryData->GetType() ==
 			      MacroConditionAudio::Type::OUTPUT_VOLUME);
-	_volumePercent->setVisible(HasVolumeControl() && !_entryData->_useDb);
-	_volumeDB->setVisible(HasVolumeControl() && _entryData->_useDb);
-	_percentDBToggle->setText(_entryData->_useDb ? "dB" : "%");
-	_percentDBToggle->setVisible(HasVolumeControl());
 	adjustSize();
 }
 

plugins/base/macro-condition-audio.hpp

@@ -5,6 +5,7 @@
 #include "source-selection.hpp"
 
 #include <limits>
+#include <QHBoxLayout>
 #include <QWidget>
 #include <QComboBox>
 #include <chrono>
@@ -36,6 +37,7 @@ public:
 		SYNC_OFFSET,
 		MONITOR,
 		BALANCE,
+		TRACK,
 	};
 	void SetType(const Type &);
 	Type GetType() const { return _checkType; }
@@ -60,6 +62,7 @@ public:
 	IntVariable _syncOffset = 0;
 	obs_monitoring_type _monitorType = OBS_MONITORING_TYPE_NONE;
 	DoubleVariable _balance = 0.5;
+	IntVariable _track = 1;
 	OutputCondition _outputCondition = OutputCondition::ABOVE;
 	VolumeCondition _volumeCondition = VolumeCondition::ABOVE;
 	obs_volmeter_t *_volmeter = nullptr;
@@ -70,6 +73,7 @@ private:
 	bool CheckSyncOffset();
 	bool CheckMonitor();
 	bool CheckBalance();
+	bool CheckTrack();
 	void SetupTempVars();
 	float GetVolumePeak();
 
@@ -111,6 +115,7 @@ private slots:
 	void VolumeDBChanged(const NumberVariable<double> &value);
 	void PercentDBClicked();
 	void SyncSliderAndValueSelection(bool sliderMoved);
+	void TrackChanged(const NumberVariable<int> &value);
 
 signals:
 	void HeaderInfoChanged(const QString &);
@@ -119,6 +124,7 @@ private:
 	void SetWidgetVisibility();
 	bool HasVolumeControl() const;
 
+	QHBoxLayout *_layout;
 	QComboBox *_checkTypes;
 	SourceSelectionWidget *_sources;
 	QComboBox *_condition;
@@ -128,6 +134,7 @@ private:
 	VariableSpinBox *_syncOffset;
 	QComboBox *_monitorTypes;
 	SliderSpinBox *_balance;
+	VariableSpinBox *_track;
 	VolControl *_volMeter = nullptr;
 
 	std::shared_ptr<MacroConditionAudio> _entryData;

tests/stubs/macro-edit.cpp

@@ -110,9 +110,7 @@ void MacroEdit::HighlightControls() const {}
 void MacroEdit::PopulateMacroActions(Macro &, uint32_t) {}
 void MacroEdit::PopulateMacroElseActions(Macro &, uint32_t) {}
 void MacroEdit::PopulateMacroConditions(Macro &, uint32_t) {}
-void MacroEdit::InsertSegmentWidget(SegmentType, int) {}
-void MacroEdit::RemoveSegmentWidget(SegmentType, int) {}
-void MacroEdit::SetupMacroSegmentSelection(SegmentType, int) {}
+void MacroEdit::SetupMacroSegmentSelection(MacroSection, int) {}
 void MacroEdit::SetupContextMenu(const QPoint &,
 				 const std::function<void(MacroEdit *, int)> &,
 				 const std::function<void(MacroEdit *)> &,