debug

This reverts commit 1494b1db6c.

.github/workflows/build-project.yaml

@@ -6,7 +6,7 @@ on:
         description: "Project name detected by parsing build spec file"
         value: ${{ jobs.check-event.outputs.pluginName }}
 env:
-  DEP_DIR: .deps/advss-build-dependencies-3
+  DEP_DIR: .deps/advss-build-dependencies-2
 jobs:
   check-event:
     name: Check GitHub Event Data 🔎

buildspec.json

@@ -1,33 +1,33 @@
 {
     "dependencies": {
         "obs-studio": {
-            "version": "31.1.1",
+            "version": "30.1.2",
             "baseUrl": "https://github.com/obsproject/obs-studio/archive/refs/tags",
             "label": "OBS sources",
             "hashes": {
-                "macos": "39751f067bacc13d44b116c5138491b5f1391f91516d3d590d874edd21292291",
-                "windows-x64": "2c8427c10b55ac6d68008df2e9a3e82f4647aaad18f105e30d4713c2de678ccf"
+                "macos": "490bae1c392b3b344b0270afd8cb887da4bc50bd92c0c426e96713c1ccb9701a",
+                "windows-x64": "c2dd03fa7fd01fad5beafce8f7156da11f9ed9a588373fd40b44a06f4c03b867"
             }
         },
         "prebuilt": {
-            "version": "2025-07-11",
+            "version": "2024-03-19",
             "baseUrl": "https://github.com/obsproject/obs-deps/releases/download",
             "label": "Pre-Built obs-deps",
             "hashes": {
-                "macos": "495687e63383d1a287684b6e2e9bfe246bb8f156fe265926afb1a325af1edd2a",
-                "windows-x64": "c8c642c1070dc31ce9a0f1e4cef5bb992f4bff4882255788b5da12129e85caa7"
+                "macos": "2e9bfb55a5e0e4c1086fa1fda4cf268debfead473089df2aaea80e1c7a3ca7ff",
+                "windows-x64": "6e86068371526a967e805f6f9903f9407adb683c21820db5f07da8f30d11e998"
             }
         },
         "qt6": {
-            "version": "2025-07-11",
+            "version": "2024-03-19",
             "baseUrl": "https://github.com/obsproject/obs-deps/releases/download",
             "label": "Pre-Built Qt6",
             "hashes": {
-                "macos": "d3f5f04b6ea486e032530bdf0187cbda9a54e0a49621a4c8ba984c5023998867",
-                "windows-x64": "0e76bf0555dd5382838850b748d3dcfab44a1e1058441309ab54e1a65b156d0a"
+                "macos": "694f1e639c017e3b1f456f735330dc5afae287cbea85757101af1368de3142c8",
+                "windows-x64": "72d1df34a0ef7413a681d5fcc88cae81da60adc03dcd23ef17862ab170bcc0dd"
             },
             "debugSymbols": {
-                "windows-x64": "11b7be92cf66a273299b8f3515c07a5cfb61614b59a4e67f7fc5ecba5e2bdf21"
+                "windows-x64": "fbddd1f659c360f2291911ac5709b67b6f8182e6bca519d24712e4f6fd3cc865"
             }
         }
     },

cmake/common/buildspec_common.cmake

@@ -65,16 +65,17 @@ function(_setup_obs_studio)
 
   if(OS_WINDOWS)
     set(_cmake_generator "${CMAKE_GENERATOR}")
-    set(_cmake_arch
-        "-A ${arch},version=${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")
+    set(_cmake_arch "-A ${arch}")
     set(_cmake_extra
         "-DCMAKE_SYSTEM_VERSION=${CMAKE_SYSTEM_VERSION} -DCMAKE_ENABLE_SCRIPTING=OFF"
     )
+    set(_cmake_version "2.0.0")
   elseif(OS_MACOS)
     set(_cmake_generator "Xcode")
     set(_cmake_arch "-DCMAKE_OSX_ARCHITECTURES:STRING='arm64;x86_64'")
     set(_cmake_extra
         "-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+    set(_cmake_version "3.0.0")
   endif()
 
   message(STATUS "Configure ${label} (${arch})")
@@ -82,42 +83,32 @@ function(_setup_obs_studio)
     COMMAND
       "${CMAKE_COMMAND}" -S "${dependencies_dir}/${_obs_destination}" -B
       "${dependencies_dir}/${_obs_destination}/build_${arch}" -G
-      ${_cmake_generator} "${_cmake_arch}" -DOBS_CMAKE_VERSION:STRING=3.0.0
-      -DENABLE_PLUGINS:BOOL=OFF -DENABLE_FRONTEND:BOOL=OFF
-      -DOBS_VERSION_OVERRIDE:STRING=${_obs_version}
+      ${_cmake_generator} "${_cmake_arch}"
+      -DOBS_CMAKE_VERSION:STRING=${_cmake_version} -DENABLE_PLUGINS:BOOL=OFF
+      -DENABLE_UI:BOOL=OFF -DOBS_VERSION_OVERRIDE:STRING=${_obs_version}
       "-DCMAKE_PREFIX_PATH='${CMAKE_PREFIX_PATH}'" ${_is_fresh} ${_cmake_extra}
     RESULT_VARIABLE _process_result COMMAND_ERROR_IS_FATAL ANY
     OUTPUT_QUIET)
   message(STATUS "Configure ${label} (${arch}) - done")
 
-  message(STATUS "Build ${label} (Debug - ${arch})")
+  message(STATUS "Build ${label} (${arch})")
   execute_process(
     COMMAND "${CMAKE_COMMAND}" --build build_${arch} --target obs-frontend-api
             --config Debug --parallel
     WORKING_DIRECTORY "${dependencies_dir}/${_obs_destination}"
     RESULT_VARIABLE _process_result COMMAND_ERROR_IS_FATAL ANY
     OUTPUT_QUIET)
-  message(STATUS "Build ${label} (Debug - ${arch}) - done")
-
-  message(STATUS "Build ${label} (Release - ${arch})")
-  execute_process(
-    COMMAND "${CMAKE_COMMAND}" --build build_${arch} --target obs-frontend-api
-            --config Release --parallel
-    WORKING_DIRECTORY "${dependencies_dir}/${_obs_destination}"
-    RESULT_VARIABLE _process_result COMMAND_ERROR_IS_FATAL ANY
-    OUTPUT_QUIET)
-  message(STATUS "Build ${label} (Reelase - ${arch}) - done")
+  message(STATUS "Build ${label} (${arch}) - done")
 
   message(STATUS "Install ${label} (${arch})")
+  if(OS_WINDOWS)
+    set(_cmake_extra "--component obs_libraries")
+  else()
+    set(_cmake_extra "")
+  endif()
   execute_process(
     COMMAND "${CMAKE_COMMAND}" --install build_${arch} --component Development
-            --config Debug --prefix "${dependencies_dir}"
-    WORKING_DIRECTORY "${dependencies_dir}/${_obs_destination}"
-    RESULT_VARIABLE _process_result COMMAND_ERROR_IS_FATAL ANY
-    OUTPUT_QUIET)
-  execute_process(
-    COMMAND "${CMAKE_COMMAND}" --install build_${arch} --component Development
-            --config Release --prefix "${dependencies_dir}"
+            --config Debug --prefix "${dependencies_dir}" ${_cmake_extra}
     WORKING_DIRECTORY "${dependencies_dir}/${_obs_destination}"
     RESULT_VARIABLE _process_result COMMAND_ERROR_IS_FATAL ANY
     OUTPUT_QUIET)

cmake/windows/wingetssl.cmake

@@ -4,7 +4,6 @@
 # ---------------------------------------------------------------------------
 
 if(WIN32 AND (NOT OpenSSL_FOUND))
-
   set(_openssl_roots
       "$ENV{ProgramFiles}/OpenSSL-Win64" "$ENV{ProgramFiles}/OpenSSL"
       "$ENV{ProgramW6432}/OpenSSL-Win64")
@@ -47,20 +46,33 @@ if(WIN32 AND (NOT OpenSSL_FOUND))
            AND EXISTS "${_root}/${_suffix}/libcrypto.lib")
           set(OPENSSL_ROOT_DIR
               "${_root}"
-              CACHE PATH "Path to OpenSSL root")
+              CACHE PATH "Path to OpenSSL root" FORCE)
           set(OPENSSL_CRYPTO_LIBRARY
               "${_root}/${_suffix}/libcrypto.lib"
-              CACHE FILEPATH "OpenSSL crypto lib")
+              CACHE FILEPATH "OpenSSL crypto lib" FORCE)
           set(OPENSSL_SSL_LIBRARY
               "${_root}/${_suffix}/libssl.lib"
-              CACHE FILEPATH "OpenSSL ssl lib")
+              CACHE FILEPATH "OpenSSL ssl lib" FORCE)
           set(OPENSSL_INCLUDE_DIR
               "${_root}/include"
-              CACHE PATH "OpenSSL include dir")
+              CACHE PATH "OpenSSL include dir" FORCE)
           set(OpenSSL_FOUND
               TRUE
-              CACHE BOOL "Whether OpenSSL was found")
+              CACHE BOOL "Whether OpenSSL was found" FORCE)
           message(STATUS "Found OpenSSL at: ${_root}/${_suffix}")
+          # Recursively list all files under OPENSSL_ROOT_DIR
+          file(GLOB_RECURSE OPENSSL_FILES "${OPENSSL_ROOT_DIR}/*")
+
+          message(STATUS "Listing contents of OPENSSL_ROOT_DIR:")
+          foreach(file ${OPENSSL_FILES})
+            message(STATUS "  ${file}")
+          endforeach()
+
+          get_cmake_property(_variableNames VARIABLES)
+          list(SORT _variableNames)
+          foreach(_variableName ${_variableNames})
+            message(STATUS "${_variableName}=${${_variableName}}")
+          endforeach()
           return()
         endif()
       endforeach()

data/locale/en-US.ini

@@ -91,12 +91,6 @@ AdvSceneSwitcher.variableTab.lastUsed.text.never="Never"
 AdvSceneSwitcher.variableTab.lastChanged.header="Last changed"
 AdvSceneSwitcher.variableTab.lastChanged.text.none="No change since launch"
 AdvSceneSwitcher.variableTab.lastChanged.tooltip="Times changed: %1\n\nPrevious value: %2"
-AdvSceneSwitcher.variableTab.search.placeholder="Search ..."
-AdvSceneSwitcher.variableTab.search.all="All columns"
-AdvSceneSwitcher.variableTab.search.name="Name column"
-AdvSceneSwitcher.variableTab.search.value="Value column"
-AdvSceneSwitcher.variableTab.addDock="Add dock"
-AdvSceneSwitcher.variableTab.clear="Clear"
 
 # Action Queue Tab
 AdvSceneSwitcher.actionQueueTab.title="Action Queues"
@@ -934,9 +928,6 @@ AdvSceneSwitcher.action.source.type.deinterlaceOrder="Set deinterlace field orde
 AdvSceneSwitcher.action.source.type.openInteractionDialog="Open interaction dialog"
 AdvSceneSwitcher.action.source.type.openFilterDialog="Open filter dialog"
 AdvSceneSwitcher.action.source.type.openPropertiesDialog="Open properties dialog"
-AdvSceneSwitcher.action.source.type.closeInteractionDialog="Close interaction dialog"
-AdvSceneSwitcher.action.source.type.closeFilterDialog="Close filter dialog"
-AdvSceneSwitcher.action.source.type.closePropertiesDialog="Close properties dialog"
 AdvSceneSwitcher.action.source.entry="{{actions}}{{sources}}{{settingsButtons}}{{deinterlaceMode}}{{deinterlaceOrder}}{{refresh}}"
 AdvSceneSwitcher.action.source.entry.settings="{{settings}}{{settingsInputMethod}}{{settingValue}}{{tempVar}}"
 AdvSceneSwitcher.action.source.warning="Warning: Enabling and disabling sources globally cannot be controlled by the OBS UI\nYou might be looking for \"Scene item visibility\""
@@ -958,7 +949,6 @@ AdvSceneSwitcher.action.source.inputMethod.individualTempvar="Set to macro prope
 AdvSceneSwitcher.action.source.inputMethod.json="Set setting JSON string"
 AdvSceneSwitcher.action.source.refresh="Refresh"
 AdvSceneSwitcher.action.source.refresh.tooltip="Repopulate the source settings selection with the settings of the source which's name matches the variable value."
-AdvSceneSwitcher.action.source.dialog.accept="Accept changes"
 AdvSceneSwitcher.action.media="Media"
 AdvSceneSwitcher.action.media.type.play="Play"
 AdvSceneSwitcher.action.media.type.pause="Pause"
@@ -1155,7 +1145,6 @@ AdvSceneSwitcher.action.http.entry.line2="Timeout:{{timeout}}seconds"
 AdvSceneSwitcher.action.variable="Variable"
 AdvSceneSwitcher.action.variable.type.set="Set to value"
 AdvSceneSwitcher.action.variable.type.append="Append"
-AdvSceneSwitcher.action.variable.type.copy="Copy variable"
 AdvSceneSwitcher.action.variable.type.appendVar="Append variable"
 AdvSceneSwitcher.action.variable.type.increment="Increment"
 AdvSceneSwitcher.action.variable.type.decrement="Decrement"
@@ -2323,9 +2312,6 @@ AdvSceneSwitcher.tempVar.mqtt.message="Message"
 AdvSceneSwitcher.tempVar.cursor.x="Cursor position (X)"
 AdvSceneSwitcher.tempVar.cursor.y="Cursor position (Y)"
 
-AdvSceneSwitcher.tempVar.replay.lastSavePath="Last save path"
-AdvSceneSwitcher.tempVar.replay.lastSavePath.description="The file path of the last replay buffer saved."
-
 AdvSceneSwitcher.selectScene="--select scene--"
 AdvSceneSwitcher.selectCanvas="--select canvas--"
 AdvSceneSwitcher.selectPreviousScene="Previous Scene"

lib/macro/macro-action-variable.cpp

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

lib/macro/macro-action-variable.hpp

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

lib/macro/macro-dock.cpp

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

lib/queue/action-queue.cpp

@@ -423,7 +423,7 @@ void ImportQueues(obs_data_t *data)
 		importedQueues->emplace_back(queue);
 	}
 
-	QueueUITask(signalImportedQueues, importedQueues);
+	QeueUITask(signalImportedQueues, importedQueues);
 }
 
 std::weak_ptr<ActionQueue> GetWeakActionQueueByName(const std::string &name)

lib/utils/resource-table.cpp

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

lib/utils/resource-table.hpp

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

lib/utils/ui-helpers.cpp

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

lib/utils/ui-helpers.hpp

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

lib/variables/variable-tab.cpp

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

lib/variables/variable-tab.hpp

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

lib/variables/variable.cpp

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

plugins/base/macro-action-hotkey.cpp

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

plugins/base/macro-action-hotkey.hpp

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

plugins/base/macro-action-source.cpp

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

plugins/base/macro-action-source.hpp

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

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

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

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

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

plugins/mqtt/CMakeLists.txt

@@ -10,6 +10,12 @@ if(OS_MACOS)
 endif()
 find_package(OpenSSL)
 
+get_cmake_property(_variableNames VARIABLES)
+list(SORT _variableNames)
+foreach(_variableName ${_variableNames})
+  message(STATUS "${_variableName}=${${_variableName}}")
+endforeach()
+
 find_package(PahoMqttCpp)
 if(NOT PahoMqttCpp_FOUND)
   message(WARNING "PahoMqttCpp not found!\n"

tests/mocks/ui-helpers.cpp

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