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

2026-08-29 20:55:28 -05:00 · 2026-08-29 23:10:52 +02:00
7 changed files with 110 additions and 491 deletions
--- a/data/locale/en-US.ini
+++ b/data/locale/en-US.ini
@@ -342,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"
@@ -904,19 +906,9 @@ AdvSceneSwitcher.condition.streamDeck.stopListen="Stop listening"
 AdvSceneSwitcher.condition.streamDeck.pluginDownload="<html><head/><body><p>The Stream Deck plugin can be found <a href=\"https://github.com/WarmUpTill/advanced-scene-switcher-streamdeck-plugin/releases\"><span style=\" text-decoration: underline; color:#268bd2;\">here on GitHub</span></a>.</p></body></html>"
 AdvSceneSwitcher.condition.gameCapture="Game capture"
 AdvSceneSwitcher.condition.gameCapture.entry="{{sources}}hooked a game."
+
 AdvSceneSwitcher.condition.screenshot="Screenshot"
 AdvSceneSwitcher.condition.screenshot.entry="A screenshot was taken"
-AdvSceneSwitcher.condition.nowPlaying="Now Playing"
-AdvSceneSwitcher.condition.nowPlaying.checkType.playbackState="Playback state"
-AdvSceneSwitcher.condition.nowPlaying.checkType.title="Title"
-AdvSceneSwitcher.condition.nowPlaying.checkType.artist="Artist"
-AdvSceneSwitcher.condition.nowPlaying.checkType.album="Album"
-AdvSceneSwitcher.condition.nowPlaying.checkType.appName="App name"
-AdvSceneSwitcher.condition.nowPlaying.playbackState.playing="Playing"
-AdvSceneSwitcher.condition.nowPlaying.playbackState.paused="Paused"
-AdvSceneSwitcher.condition.nowPlaying.playbackState.stopped="Stopped"
-AdvSceneSwitcher.condition.nowPlaying.playbackState.opening="Opening"
-AdvSceneSwitcher.condition.nowPlaying.playbackState.changing="Changing"
 AdvSceneSwitcher.condition.mqtt="MQTT"
 AdvSceneSwitcher.condition.mqtt.layout.match="Message was received from{{connection}} which matches{{regex}}:"
 AdvSceneSwitcher.condition.mqtt.layout.listen="Set message selection to incoming message:{{listenButton}}"
@@ -2374,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."
@@ -2609,12 +2602,6 @@ AdvSceneSwitcher.tempVar.gameCapture.class.description="Window class of the appl
 AdvSceneSwitcher.tempVar.gameCapture.executable="Executable"
 AdvSceneSwitcher.tempVar.gameCapture.executable.description="Executable name of the application captured by the source."

-AdvSceneSwitcher.tempVar.nowPlaying.title="Title"
-AdvSceneSwitcher.tempVar.nowPlaying.artist="Artist"
-AdvSceneSwitcher.tempVar.nowPlaying.album="Album"
-AdvSceneSwitcher.tempVar.nowPlaying.appName="App name"
-AdvSceneSwitcher.tempVar.nowPlaying.playbackStatus="Playback status"
-
 AdvSceneSwitcher.tempVar.http.status="Status code"
 AdvSceneSwitcher.tempVar.http.error="Error"
 AdvSceneSwitcher.tempVar.http.error.description="Empty when no error occurred.\nOther possible values:\n\n * Could not establish connection\n * Failed to bind IP address\n * Failed to read connection\n * Failed to write connection\n * Maximum redirect count exceeded\n * Connection handling canceled\n * SSL connection failed\n * SSL certificate loading failed\n * SSL server verification failed\n * Unsupported HTTP multipart boundary characters\n * Compression failed\n * Connection timed out\n * Proxy connection failed\n * Unknown"
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -42,7 +42,6 @@ add_plugin(twitch)
 add_plugin(usb)
 add_plugin(video)
 add_plugin(speech)
-add_plugin(now-playing)

 # ---------------------------------------------------------------------------- #

--- a/plugins/base/macro-condition-audio.cpp
+++ b/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();
 }

--- a/plugins/base/macro-condition-audio.hpp
+++ b/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;
--- a/plugins/now-playing/CMakeLists.txt
+++ b/plugins/now-playing/CMakeLists.txt
@@ -1,17 +0,0 @@
-cmake_minimum_required(VERSION 3.14)
-project(advanced-scene-switcher-now-playing)
-
-if(NOT WIN32)
-  message(WARNING "Now playing condition is only supported on Windows.")
-  return()
-endif()
-
-add_library(${PROJECT_NAME} MODULE)
-target_sources(${PROJECT_NAME} PRIVATE macro-condition-now-playing.cpp
-                                       macro-condition-now-playing.hpp)
-
-target_link_libraries(${PROJECT_NAME} PRIVATE windowsapp)
-
-setup_advss_plugin(${PROJECT_NAME})
-set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
-install_advss_plugin(${PROJECT_NAME})
--- a/plugins/now-playing/macro-condition-now-playing.cpp
+++ b/plugins/now-playing/macro-condition-now-playing.cpp
@@ -1,338 +0,0 @@
-#include "macro-condition-now-playing.hpp"
-#include "layout-helpers.hpp"
-#include "sync-helpers.hpp"
-
-#include <util/base.h>
-
-#include <roapi.h>
-#include <winrt/Windows.Foundation.h>
-#include <winrt/Windows.Media.Control.h>
-
-namespace advss {
-
-using namespace winrt::Windows::Media::Control;
-
-const std::string MacroConditionNowPlaying::id = "now_playing";
-
-bool MacroConditionNowPlaying::_registered = MacroConditionFactory::Register(
-	MacroConditionNowPlaying::id,
-	{MacroConditionNowPlaying::Create, MacroConditionNowPlayingEdit::Create,
-	 "AdvSceneSwitcher.condition.nowPlaying"});
-
-// ---------------------------------------------------------------------------
-
-struct SessionInfo {
-	bool hasSession = false;
-	std::string title;
-	std::string artist;
-	std::string album;
-	std::string appName;
-	GlobalSystemMediaTransportControlsSessionPlaybackStatus playbackStatus =
-		GlobalSystemMediaTransportControlsSessionPlaybackStatus::Closed;
-};
-
-static bool initWinRT()
-{
-	HRESULT hr = RoInitialize(RO_INIT_MULTITHREADED);
-	// S_OK: initialized, S_FALSE: already initialized with same type,
-	// RPC_E_CHANGED_MODE: thread is STA (OBS UI thread) - WinRT still usable
-	return SUCCEEDED(hr) || hr == RPC_E_CHANGED_MODE;
-}
-
-static SessionInfo getCurrentSessionInfo()
-{
-	thread_local bool initialized = initWinRT();
-	(void)initialized;
-
-	SessionInfo info;
-
-	try {
-		auto manager =
-			GlobalSystemMediaTransportControlsSessionManager::
-				RequestAsync()
-					.get();
-		auto session = manager.GetCurrentSession();
-		if (!session) {
-			return info;
-		}
-
-		info.hasSession = true;
-		info.appName = winrt::to_string(session.SourceAppUserModelId());
-
-		auto playbackInfo = session.GetPlaybackInfo();
-		info.playbackStatus = playbackInfo.PlaybackStatus();
-
-		auto props = session.TryGetMediaPropertiesAsync().get();
-		if (props) {
-			info.title = winrt::to_string(props.Title());
-			info.artist = winrt::to_string(props.Artist());
-			info.album = winrt::to_string(props.AlbumTitle());
-		}
-	} catch (const winrt::hresult_error &e) {
-		blog(LOG_WARNING, "now playing: WinRT error 0x%08X",
-		     static_cast<uint32_t>(e.code()));
-	}
-
-	return info;
-}
-
-static std::string PlaybackStatusToString(
-	GlobalSystemMediaTransportControlsSessionPlaybackStatus status)
-{
-	switch (status) {
-	case GlobalSystemMediaTransportControlsSessionPlaybackStatus::Playing:
-		return "Playing";
-	case GlobalSystemMediaTransportControlsSessionPlaybackStatus::Paused:
-		return "Paused";
-	case GlobalSystemMediaTransportControlsSessionPlaybackStatus::Stopped:
-		return "Stopped";
-	case GlobalSystemMediaTransportControlsSessionPlaybackStatus::Opened:
-		return "Opening";
-	case GlobalSystemMediaTransportControlsSessionPlaybackStatus::Changing:
-		return "Changing";
-	default:
-		return "Closed";
-	}
-}
-
-// ---------------------------------------------------------------------------
-
-bool MacroConditionNowPlaying::CheckCondition()
-{
-	const auto info = getCurrentSessionInfo();
-
-	SetTempVarValue("title", info.title);
-	SetTempVarValue("artist", info.artist);
-	SetTempVarValue("album", info.album);
-	SetTempVarValue("appName", info.appName);
-	SetTempVarValue("playbackStatus",
-			PlaybackStatusToString(info.playbackStatus));
-
-	if (!info.hasSession) {
-		return false;
-	}
-
-	auto textMatches = [this](const std::string &field) -> bool {
-		const QString pattern = QString::fromStdString(_matchText);
-		const QString value = QString::fromStdString(field);
-		if (_regex.Enabled()) {
-			return _regex.Matches(value, pattern);
-		}
-		return value == pattern;
-	};
-
-	switch (_checkType) {
-	case CheckType::PLAYBACK_STATE: {
-		using S =
-			GlobalSystemMediaTransportControlsSessionPlaybackStatus;
-		switch (_playbackState) {
-		case PlaybackState::PLAYING:
-			return info.playbackStatus == S::Playing;
-		case PlaybackState::PAUSED:
-			return info.playbackStatus == S::Paused;
-		case PlaybackState::STOPPED:
-			return info.playbackStatus == S::Stopped;
-		case PlaybackState::OPENING:
-			return info.playbackStatus == S::Opened;
-		case PlaybackState::CHANGING:
-			return info.playbackStatus == S::Changing;
-		}
-		break;
-	}
-	case CheckType::TITLE:
-		return textMatches(info.title);
-	case CheckType::ARTIST:
-		return textMatches(info.artist);
-	case CheckType::ALBUM:
-		return textMatches(info.album);
-	case CheckType::APP_NAME:
-		return textMatches(info.appName);
-	}
-
-	return false;
-}
-
-bool MacroConditionNowPlaying::Save(obs_data_t *obj) const
-{
-	MacroCondition::Save(obj);
-	obs_data_set_int(obj, "checkType", static_cast<int>(_checkType));
-	obs_data_set_int(obj, "playbackState",
-			 static_cast<int>(_playbackState));
-	_matchText.Save(obj, "matchText");
-	_regex.Save(obj);
-	return true;
-}
-
-bool MacroConditionNowPlaying::Load(obs_data_t *obj)
-{
-	MacroCondition::Load(obj);
-	_checkType = static_cast<CheckType>(obs_data_get_int(obj, "checkType"));
-	_playbackState = static_cast<PlaybackState>(
-		obs_data_get_int(obj, "playbackState"));
-	_matchText.Load(obj, "matchText");
-	_regex.Load(obj);
-	return true;
-}
-
-void MacroConditionNowPlaying::SetupTempVars()
-{
-	AddTempvar(
-		"title",
-		obs_module_text("AdvSceneSwitcher.tempVar.nowPlaying.title"));
-	AddTempvar(
-		"artist",
-		obs_module_text("AdvSceneSwitcher.tempVar.nowPlaying.artist"));
-	AddTempvar(
-		"album",
-		obs_module_text("AdvSceneSwitcher.tempVar.nowPlaying.album"));
-	AddTempvar(
-		"appName",
-		obs_module_text("AdvSceneSwitcher.tempVar.nowPlaying.appName"));
-	AddTempvar(
-		"playbackStatus",
-		obs_module_text(
-			"AdvSceneSwitcher.tempVar.nowPlaying.playbackStatus"));
-}
-
-// ---------------------------------------------------------------------------
-
-static void populateCheckTypeSelection(QComboBox *list)
-{
-	static const std::map<MacroConditionNowPlaying::CheckType, std::string> checkTypes = {
-		{MacroConditionNowPlaying::CheckType::PLAYBACK_STATE,
-		 "AdvSceneSwitcher.condition.nowPlaying.checkType.playbackState"},
-		{MacroConditionNowPlaying::CheckType::TITLE,
-		 "AdvSceneSwitcher.condition.nowPlaying.checkType.title"},
-		{MacroConditionNowPlaying::CheckType::ARTIST,
-		 "AdvSceneSwitcher.condition.nowPlaying.checkType.artist"},
-		{MacroConditionNowPlaying::CheckType::ALBUM,
-		 "AdvSceneSwitcher.condition.nowPlaying.checkType.album"},
-		{MacroConditionNowPlaying::CheckType::APP_NAME,
-		 "AdvSceneSwitcher.condition.nowPlaying.checkType.appName"},
-	};
-
-	for (const auto &[type, name] : checkTypes) {
-		list->addItem(obs_module_text(name.c_str()),
-			      static_cast<int>(type));
-	}
-}
-
-static void populatePlaybackStateSelection(QComboBox *list)
-{
-	static const std::map<MacroConditionNowPlaying::PlaybackState, std::string> playbackStates = {
-		{MacroConditionNowPlaying::PlaybackState::PLAYING,
-		 "AdvSceneSwitcher.condition.nowPlaying.playbackState.playing"},
-		{MacroConditionNowPlaying::PlaybackState::PAUSED,
-		 "AdvSceneSwitcher.condition.nowPlaying.playbackState.paused"},
-		{MacroConditionNowPlaying::PlaybackState::STOPPED,
-		 "AdvSceneSwitcher.condition.nowPlaying.playbackState.stopped"},
-		{MacroConditionNowPlaying::PlaybackState::OPENING,
-		 "AdvSceneSwitcher.condition.nowPlaying.playbackState.opening"},
-		{MacroConditionNowPlaying::PlaybackState::CHANGING,
-		 "AdvSceneSwitcher.condition.nowPlaying.playbackState.changing"},
-	};
-
-	for (const auto &[state, name] : playbackStates) {
-		list->addItem(obs_module_text(name.c_str()),
-			      static_cast<int>(state));
-	}
-}
-
-MacroConditionNowPlayingEdit::MacroConditionNowPlayingEdit(
-	QWidget *parent, std::shared_ptr<MacroConditionNowPlaying> entryData)
-	: QWidget(parent),
-	  _checkType(new QComboBox(this)),
-	  _playbackState(new QComboBox(this)),
-	  _matchText(new VariableLineEdit(this)),
-	  _regex(new RegexConfigWidget(this))
-{
-	populateCheckTypeSelection(_checkType);
-	populatePlaybackStateSelection(_playbackState);
-
-	connect(_checkType, QOverload<int>::of(&QComboBox::currentIndexChanged),
-		this, &MacroConditionNowPlayingEdit::CheckTypeChanged);
-	connect(_playbackState,
-		QOverload<int>::of(&QComboBox::currentIndexChanged), this,
-		&MacroConditionNowPlayingEdit::PlaybackStateChanged);
-	connect(_matchText, &VariableLineEdit::textEdited, this,
-		&MacroConditionNowPlayingEdit::MatchTextChanged);
-	connect(_regex, &RegexConfigWidget::RegexConfigChanged, this,
-		&MacroConditionNowPlayingEdit::RegexChanged);
-
-	_layout = new QHBoxLayout();
-	_layout->addWidget(_checkType);
-	_layout->addWidget(_playbackState);
-	_layout->addWidget(_matchText);
-	_layout->addWidget(_regex);
-	setLayout(_layout);
-
-	_entryData = entryData;
-	UpdateEntryData();
-	_loading = false;
-}
-
-void MacroConditionNowPlayingEdit::UpdateEntryData()
-{
-	if (!_entryData) {
-		return;
-	}
-
-	_checkType->setCurrentIndex(
-		_checkType->findData(static_cast<int>(_entryData->_checkType)));
-	_playbackState->setCurrentIndex(_playbackState->findData(
-		static_cast<int>(_entryData->_playbackState)));
-	_matchText->setText(QString::fromStdString(_entryData->_matchText));
-	_regex->SetRegexConfig(_entryData->_regex);
-
-	SetWidgetVisibility();
-}
-
-void MacroConditionNowPlayingEdit::CheckTypeChanged(int)
-{
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_checkType =
-		static_cast<MacroConditionNowPlaying::CheckType>(
-			_checkType->currentData().toInt());
-	SetWidgetVisibility();
-}
-
-void MacroConditionNowPlayingEdit::PlaybackStateChanged(int)
-{
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_playbackState =
-		static_cast<MacroConditionNowPlaying::PlaybackState>(
-			_playbackState->currentData().toInt());
-}
-
-void MacroConditionNowPlayingEdit::MatchTextChanged(const QString &text)
-{
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_matchText = text.toStdString();
-}
-
-void MacroConditionNowPlayingEdit::RegexChanged(const RegexConfig &regex)
-{
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_regex = regex;
-}
-
-void MacroConditionNowPlayingEdit::SetWidgetVisibility()
-{
-	const bool isStateCheck =
-		_entryData->_checkType ==
-		MacroConditionNowPlaying::CheckType::PLAYBACK_STATE;
-	_playbackState->setVisible(isStateCheck);
-	_matchText->setVisible(!isStateCheck);
-	_regex->setVisible(!isStateCheck);
-
-	if (isStateCheck) {
-		AddStretchIfNecessary(_layout);
-	} else {
-		RemoveStretchIfPresent(_layout);
-	}
-
-	adjustSize();
-	updateGeometry();
-}
-
-} // namespace advss
--- a/plugins/now-playing/macro-condition-now-playing.hpp
+++ b/plugins/now-playing/macro-condition-now-playing.hpp
@@ -1,86 +0,0 @@
-#pragma once
-#include "macro-condition-edit.hpp"
-#include "regex-config.hpp"
-#include "variable-line-edit.hpp"
-
-#include <QComboBox>
-
-namespace advss {
-
-class MacroConditionNowPlaying : public MacroCondition {
-public:
-	enum class CheckType {
-		PLAYBACK_STATE,
-		TITLE,
-		ARTIST,
-		ALBUM,
-		APP_NAME,
-	};
-
-	enum class PlaybackState {
-		PLAYING,
-		PAUSED,
-		STOPPED,
-		OPENING,
-		CHANGING,
-	};
-
-	MacroConditionNowPlaying(Macro *m) : MacroCondition(m) {}
-	bool CheckCondition();
-	bool Save(obs_data_t *obj) const;
-	bool Load(obs_data_t *obj);
-	std::string GetId() const { return id; }
-	static std::shared_ptr<MacroCondition> Create(Macro *m)
-	{
-		return std::make_shared<MacroConditionNowPlaying>(m);
-	}
-
-	CheckType _checkType = CheckType::PLAYBACK_STATE;
-	PlaybackState _playbackState = PlaybackState::PLAYING;
-	StringVariable _matchText;
-	RegexConfig _regex;
-
-private:
-	void SetupTempVars();
-
-	static bool _registered;
-	static const std::string id;
-};
-
-class MacroConditionNowPlayingEdit : public QWidget {
-	Q_OBJECT
-
-public:
-	MacroConditionNowPlayingEdit(
-		QWidget *parent,
-		std::shared_ptr<MacroConditionNowPlaying> cond = nullptr);
-	void UpdateEntryData();
-	static QWidget *Create(QWidget *parent,
-			       std::shared_ptr<MacroCondition> cond)
-	{
-		return new MacroConditionNowPlayingEdit(
-			parent,
-			std::dynamic_pointer_cast<MacroConditionNowPlaying>(
-				cond));
-	}
-
-private slots:
-	void CheckTypeChanged(int);
-	void PlaybackStateChanged(int);
-	void MatchTextChanged(const QString &);
-	void RegexChanged(const RegexConfig &);
-
-private:
-	void SetWidgetVisibility();
-
-	QHBoxLayout *_layout;
-	QComboBox *_checkType;
-	QComboBox *_playbackState;
-	VariableLineEdit *_matchText;
-	RegexConfigWidget *_regex;
-
-	std::shared_ptr<MacroConditionNowPlaying> _entryData;
-	bool _loading = true;
-};
-
-} // namespace advss