Fix crash when changing scene collection on MacOS

data/locale/en-US.ini

@@ -342,9 +342,7 @@ 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"
@@ -2366,7 +2364,6 @@ 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."

plugins/base/macro-action-scene-collection.cpp

@@ -1,7 +1,9 @@
 #include "macro-action-scene-collection.hpp"
+
 #include "layout-helpers.hpp"
 #include "plugin-state-helpers.hpp"
 #include "selection-helpers.hpp"
+#include "ui-helpers.hpp"
 
 #include <obs-frontend-api.h>
 
@@ -15,6 +17,20 @@ bool MacroActionSceneCollection::_registered = MacroActionFactory::Register(
 	 MacroActionSceneCollectionEdit::Create,
 	 "AdvSceneSwitcher.action.sceneCollection"});
 
+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 MacroActionSceneCollection::PerformAction()
 {
 	// Changing the scene collection will also reload the settings of the
@@ -23,7 +39,13 @@ bool MacroActionSceneCollection::PerformAction()
 	if (SettingsWindowIsOpened()) {
 		return false;
 	}
-	obs_frontend_set_current_scene_collection(_sceneCollection.c_str());
+
+	const auto collectionName = _sceneCollection;
+	QueueUITaskLambda([collectionName]() {
+		obs_frontend_set_current_scene_collection(
+			collectionName.c_str());
+	});
+
 	// It does not make sense to continue as the current settings will be
 	// invalid after switching scene collection.
 	return false;

plugins/base/macro-condition-audio.cpp

@@ -25,8 +25,6 @@ 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>
@@ -247,20 +245,6 @@ 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;
@@ -280,9 +264,6 @@ bool MacroConditionAudio::CheckCondition()
 	case Type::BALANCE:
 		ret = CheckBalance();
 		break;
-	case Type::TRACK:
-		ret = CheckTrack();
-		break;
 	}
 
 	if (GetVariableValue().empty()) {
@@ -300,7 +281,6 @@ 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));
@@ -366,7 +346,6 @@ bool MacroConditionAudio::Load(obs_data_t *obj)
 		_useDb = obs_data_get_bool(obj, "useDb");
 		_volumeDB.Load(obj, "volumeDB");
 	}
-	_track.Load(obj, "track");
 	return true;
 }
 
@@ -442,12 +421,6 @@ 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;
 	}
@@ -495,7 +468,6 @@ 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()),
@@ -504,8 +476,7 @@ MacroConditionAudioEdit::MacroConditionAudioEdit(
 	  _percentDBToggle(new QPushButton),
 	  _syncOffset(new VariableSpinBox()),
 	  _monitorTypes(new QComboBox),
-	  _balance(new SliderSpinBox(0., 1., "")),
-	  _track(new VariableSpinBox())
+	  _balance(new SliderSpinBox(0., 1., ""))
 {
 	_volumePercent->setSuffix("%");
 	_volumePercent->setMaximum(100);
@@ -520,9 +491,6 @@ 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(
@@ -551,16 +519,27 @@ 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(_layout);
+	mainLayout->addLayout(switchLayout);
 	mainLayout->addWidget(_balance);
 	setLayout(mainLayout);
 
@@ -629,12 +608,6 @@ 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)
 {
@@ -719,8 +692,6 @@ 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();
 }
@@ -737,7 +708,6 @@ 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())));
 
@@ -778,63 +748,26 @@ 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(
-		!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());
+		_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);
 	_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,7 +5,6 @@
 #include "source-selection.hpp"
 
 #include <limits>
-#include <QHBoxLayout>
 #include <QWidget>
 #include <QComboBox>
 #include <chrono>
@@ -37,7 +36,6 @@ public:
 		SYNC_OFFSET,
 		MONITOR,
 		BALANCE,
-		TRACK,
 	};
 	void SetType(const Type &);
 	Type GetType() const { return _checkType; }
@@ -62,7 +60,6 @@ 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;
@@ -73,7 +70,6 @@ private:
 	bool CheckSyncOffset();
 	bool CheckMonitor();
 	bool CheckBalance();
-	bool CheckTrack();
 	void SetupTempVars();
 	float GetVolumePeak();
 
@@ -115,7 +111,6 @@ 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 &);
@@ -124,7 +119,6 @@ private:
 	void SetWidgetVisibility();
 	bool HasVolumeControl() const;
 
-	QHBoxLayout *_layout;
 	QComboBox *_checkTypes;
 	SourceSelectionWidget *_sources;
 	QComboBox *_condition;
@@ -134,7 +128,6 @@ private:
 	VariableSpinBox *_syncOffset;
 	QComboBox *_monitorTypes;
 	SliderSpinBox *_balance;
-	VariableSpinBox *_track;
 	VolControl *_volMeter = nullptr;
 
 	std::shared_ptr<MacroConditionAudio> _entryData;