Add message_text temp var for subscription message event

The existing "message" temp var for the subscription message event
contained a raw JSON object (including emote metadata) rather than
plain text, making it difficult to use.

.github/actions/build-dependencies/action.yaml

@@ -19,14 +19,9 @@ inputs:
 runs:
   using: 'composite'
   steps:
-    - name: Setup cmake
-      uses: jwlawson/actions-setup-cmake@v1.13
-      with:
-        cmake-version: '3.x.x'
-
     - name: Restore cached dependencies
       id: restore-cache
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: ${{ env.DEP_DIR }}
         key: ${{ env.DEP_DIR }}-${{ runner.os }}-${{ inputs.target }}

.github/actions/run-clang-format/action.yaml

@@ -29,6 +29,7 @@ runs:
         eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
         echo "/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin" >> $GITHUB_PATH
         echo "/home/linuxbrew/.linuxbrew/opt/clang-format@16/bin" >> $GITHUB_PATH
+        brew update
         brew install --quiet zsh
         echo ::endgroup::
 
@@ -52,6 +53,7 @@ runs:
 
         if (( ${changes[(I)(*.c|*.h|*.cpp|*.hpp|*.m|*.mm)]} )) {
           echo ::group::Install clang-format-16
+          brew update
           brew install --quiet obsproject/tools/clang-format@16
           echo ::endgroup::
 

.github/scripts/.Wingetfile

@@ -1,4 +1,4 @@
 package 'cmake', path: 'Cmake\bin', bin: 'cmake'
 package 'innosetup', path: 'Inno Setup 6', bin: 'iscc'
-package 'OpenSSL', path: 'OpenSSL', bin: 'openssl'
+package 'OpenSSL', path: 'OpenSSL', bin: 'openssl', version: '3.6.2'
 package 'Microsoft.VisualStudio.Locator', path: 'vswhere', bin: 'vswhere'

.github/scripts/Package-Windows.ps1

@@ -68,14 +68,53 @@ function Package {
 
     Remove-Item @RemoveArgs
 
-    Log-Group "Archiving ${ProductName}..."
-    $CompressArgs = @{
-        Path = (Get-ChildItem -Path "${ProjectRoot}/release/${Configuration}" -Exclude "${OutputName}*.*")
-        CompressionLevel = 'Optimal'
-        DestinationPath = "${ProjectRoot}/release/${OutputName}.zip"
-        Verbose = ($Env:CI -ne $null)
+    $ReleasePath = "${ProjectRoot}/release/${Configuration}"
+    $NewBinPath  = "${ReleasePath}/${ProductName}/bin/64bit"
+    $NewDataPath = "${ReleasePath}/${ProductName}/data"
+    $CIWindowsDir = "${ProjectRoot}/build-aux/CI/windows"
+
+    # --- Recommended zip (new layout, extract to %ProgramData%\obs-studio\) ---
+    Log-Group "Archiving ${ProductName} (recommended)..."
+    $RecStaging = "${ProjectRoot}/release/zip-staging-rec"
+    Remove-Item -Path $RecStaging -Recurse -Force -ErrorAction SilentlyContinue
+    New-Item -ItemType Directory -Force -Path $RecStaging | Out-Null
+    Copy-Item -Path "${CIWindowsDir}/README.txt" -Destination "${RecStaging}/README.txt"
+    if ( Test-Path -Path $NewBinPath ) {
+        $RecBinPath = "${RecStaging}/${ProductName}/bin/64bit"
+        New-Item -ItemType Directory -Force -Path $RecBinPath | Out-Null
+        Copy-Item -Path "${NewBinPath}/*" -Destination $RecBinPath -Recurse -Force
     }
-    Compress-Archive -Force @CompressArgs
+    if ( Test-Path -Path $NewDataPath ) {
+        $RecDataPath = "${RecStaging}/${ProductName}/data"
+        New-Item -ItemType Directory -Force -Path $RecDataPath | Out-Null
+        Copy-Item -Path "${NewDataPath}/*" -Destination $RecDataPath -Recurse -Force
+    }
+    Compress-Archive -Force -Path (Get-ChildItem -Path $RecStaging) `
+        -CompressionLevel Optimal `
+        -DestinationPath "${ProjectRoot}/release/${OutputName}.zip"
+    Remove-Item -Path $RecStaging -Recurse -Force
+    Log-Group
+
+    # --- Legacy zip (old layout, extract to OBS install directory) ---
+    Log-Group "Archiving ${ProductName} (portable)..."
+    $PortableStaging = "${ProjectRoot}/release/zip-staging-portable"
+    Remove-Item -Path $PortableStaging -Recurse -Force -ErrorAction SilentlyContinue
+    New-Item -ItemType Directory -Force -Path $PortableStaging | Out-Null
+    Copy-Item -Path "${CIWindowsDir}/README-portable.txt" -Destination "${PortableStaging}/README.txt"
+    if ( Test-Path -Path $NewBinPath ) {
+        $PortableBinPath = "${PortableStaging}/obs-plugins/64bit"
+        New-Item -ItemType Directory -Force -Path $PortableBinPath | Out-Null
+        Copy-Item -Path "${NewBinPath}/*" -Destination $PortableBinPath -Recurse -Force
+    }
+    if ( Test-Path -Path $NewDataPath ) {
+        $PortableDataPath = "${PortableStaging}/data/obs-plugins/${ProductName}"
+        New-Item -ItemType Directory -Force -Path $PortableDataPath | Out-Null
+        Copy-Item -Path "${NewDataPath}/*" -Destination $PortableDataPath -Recurse -Force
+    }
+    Compress-Archive -Force -Path (Get-ChildItem -Path $PortableStaging) `
+        -CompressionLevel Optimal `
+        -DestinationPath "${ProjectRoot}/release/${OutputName}-portable.zip"
+    Remove-Item -Path $PortableStaging -Recurse -Force
     Log-Group
 
     if ( ( $BuildInstaller ) ) {
@@ -89,7 +128,25 @@ function Package {
         Log-Information 'Creating InnoSetup installer...'
         Push-Location -Stack BuildTemp
         Ensure-Location -Path "${ProjectRoot}/release"
-        Copy-Item -Path ${Configuration} -Destination Package -Recurse
+        Remove-Item -Path Package -Recurse -Force -ErrorAction SilentlyContinue
+
+        # Recommended layout (for %ProgramData%\obs-studio\plugins\)
+        $PkgRec = "Package/recommended"
+        New-Item -ItemType Directory -Force -Path $PkgRec | Out-Null
+        Copy-Item -Path "${Configuration}/*" -Destination $PkgRec -Recurse -Force
+
+        # Legacy layout (for OBS installation directory)
+        if ( Test-Path "${Configuration}/${ProductName}/bin/64bit" ) {
+            $PkgLegBin = "Package/portable/obs-plugins/64bit"
+            New-Item -ItemType Directory -Force -Path $PkgLegBin | Out-Null
+            Copy-Item -Path "${Configuration}/${ProductName}/bin/64bit/*" -Destination $PkgLegBin -Recurse -Force
+        }
+        if ( Test-Path "${Configuration}/${ProductName}/data" ) {
+            $PkgLegData = "Package/portable/data/obs-plugins/${ProductName}"
+            New-Item -ItemType Directory -Force -Path $PkgLegData | Out-Null
+            Copy-Item -Path "${Configuration}/${ProductName}/data/*" -Destination $PkgLegData -Recurse -Force
+        }
+
         Invoke-External iscc ${IsccFile} /O"${ProjectRoot}/release" /F"${OutputName}-Installer"
         Remove-Item -Path Package -Recurse
         Pop-Location -Stack BuildTemp

.github/scripts/utils.zsh/check_macos

@@ -18,4 +18,5 @@ if (( ! ${+commands[brew]} )) {
 }
 
 brew bundle --file ${SCRIPT_HOME}/.Brewfile
+rehash
 log_group

.github/workflows/build-debian.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: "recursive"
       - name: check_libobs_revision
@@ -50,7 +50,7 @@ jobs:
           mv ../*.deb .
       - name: Publish
         if: success()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: "obs-scene-switcher.deb"
           path: ${{ github.workspace }}/*.deb

.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-4
+  DEP_DIR: .deps/advss-build-dependencies-5
 jobs:
   check-event:
     name: Check GitHub Event Data 🔎
@@ -22,7 +22,7 @@ jobs:
       commitHash: ${{ steps.setup.outputs.commitHash }}
       pluginName: ${{ steps.setup.outputs.pluginName }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: Check Event Data ☑️
@@ -81,7 +81,7 @@ jobs:
       run:
         shell: zsh --no-rcs --errexit --pipefail {0}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
           fetch-depth: 0
@@ -111,7 +111,7 @@ jobs:
           sudo xcode-select --switch /Applications/Xcode_16.1.0.app/Contents/Developer
           print '::endgroup::'
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@v5
         id: ccache-cache
         with:
           path: ${{ github.workspace }}/.ccache
@@ -163,13 +163,13 @@ jobs:
           codesignPass: ${{ secrets.MACOS_NOTARIZATION_PASSWORD }}
 
       - name: Upload Artifacts 📡
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: ${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-macos-universal-${{ needs.check-event.outputs.commitHash }}
           path: ${{ github.workspace }}/release/${{ steps.setup.outputs.pluginName }}-*-macos-universal.*
 
       - name: Upload Debug Symbol Artifacts 🪲
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         if: ${{ needs.check-event.outputs.config == 'Release' }}
         with:
           name: ${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-macos-universal-${{ needs.check-event.outputs.commitHash }}-dSYMs
@@ -183,7 +183,7 @@ jobs:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
           fetch-depth: 0
@@ -202,7 +202,7 @@ jobs:
           echo "pluginName=${product_name}" >> $GITHUB_OUTPUT
           echo "pluginVersion=${git_tag}" >> $GITHUB_OUTPUT
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@v5
         id: ccache-cache
         with:
           path: ${{ github.workspace }}/.ccache
@@ -210,13 +210,8 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-ccache-x86_64-
 
-      - name: Set up CMake 🏗️
-        uses: jwlawson/actions-setup-cmake@v1.13
-        with:
-          cmake-version: '3.x.x'
-
       - name: Set up Homebrew 🍺
-        uses: Homebrew/actions/setup-homebrew@master
+        uses: Homebrew/actions/setup-homebrew@main
 
       - name: Build Plugin 🧱
         uses: ./.github/actions/build-plugin
@@ -238,23 +233,24 @@ jobs:
           config: ${{ needs.check-event.outputs.config }}
 
       - name: Upload Source Tarball 🗜️
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: ${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-sources-${{ needs.check-event.outputs.commitHash }}
           path: ${{ github.workspace }}/release/${{ steps.setup.outputs.pluginName }}-*-source.*
 
       - name: Upload Artifacts 📡
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: ${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-ubuntu-24.04-x86_64-${{ needs.check-event.outputs.commitHash }}
           path: ${{ github.workspace }}/release/${{ steps.setup.outputs.pluginName }}-*-x86_64*.*
 
       - name: Upload debug symbol artifacts 🪲
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         if: ${{ fromJSON(needs.check-event.outputs.package) }}
         with:
           name: ${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-ubuntu-24.04-x86_64-${{ needs.check-event.outputs.commitHash }}-dbgsym
           path: ${{ github.workspace }}/release/${{ steps.setup.outputs.pluginName }}-*-x86_64*-dbgsym.ddeb
+          if-no-files-found: ignore
 
   windows-build:
     name: Build for Windows 🪟
@@ -264,7 +260,7 @@ jobs:
       run:
         shell: pwsh
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
           fetch-depth: 0
@@ -311,7 +307,7 @@ jobs:
           package: ${{ fromJSON(needs.check-event.outputs.package) }}
 
       - name: Upload Artifacts 📡
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: ${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-windows-x64-${{ needs.check-event.outputs.commitHash }}
           path: ${{ github.workspace }}/release/${{ steps.setup.outputs.pluginName }}-*-windows-x64*.*

.github/workflows/check-format.yaml

@@ -5,7 +5,7 @@ jobs:
   clang-format:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: clang-format check 🐉
@@ -17,7 +17,7 @@ jobs:
   cmake-format:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: cmake-format check 🎛️

.github/workflows/locale-check.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Check locale files
         run: |

.github/workflows/push.yaml

@@ -59,7 +59,7 @@ jobs:
           esac
 
       - name: Download Build Artifacts 📥
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         if: fromJSON(steps.check.outputs.validTag)
         id: download
 
@@ -106,7 +106,7 @@ jobs:
       - name: Create Release 🛫
         if: fromJSON(steps.check.outputs.validTag)
         id: create_release
-        uses: softprops/action-gh-release@d4e8205d7e959a9107da6396278b2f1f07af0f9b
+        uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda
         with:
           draft: true
           prerelease: ${{ fromJSON(steps.check.outputs.prerelease) }}

.gitmodules

@@ -28,9 +28,6 @@
 [submodule "deps/libusb"]
 	path = deps/libusb
 	url = https://github.com/libusb/libusb.git
-[submodule "deps/date"]
-	path = deps/date
-	url = https://github.com/HowardHinnant/date.git
 [submodule "deps/jsoncons"]
 	path = deps/jsoncons
 	url = https://github.com/danielaparker/jsoncons.git

CMakeLists.txt

@@ -134,6 +134,9 @@ target_sources(
           lib/macro/macro-dock-window.hpp
           lib/macro/macro-edit.cpp
           lib/macro/macro-edit.hpp
+          lib/macro/macro-export-builtin-extensions.cpp
+          lib/macro/macro-export-extensions.cpp
+          lib/macro/macro-export-extensions.hpp
           lib/macro/macro-export-import-dialog.cpp
           lib/macro/macro-export-import-dialog.hpp
           lib/macro/macro-helpers.cpp
@@ -206,6 +209,13 @@ target_sources(
           lib/utils/filter-combo-box.hpp
           lib/utils/first-run-wizard.cpp
           lib/utils/first-run-wizard.hpp
+          lib/utils/first-run-wizard-audio.cpp
+          lib/utils/first-run-wizard-audio.hpp
+          lib/utils/first-run-wizard-helpers.hpp
+          lib/utils/first-run-wizard-sequence.cpp
+          lib/utils/first-run-wizard-sequence.hpp
+          lib/utils/first-run-wizard-window.cpp
+          lib/utils/first-run-wizard-window.hpp
           lib/utils/help-icon.hpp
           lib/utils/help-icon.cpp
           lib/utils/item-selection-helpers.cpp
@@ -288,6 +298,10 @@ target_sources(
           lib/utils/volume-control.hpp
           lib/utils/websocket-api.cpp
           lib/utils/websocket-api.hpp
+          lib/variables/variable-color-button.cpp
+          lib/variables/variable-color-button.hpp
+          lib/variables/variable-color.cpp
+          lib/variables/variable-color.hpp
           lib/variables/variable-line-edit.cpp
           lib/variables/variable-line-edit.hpp
           lib/variables/variable-number.hpp

build-aux/CI/windows/README-portable.txt

@@ -0,0 +1,23 @@
+Advanced Scene Switcher - Windows Installation (Portable)
+==========================================================
+
+For full installation instructions visit:
+https://github.com/WarmUpTill/SceneSwitcher/wiki/Installation
+
+
+This archive uses the portable plugin layout for older OBS versions,
+portable OBS installs, and Steam.
+
+Extract the CONTENTS of this archive into your OBS installation directory,
+typically:
+
+    C:\Program Files\obs-studio\
+
+Merge the data\ and obs-plugins\ folders with the existing ones when prompted.
+
+Steam users: right-click OBS in your library -> Manage -> Browse local files,
+then extract the contents of this archive into that directory.
+
+
+For OBS 28 and newer the recommended archive is preferred:
+    advanced-scene-switcher-<version>-windows-x64.zip

build-aux/CI/windows/README.txt

@@ -0,0 +1,21 @@
+Advanced Scene Switcher - Windows Installation
+===============================================
+
+For full installation instructions visit:
+https://github.com/WarmUpTill/SceneSwitcher/wiki/Installation
+
+
+This archive uses the recommended plugin layout for OBS 28 and newer.
+
+Extract the CONTENTS of this archive into:
+
+    C:\ProgramData\obs-studio\plugins\
+
+Tip: press Win+R and type  %ProgramData%\obs-studio\plugins  to open that folder.
+
+After extracting, the path should look like:
+    C:\ProgramData\obs-studio\plugins\advanced-scene-switcher\bin\64bit\advanced-scene-switcher.dll
+
+
+If the plugin does not appear in OBS, try the portable archive instead:
+    advanced-scene-switcher-<version>-windows-x64-portable.zip

cmake/common/advss_helpers.cmake

@@ -2,7 +2,7 @@
 
 if(BUILD_OUT_OF_TREE)
   if(OS_WINDOWS)
-    set(OBS_PLUGIN_DESTINATION "obs-plugins/64bit")
+    set(OBS_PLUGIN_DESTINATION "${CMAKE_PROJECT_NAME}/bin/64bit")
   else()
     set(OBS_PLUGIN_DESTINATION "${CMAKE_INSTALL_LIBDIR}/obs-plugins")
   endif()
@@ -157,7 +157,9 @@ else()
       set_target_properties(${target} PROPERTIES INSTALL_RPATH
                                                  "$ORIGIN:$ORIGIN/..")
     endif()
-    message(STATUS "ADVSS: ENABLED PLUGIN     ${target}")
+    get_filename_component(_plugin_dir_name "${CMAKE_CURRENT_SOURCE_DIR}" NAME)
+    set_property(GLOBAL APPEND PROPERTY ADVSS_PLUGINS_ENABLED
+                                        ${_plugin_dir_name})
   endfunction()
 
   function(install_advss_plugin_dependency_target target dep)

cmake/linux/defaults.cmake

@@ -18,7 +18,9 @@ set(CPACK_PACKAGE_FILE_NAME
     "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_C_LIBRARY_ARCHITECTURE}"
 )
 
-set(CPACK_GENERATOR "DEB")
+set(CPACK_GENERATOR
+    "DEB"
+    CACHE STRING "CPack generator to use")
 set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
 set(CPACK_DEBIAN_PACKAGE_MAINTAINER "${PLUGIN_EMAIL}")
 set(CPACK_SET_DESTDIR ON)
@@ -46,6 +48,19 @@ set(CPACK_SOURCE_PACKAGE_FILE_NAME
 set(CPACK_ARCHIVE_THREADS 0)
 
 include(CPack)
+# CPack.cmake has a side effect that leaves binary packaging variables in the
+# state intended for source packaging when it finishes. Specifically it sets
+# CPACK_GENERATOR to CPACK_SOURCE_GENERATOR ("TXZ"), sets
+# CPACK_INSTALLED_DIRECTORIES to the source root (which would cause CPackDeb to
+# scan the entire source tree, including ccache object files that lack a Build
+# ID), and clears CPACK_INSTALL_CMAKE_PROJECTS (preventing the cmake install
+# mechanism from being used). In some cmake versions these overrides happen
+# before CPackConfig.cmake is written. Reset all three so that binary DEB
+# packaging works correctly regardless of cmake version.
+set(CPACK_GENERATOR "DEB")
+set(CPACK_INSTALLED_DIRECTORIES "")
+set(CPACK_INSTALL_CMAKE_PROJECTS
+    "${CMAKE_BINARY_DIR};${CMAKE_PROJECT_NAME};ALL;/")
 
 find_package(libobs QUIET)
 

cmake/windows/buildspec.cmake

@@ -6,7 +6,11 @@ include(buildspec_common)
 
 # _check_dependencies_windows: Set up Windows slice for _check_dependencies
 function(_check_dependencies_windows)
-  set(arch ${CMAKE_GENERATOR_PLATFORM})
+  if(CMAKE_GENERATOR_PLATFORM)
+    set(arch ${CMAKE_GENERATOR_PLATFORM})
+  else()
+    set(arch x64)
+  endif()
   set(platform windows-${arch})
 
   set(dependencies_dir "${CMAKE_CURRENT_SOURCE_DIR}/.deps")

cmake/windows/defaults.cmake

@@ -6,3 +6,9 @@ include_guard(GLOBAL)
 set(CMAKE_FIND_PACKAGE_TARGETS_GLOBAL TRUE)
 
 include(buildspec)
+
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+  set(CMAKE_INSTALL_PREFIX
+      "$ENV{ALLUSERSPROFILE}/obs-studio/plugins"
+      CACHE STRING "Default plugin installation directory" FORCE)
+endif()

cmake/windows/helpers.cmake

@@ -30,13 +30,13 @@ function(set_target_properties_plugin target)
 
   install(
     TARGETS ${target}
-    RUNTIME DESTINATION bin/64bit
-    LIBRARY DESTINATION obs-plugins/64bit)
+    RUNTIME DESTINATION "${target}/bin/64bit"
+    LIBRARY DESTINATION "${target}/bin/64bit")
 
   install(
     FILES "$<TARGET_PDB_FILE:${target}>"
     CONFIGURATIONS RelWithDebInfo Debug Release
-    DESTINATION obs-plugins/64bit
+    DESTINATION "${target}/bin/64bit"
     OPTIONAL)
 
   if(OBS_BUILD_DIR)
@@ -44,11 +44,11 @@ function(set_target_properties_plugin target)
       TARGET ${target}
       POST_BUILD
       COMMAND "${CMAKE_COMMAND}" -E make_directory
-              "${OBS_BUILD_DIR}/obs-plugins/64bit"
+              "${OBS_BUILD_DIR}/plugins/${target}/bin/64bit"
       COMMAND
         "${CMAKE_COMMAND}" -E copy_if_different "$<TARGET_FILE:${target}>"
         "$<$<CONFIG:Debug,RelWithDebInfo,Release>:$<TARGET_PDB_FILE:${target}>>"
-        "${OBS_BUILD_DIR}/obs-plugins/64bit"
+        "${OBS_BUILD_DIR}/plugins/${target}/bin/64bit"
       COMMENT "Copy ${target} to obs-studio directory ${OBS_BUILD_DIR}"
       VERBATIM)
   endif()
@@ -105,7 +105,7 @@ function(target_install_resources target)
 
     install(
       DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/data/"
-      DESTINATION data/obs-plugins/${target}
+      DESTINATION "${target}/data"
       USE_SOURCE_PERMISSIONS)
 
     if(OBS_BUILD_DIR)
@@ -113,11 +113,11 @@ function(target_install_resources target)
         TARGET ${target}
         POST_BUILD
         COMMAND "${CMAKE_COMMAND}" -E make_directory
-                "${OBS_BUILD_DIR}/data/obs-plugins/${target}"
+                "${OBS_BUILD_DIR}/plugins/${target}/data"
         COMMAND
           "${CMAKE_COMMAND}" -E copy_directory
           "${CMAKE_CURRENT_SOURCE_DIR}/data"
-          "${OBS_BUILD_DIR}/data/obs-plugins/${target}"
+          "${OBS_BUILD_DIR}/plugins/${target}/data"
         COMMENT "Copy ${target} resources to data directory"
         VERBATIM)
     endif()
@@ -133,7 +133,7 @@ function(target_add_resource target resource)
 
   install(
     FILES "${resource}"
-    DESTINATION data/obs-plugins/${target}
+    DESTINATION "${target}/data"
     COMPONENT Runtime)
 
   if(OBS_BUILD_DIR)
@@ -141,9 +141,9 @@ function(target_add_resource target resource)
       TARGET ${target}
       POST_BUILD
       COMMAND "${CMAKE_COMMAND}" -E make_directory
-              "${OBS_BUILD_DIR}/data/obs-plugins/${target}"
+              "${OBS_BUILD_DIR}/plugins/${target}/data"
       COMMAND "${CMAKE_COMMAND}" -E copy "${resource}"
-              "${OBS_BUILD_DIR}/data/obs-plugins/${target}"
+              "${OBS_BUILD_DIR}/plugins/${target}/data"
       COMMENT "Copy ${target} resource ${resource} to library directory"
       VERBATIM)
   endif()

cmake/windows/resources/installer-Windows.iss.in

@@ -2,12 +2,13 @@
 #define MyAppVersion "@CMAKE_PROJECT_VERSION@"
 #define MyAppPublisher "@PLUGIN_AUTHOR@"
 #define MyAppURL "@PLUGIN_WEBSITE@"
+#define MyAppId "@UUID_APP@"
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
 ; Do not use the same AppId value in installers for other applications.
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{@UUID_APP@}
+AppId={{{#MyAppId}}
 AppName={#MyAppName}
 AppVersion={#MyAppVersion}
 AppPublisher={#MyAppPublisher}
@@ -20,15 +21,19 @@ OutputBaseFilename={#MyAppName}-{#MyAppVersion}-Windows-Installer
 Compression=lzma
 SolidCompression=yes
 DirExistsWarning=no
+UsePreviousAppDir=no
 SetupIconFile=installer.ico
-UninstallDisplayIcon={app}\data\obs-plugins\advanced-scene-switcher\res\images\logo.ico
+UninstallDisplayIcon={code:GetUninstallIconPath}
 DisableDirPage=no
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
 [Files]
-Source: "..\release\Package\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+; Recommended layout - used when installing to %ProgramData%\obs-studio\plugins\
+Source: "..\release\Package\recommended\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; Check: IsRecommendedLayout
+; Legacy layout - used when installing to the OBS installation directory
+Source: "..\release\Package\portable\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; Check: IsLegacyLayout
 Source: "..\LICENSE"; Flags: dontcopy
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
@@ -51,17 +56,64 @@ begin
   );
 end;
 
-// credit where it's due :
-// following function come from https://github.com/Xaymar/obs-studio_amf-encoder-plugin/blob/master/%23Resources/Installer.in.iss#L45
-function GetDirName(Value: string): string;
-var
-  InstallPath: string;
+// Returns true when the selected install directory is under %ProgramData%,
+// meaning the recommended plugin layout should be used.
+function IsRecommendedLayout(): Boolean;
 begin
-  // initialize default path, which will be returned when the following registry
-  // key queries fail due to missing keys or for some different reason
-  Result := '{autopf}\obs-studio';
-  // query the first registry value; if this succeeds, return the obtained value
-  if RegQueryStringValue(HKLM32, 'SOFTWARE\OBS Studio', '', InstallPath) then
-    Result := InstallPath
+  Result := Pos(LowerCase(ExpandConstant('{commonappdata}')),
+                LowerCase(WizardDirValue())) = 1;
 end;
 
+function IsLegacyLayout(): Boolean;
+begin
+  Result := not IsRecommendedLayout();
+end;
+
+function GetUninstallIconPath(Param: string): string;
+begin
+  if IsRecommendedLayout() then
+    Result := ExpandConstant('{app}\advanced-scene-switcher\data\res\images\logo.ico')
+  else
+    Result := ExpandConstant('{app}\data\obs-plugins\advanced-scene-switcher\res\images\logo.ico');
+end;
+
+function GetDirName(Value: string): string;
+var
+  PrevPath: string;
+  UninstallKey: string;
+begin
+  Result := ExpandConstant('{commonappdata}\obs-studio\plugins');
+  UninstallKey := 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\' + '{' + '{#MyAppId}' + '}_is1';
+  if RegQueryStringValue(HKLM, UninstallKey, 'InstallLocation', PrevPath) and (PrevPath <> '') then
+    Result := PrevPath;
+end;
+
+// Remove files placed by the portable installer (obs-plugins/64bit and
+// data/obs-plugins layout) so the plugin is not loaded twice by OBS.
+// Only runs when upgrading from a portable location to the recommended one.
+procedure RemoveLegacyFiles();
+var
+  OldInstallPath: string;
+  UninstallKey: string;
+begin
+  if not IsRecommendedLayout() then
+    Exit;
+  UninstallKey := 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\' + '{' + '{#MyAppId}' + '}_is1';
+  if not RegQueryStringValue(HKLM, UninstallKey, 'InstallLocation', OldInstallPath) then
+    Exit;
+  // Skip if the previous install was already in the recommended location
+  if Pos(LowerCase(ExpandConstant('{commonappdata}')), LowerCase(OldInstallPath)) = 1 then
+    Exit;
+  DeleteFile(OldInstallPath + '\obs-plugins\64bit\advanced-scene-switcher.dll');
+  DeleteFile(OldInstallPath + '\obs-plugins\64bit\advanced-scene-switcher.pdb');
+  DeleteFile(OldInstallPath + '\obs-plugins\64bit\advanced-scene-switcher-lib.dll');
+  DeleteFile(OldInstallPath + '\obs-plugins\64bit\advanced-scene-switcher-lib.pdb');
+  DelTree(OldInstallPath + '\obs-plugins\64bit\advanced-scene-switcher-plugins', True, True, True);
+  DelTree(OldInstallPath + '\data\obs-plugins\advanced-scene-switcher', True, True, True);
+end;
+
+procedure CurStepChanged(CurStep: TSetupStep);
+begin
+  if CurStep = ssInstall then
+    RemoveLegacyFiles();
+end;

data/locale/de-DE.ini

@@ -99,7 +99,6 @@ AdvSceneSwitcher.macroList.deleted="gelöscht"
 AdvSceneSwitcher.macroList.duplicate="\"%1\" ist bereits ausgewählt!"
 
 ; Macro Logic
-AdvSceneSwitcher.logic.none="Eintrag ignorieren"
 AdvSceneSwitcher.logic.and="Und"
 AdvSceneSwitcher.logic.or="Oder"
 AdvSceneSwitcher.logic.andNot="Und nicht"
@@ -383,8 +382,8 @@ AdvSceneSwitcher.action.scene.blockUntilTransitionDone="Warten, bis der Übergan
 AdvSceneSwitcher.action.wait="Warten"
 AdvSceneSwitcher.action.wait.type.fixed="fixe"
 AdvSceneSwitcher.action.wait.type.random="zufällig"
-AdvSceneSwitcher.action.wait.entry.fixed="Warte für {{waitType}} Dauer von {{duration}}"
-AdvSceneSwitcher.action.wait.entry.random="Warte für {{waitType}} Dauer von {{duration}} bis {{duration2}}"
+AdvSceneSwitcher.action.wait.layout.fixed="Warte für {{waitType}} Dauer von {{duration}}"
+AdvSceneSwitcher.action.wait.layout.random="Warte für {{waitType}} Dauer von {{duration}} bis {{duration2}}"
 AdvSceneSwitcher.action.audio="Audio"
 AdvSceneSwitcher.action.audio.type.mute="Stummgeschaltet"
 AdvSceneSwitcher.action.audio.type.unmute="Nicht stummgeschaltet"

data/locale/en-US.ini

@@ -47,6 +47,13 @@ AdvSceneSwitcher.generalTab.generalBehavior.hideLegacyTabs="Hide tabs which can
 AdvSceneSwitcher.generalTab.generalBehavior.alwaysShowMacroSearch="Always show macro search"
 AdvSceneSwitcher.generalTab.generalBehavior.alwaysShowFeatureTabs="Always show all feature tabs"
 AdvSceneSwitcher.generalTab.generalBehavior.alwaysShowFeatureTabs.tooltip="Show tabs that are normally hidden until first used in a macro (e.g. Action Queues, Variables, Twitch, Websockets)."
+AdvSceneSwitcher.generalTab.generalBehavior.settingsLock="Lock settings dialog with password"
+AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.title="Settings Locked"
+AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.passwordLabel="Enter password:"
+AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.wrongPassword="Wrong password!"
+AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.newPasswordLabel="New password:"
+AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.confirmPasswordLabel="Confirm password:"
+AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.passwordMismatch="Passwords do not match!"
 AdvSceneSwitcher.generalTab.matchBehavior="Match behavior"
 AdvSceneSwitcher.generalTab.priority="Priority"
 AdvSceneSwitcher.generalTab.priority.description="Switching methods priority (Highest priority is at the top)"
@@ -202,6 +209,13 @@ AdvSceneSwitcher.macroTab.remove="Remove"
 AdvSceneSwitcher.macroTab.export="Export"
 AdvSceneSwitcher.macroTab.export.info="Paste the string below into the import dialog to import the selected macros:"
 AdvSceneSwitcher.macroTab.export.usePlainText="Use plain text"
+AdvSceneSwitcher.macroTab.export.additionalContent="Export Additional Content"
+AdvSceneSwitcher.macroTab.export.variables="Variables"
+AdvSceneSwitcher.macroTab.export.actionQueues="Action Queues"
+AdvSceneSwitcher.macroTab.export.httpServers="HTTP Servers"
+AdvSceneSwitcher.macroTab.export.macroScheduleEntries="Macro Schedule"
+AdvSceneSwitcher.macroTab.export.twitchConnections="Twitch Connections"
+AdvSceneSwitcher.macroTab.export.websocketConnections="Websocket Connections"
 AdvSceneSwitcher.macroTab.import="Import"
 AdvSceneSwitcher.macroTab.import.info="Paste the export string into the below text box to import macros:"
 AdvSceneSwitcher.macroTab.import.invalid="Invalid import data provided!"
@@ -306,7 +320,6 @@ AdvSceneSwitcher.macroList.deleted="deleted"
 AdvSceneSwitcher.macroList.duplicate="\"%1\" is alreay selected!"
 
 # Macro Logic
-AdvSceneSwitcher.logic.none="Ignore entry"
 AdvSceneSwitcher.logic.and="And"
 AdvSceneSwitcher.logic.or="Or"
 AdvSceneSwitcher.logic.andNot="And not"
@@ -431,6 +444,7 @@ AdvSceneSwitcher.condition.video.ocrConfigReload="Reload configuration file"
 AdvSceneSwitcher.condition.video.ocrConfigHint="Tesseract config files consist of lines with parameter-value pairs (space separated).\nFor example:\n\ntessedit_char_blacklist\t\t\t\t\"abc\"\nlanguage_model_penalty_non_dict_word\t0"
 AdvSceneSwitcher.condition.video.modelLoadFail="Model data could not be loaded!"
 AdvSceneSwitcher.condition.video.selectColor="Select Color"
+AdvSceneSwitcher.condition.video.colorVariableTooltip="Expected format: #RRGGBB or #AARRGGBB\nInvalid values will default to black."
 AdvSceneSwitcher.condition.video.ocrMode.singleColumn="Single column of text of variable sizes"
 AdvSceneSwitcher.condition.video.ocrMode.singleBlockVertText="Single uniform block of vertically aligned text"
 AdvSceneSwitcher.condition.video.ocrMode.singleBlock="Single uniform block of text"
@@ -454,12 +468,12 @@ AdvSceneSwitcher.condition.video.layout.minNeighbor="Minimum neighbors:{{minNeig
 AdvSceneSwitcher.condition.video.layout.throttle="{{throttleEnable}}Reduce CPU load by performing check only every{{throttleCount}}milliseconds"
 AdvSceneSwitcher.condition.video.layout.checkAreaEnable="Perform check only in area"
 AdvSceneSwitcher.condition.video.layout.checkArea="{{checkAreaEnable}}{{checkArea}}{{selectArea}}"
-AdvSceneSwitcher.condition.video.layout.ocrColorPick="Check for text color:{{textColor}}{{selectColor}}"
+AdvSceneSwitcher.condition.video.layout.ocrColorPick="Check for text color:{{color}}"
 AdvSceneSwitcher.condition.video.layout.ocrTextType="Check for text type:{{textType}}"
 AdvSceneSwitcher.condition.video.layout.ocrBaseDir="Tesseract base directory:{{tesseractBaseDir}}"
 AdvSceneSwitcher.condition.video.layout.ocrLanguage="Check for language:{{languageCode}}"
 AdvSceneSwitcher.condition.video.layout.ocrConfig="Config file:{{configFile}}{{openConfigFile}}{{reloadConfig}}{{configFileHint}}"
-AdvSceneSwitcher.condition.video.layout.color="Check for color:{{color}}{{selectColor}}"
+AdvSceneSwitcher.condition.video.layout.color="Check for color:{{color}}"
 AdvSceneSwitcher.condition.video.minSize="Minimum size:"
 AdvSceneSwitcher.condition.video.maxSize="Maximum size:"
 AdvSceneSwitcher.condition.video.selectArea="Select area"
@@ -856,6 +870,7 @@ 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.mqtt="MQTT"
@@ -884,8 +899,18 @@ AdvSceneSwitcher.action.scene.canvasNotSupported="Not supported by the currently
 AdvSceneSwitcher.action.wait="Wait"
 AdvSceneSwitcher.action.wait.type.fixed="fixed"
 AdvSceneSwitcher.action.wait.type.random="random"
-AdvSceneSwitcher.action.wait.entry.fixed="Wait for{{waitType}}duration of{{duration}}"
-AdvSceneSwitcher.action.wait.entry.random="Wait for{{waitType}}duration from{{duration}}to{{duration2}}"
+AdvSceneSwitcher.action.wait.type.variableCondition="variable"
+AdvSceneSwitcher.action.wait.layout.fixed="Wait for{{waitType}}duration of{{duration}}"
+AdvSceneSwitcher.action.wait.layout.random="Wait for{{waitType}}duration from{{duration}}to{{duration2}}"
+AdvSceneSwitcher.action.wait.condition.equals="equals"
+AdvSceneSwitcher.action.wait.condition.doesNotEqual="does not equal"
+AdvSceneSwitcher.action.wait.condition.isEmpty="is empty"
+AdvSceneSwitcher.action.wait.condition.lessThan="is less than"
+AdvSceneSwitcher.action.wait.condition.greaterThan="is greater than"
+AdvSceneSwitcher.action.wait.layout.variableCondition="Wait until{{waitType}}{{variable}}{{condition}}{{strValue}}{{numValue}}{{regex}}"
+AdvSceneSwitcher.action.wait.layout.timeout="Timeout:{{useTimeout}}{{conditionTimeout}}"
+AdvSceneSwitcher.tempVar.wait.timedOut="Timed out"
+AdvSceneSwitcher.tempVar.wait.timedOut.description="True if the wait action timed out before the condition was met, false if the condition was met in time"
 AdvSceneSwitcher.action.audio="Audio"
 AdvSceneSwitcher.action.audio.type.mute="Mute"
 AdvSceneSwitcher.action.audio.type.unmute="Unmute"
@@ -925,7 +950,8 @@ AdvSceneSwitcher.action.recording.type.changeOutputFileFormat="Change filename f
 AdvSceneSwitcher.action.recording.type.addChapter="Add chapter"
 AdvSceneSwitcher.action.recording.pause.hint="Note that depending on your recording settings you might not be able to pause recording"
 AdvSceneSwitcher.action.recording.split.hint="Make sure to enable automatic file splitting in the OBS settings first!"
-AdvSceneSwitcher.action.recording.entry="{{actions}}{{recordFolder}}{{recordFileFormat}}{{chapterName}}{{pauseHint}}{{splitHint}}"
+AdvSceneSwitcher.action.recording.outputNotActive.hint="This change will only take effect when the Recording, Replay Buffer, ... output is not active.\nThe output needs to be restarted for the change to apply."
+AdvSceneSwitcher.action.recording.layout="{{actions}}{{recordFolder}}{{recordFileFormat}}{{outputNotActiveHelp}}{{chapterName}}{{pauseHint}}{{splitHint}}"
 AdvSceneSwitcher.action.replay="Replay buffer"
 AdvSceneSwitcher.action.replay.saveWarn="Warning: Saving too frequently might result in the replay buffer not actually being saved!"
 AdvSceneSwitcher.action.replay.durationWarn="Warning: Changing the maximum replay time will only apply the next time the replay buffer is started!"
@@ -956,6 +982,7 @@ AdvSceneSwitcher.action.sceneVisibility.type.sourceGroup="Any"
 AdvSceneSwitcher.action.sceneVisibility.layout="On{{scenes}}{{actions}}{{sources}}"
 AdvSceneSwitcher.action.sceneVisibility.layout.transition="{{updateTransition}}Set transition to{{transitions}}"
 AdvSceneSwitcher.action.sceneVisibility.layout.duration="{{updateDuration}}Set transition duration to{{duration}}seconds"
+AdvSceneSwitcher.action.sceneVisibility.blockUntilTransitionDone="Wait until visibility transition is complete"
 AdvSceneSwitcher.action.filter="Filter"
 AdvSceneSwitcher.action.filter.type.enable="Enable"
 AdvSceneSwitcher.action.filter.type.disable="Disable"
@@ -1076,8 +1103,8 @@ AdvSceneSwitcher.action.macro.type.runActions="Run macro actions"
 AdvSceneSwitcher.action.macro.type.run.conditions.ignore="Do not consider condition state"
 AdvSceneSwitcher.action.macro.type.run.conditions.true="Only if conditions evaluate to true"
 AdvSceneSwitcher.action.macro.type.run.conditions.false="Only if conditions evaluate to false"
-AdvSceneSwitcher.action.macro.type.run.updateConditionMatchState="Reevaluate the condition state before executing this action"
-AdvSceneSwitcher.action.macro.type.run.updateConditionMatchState.help="The plugin operates in phases:\n * The phase evaluating the macro conditions\n * The phase running macro actions\nMacros executed before this particular action might have side effects on the condition state of macros.\nCheck this option if you want those side effects to be taken into account when evaluating the condition state."
+AdvSceneSwitcher.action.macro.type.run.updateConditionMatchState="Check conditions now, even if macro is paused"
+AdvSceneSwitcher.action.macro.type.run.updateConditionMatchState.help="The plugin operates in phases:\n * The phase evaluating the macro conditions\n * The phase running macro actions\nMacros executed before this particular action might have side effects on the condition state of macros.\nAdditionally, paused macros are assumed to not match their conditions.\nCheck this option to force a fresh condition evaluation before running this action, regardless of whether the macro is paused."
 AdvSceneSwitcher.action.macro.type.run.actionType.regular="actions"
 AdvSceneSwitcher.action.macro.type.run.actionType.else="else-actions"
 AdvSceneSwitcher.action.macro.type.run.skipWhenPaused="Skip execution when macro is paused"
@@ -1274,6 +1301,8 @@ AdvSceneSwitcher.action.variable.type.stringLength="Set to length of string"
 AdvSceneSwitcher.action.variable.type.extractJsonField="Extract JSON field with name"
 AdvSceneSwitcher.action.variable.type.queryJson="Query JSON"
 AdvSceneSwitcher.action.variable.type.queryJson.info="You can use \"JSONPath\" (RFC 9535) syntax here.\nSo, for example:\n\n • $['books'][0]['category']\n • $.books[0].category\n\nIf the query or the JSON should be invalid, the variable value will not be changed.\nIf the input is valid, the result of the query will always be a JSON array."
+AdvSceneSwitcher.action.variable.type.queryJson.extractSingle="Extract value if single result"
+AdvSceneSwitcher.action.variable.type.queryJson.extractSingle.info="When enabled and the query returns exactly one result, the value is extracted from the result array and stored directly.\nIf the query matches zero or more than one element, the full JSON array is stored as usual."
 AdvSceneSwitcher.action.variable.type.accessJsonArray="Access JSON array at index"
 AdvSceneSwitcher.action.variable.type.setToTempvar="Set to macro property"
 AdvSceneSwitcher.action.variable.type.setToTempvar.help="This action type will allow you to extract values out of segments of the current macro and assign those values to the selected variable.\nFor example, you can get the current scene name from a scene condition and assign this name to a variable."
@@ -1306,6 +1335,7 @@ AdvSceneSwitcher.action.variable.actionNoVariableSupport="Getting variable value
 AdvSceneSwitcher.action.variable.conditionNoVariableSupport="Getting variable values from %1 conditions is not supported!"
 AdvSceneSwitcher.action.variable.currentSegmentValue="Current value:"
 AdvSceneSwitcher.action.variable.layout.other="{{actions}}{{variables}}{{variables2}}{{strValue}}{{numValue}}{{segmentIndex}}{{mathExpression}}{{envVariableName}}{{scenes}}{{tempVars}}{{tempVarsHelp}}{{sceneItemIndex}}{{direction}}{{stringLength}}{{paddingCharSelection}}{{caseType}}{{jsonQuery}}{{jsonQueryHelp}}{{jsonIndex}}"
+AdvSceneSwitcher.action.variable.layout.copy="{{actions}}{{variables2}}to{{variables}}"
 AdvSceneSwitcher.action.variable.layout.pad="{{actions}}of{{variables}}to length{{stringLength}}by adding{{paddingCharSelection}}to the{{direction}}"
 AdvSceneSwitcher.action.variable.layout.truncate="{{actions}}of{{variables}}to length{{stringLength}}by removing characters from the{{direction}}"
 AdvSceneSwitcher.action.variable.layout.substringIndex="Substring start:{{subStringStart}}Substring size:{{subStringSize}}{{subStringRegex}}"
@@ -1345,6 +1375,8 @@ AdvSceneSwitcher.action.twitch.type.channel.info.language.set="Set stream langua
 AdvSceneSwitcher.action.twitch.type.raid.start="Start raid"
 AdvSceneSwitcher.action.twitch.type.raid.end="Cancel raid"
 AdvSceneSwitcher.action.twitch.type.shoutout.send="Send shoutout"
+AdvSceneSwitcher.action.twitch.type.poll.start="Start poll"
+AdvSceneSwitcher.action.twitch.type.poll.end="End poll"
 AdvSceneSwitcher.action.twitch.type.shieldMode.start="Enable shield mode"
 AdvSceneSwitcher.action.twitch.type.shieldMode.end="Disable shield mode"
 AdvSceneSwitcher.action.twitch.type.commercial.start="Start commercial"
@@ -1376,6 +1408,7 @@ AdvSceneSwitcher.action.twitch.type.user.vip.add="Add user as VIP"
 AdvSceneSwitcher.action.twitch.type.user.vip.delete="Remove user as VIP"
 AdvSceneSwitcher.action.twitch.type.reward.getInfo="Get channel points reward information"
 AdvSceneSwitcher.action.twitch.type.channel.getInfo="Get channel information"
+AdvSceneSwitcher.action.twitch.type.channel.ads.getInfo="Get channel ad schedule"
 AdvSceneSwitcher.action.twitch.reward.toggleControl="Toggle reward name / variable selection control"
 AdvSceneSwitcher.action.twitch.categorySelectionDisabled="Cannot select category without selecting a Twitch account first!"
 AdvSceneSwitcher.action.twitch.layout.default="On{{account}}{{actions}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}}{{nonModDelayDuration}}{{channel}}{{pointsReward}}"
@@ -1389,6 +1422,10 @@ AdvSceneSwitcher.action.twitch.layout.user.ban.row1="Using account{{account}}{{a
 AdvSceneSwitcher.action.twitch.layout.user.ban.row2="on channel{{channel}}for{{userInfoQueryType}}{{userLogin}}{{userId}}reason{{banReason}}"
 AdvSceneSwitcher.action.twitch.layout.reward.getInfo.row1="Using account{{account}}{{actions}}for channel{{channel}}"
 AdvSceneSwitcher.action.twitch.layout.reward.getInfo.row2="{{pointsReward}}{{rewardVariable}}{{toggleRewardSelection}}"
+AdvSceneSwitcher.action.twitch.layout.poll.start.row1="Using account{{account}}{{actions}}"
+AdvSceneSwitcher.action.twitch.layout.poll.start.row2="on{{channel}}for{{duration}}"
+AdvSceneSwitcher.action.twitch.layout.poll.end.row1="Using account{{account}}{{actions}}"
+AdvSceneSwitcher.action.twitch.layout.poll.end.row2="on{{channel}}{{pollEndStatus}}"
 AdvSceneSwitcher.action.twitch.title.title="Enter title"
 AdvSceneSwitcher.action.twitch.marker.description="Describe marker"
 AdvSceneSwitcher.action.twitch.clip.hasDelay="Add a slight delay before capturing the clip"
@@ -1398,6 +1435,9 @@ AdvSceneSwitcher.action.twitch.announcement.blue="Blue"
 AdvSceneSwitcher.action.twitch.announcement.green="Green"
 AdvSceneSwitcher.action.twitch.announcement.orange="Orange"
 AdvSceneSwitcher.action.twitch.announcement.purple="Purple"
+AdvSceneSwitcher.action.twitch.poll.choices="Enter one choice per line (2-10 choices, max 25 characters each)"
+AdvSceneSwitcher.action.twitch.poll.end.terminated="Terminate (show results)"
+AdvSceneSwitcher.action.twitch.poll.end.archived="Archive (hide results)"
 AdvSceneSwitcher.action.twitch.user.getInfo.queryType.id="User Id"
 AdvSceneSwitcher.action.twitch.user.getInfo.queryType.login="User login"
 AdvSceneSwitcher.action.twitch.tags.add="Add Channel Tag"
@@ -1869,8 +1909,10 @@ AdvSceneSwitcher.tempVar.twitch.user_login.subscribe.message="Subscriber Twitch
 AdvSceneSwitcher.tempVar.twitch.user_login.subscribe.message.description="The user login of the user who sent a resubscription chat message."
 AdvSceneSwitcher.tempVar.twitch.user_name.subscribe.message="Subscriber Twitch user name"
 AdvSceneSwitcher.tempVar.twitch.user_name.subscribe.message.description="The user display name of the user who a resubscription chat message."
-AdvSceneSwitcher.tempVar.twitch.message.subscribe="Subscription message"
-AdvSceneSwitcher.tempVar.twitch.message.subscribe.description="An object that contains the resubscription message and emote information needed to recreate the message."
+AdvSceneSwitcher.tempVar.twitch.message.subscribe="Subscription message (JSON)"
+AdvSceneSwitcher.tempVar.twitch.message.subscribe.description="A JSON object containing the resubscription message text and emote information. Use 'Subscription message text' to get the plain text."
+AdvSceneSwitcher.tempVar.twitch.message_text.subscribe="Subscription message text"
+AdvSceneSwitcher.tempVar.twitch.message_text.subscribe.description="The plain text of the resubscription message, with emotes replaced by their names."
 AdvSceneSwitcher.tempVar.twitch.cumulative_months.subscribe="Number of months subscribed"
 AdvSceneSwitcher.tempVar.twitch.cumulative_months.subscribe.description="The total number of months the user has been subscribed to the channel."
 AdvSceneSwitcher.tempVar.twitch.streak_months.subscribe="Subscription streak"
@@ -2259,6 +2301,19 @@ AdvSceneSwitcher.tempVar.twitch.requester_user_login.commercial.description="The
 AdvSceneSwitcher.tempVar.twitch.requester_user_name.commercial="Requester user name"
 AdvSceneSwitcher.tempVar.twitch.requester_user_name.commercial.description="The display name of the user that requested the ad."
 
+AdvSceneSwitcher.tempVar.twitch.snooze_count.ads="Snooze count"
+AdvSceneSwitcher.tempVar.twitch.snooze_count.ads.description="The number of snoozes available for the broadcaster."
+AdvSceneSwitcher.tempVar.twitch.snooze_refresh_at.ads="Snooze refresh time"
+AdvSceneSwitcher.tempVar.twitch.snooze_refresh_at.ads.description="The UTC timestamp of when the broadcaster will have an additional snooze available, in RFC3339 format."
+AdvSceneSwitcher.tempVar.twitch.next_ad_at.ads="Next ad time"
+AdvSceneSwitcher.tempVar.twitch.next_ad_at.ads.description="The UTC timestamp of when the channel's next scheduled ad break will begin, in RFC3339 format."
+AdvSceneSwitcher.tempVar.twitch.duration.ads="Ad duration"
+AdvSceneSwitcher.tempVar.twitch.duration.ads.description="The length in seconds of the scheduled ad break."
+AdvSceneSwitcher.tempVar.twitch.last_ad_at.ads="Last ad time"
+AdvSceneSwitcher.tempVar.twitch.last_ad_at.ads.description="The UTC timestamp of the channel's last ad break, in RFC3339 format."
+AdvSceneSwitcher.tempVar.twitch.preroll_free_time.ads="Pre-roll free time"
+AdvSceneSwitcher.tempVar.twitch.preroll_free_time.ads.description="The amount of time in seconds the broadcaster must wait before running another commercial."
+
 AdvSceneSwitcher.tempVar.audio.output_volume="Output volume"
 AdvSceneSwitcher.tempVar.audio.output_volume.description="The volume the audio source is outputting."
 AdvSceneSwitcher.tempVar.audio.configured_volume="Configured volume"
@@ -2280,6 +2335,14 @@ AdvSceneSwitcher.tempVar.scene.position="Position in scenes list"
 
 AdvSceneSwitcher.tempVar.window.window="Window title"
 AdvSceneSwitcher.tempVar.window.window.description="The window title of the matching window."
+AdvSceneSwitcher.tempVar.window.windowX="Window X position"
+AdvSceneSwitcher.tempVar.window.windowX.description="The X position (left edge) of the matching window in screen coordinates."
+AdvSceneSwitcher.tempVar.window.windowY="Window Y position"
+AdvSceneSwitcher.tempVar.window.windowY.description="The Y position (top edge) of the matching window in screen coordinates."
+AdvSceneSwitcher.tempVar.window.windowWidth="Window width"
+AdvSceneSwitcher.tempVar.window.windowWidth.description="The width of the matching window in pixels."
+AdvSceneSwitcher.tempVar.window.windowHeight="Window height"
+AdvSceneSwitcher.tempVar.window.windowHeight.description="The height of the matching window in pixels."
 AdvSceneSwitcher.tempVar.window.windowClass="Window class"
 AdvSceneSwitcher.tempVar.window.windowClass.description="The window class of the matching window."
 AdvSceneSwitcher.tempVar.window.windowText="Window text"
@@ -2345,6 +2408,14 @@ AdvSceneSwitcher.tempVar.video.similarity="Similarity Rating"
 AdvSceneSwitcher.tempVar.video.similarity.description="Values range from 0 to 1, where 0 means dissimilar and 1 means highly similar."
 AdvSceneSwitcher.tempVar.video.patternCount="Pattern count"
 AdvSceneSwitcher.tempVar.video.patternCount.description="The number of times the given pattern has been found in a given video input frame."
+AdvSceneSwitcher.tempVar.video.matchX="Match X coordinate"
+AdvSceneSwitcher.tempVar.video.matchX.description="The X coordinate of the top-left corner of the best pattern match.\nIf the 'check area' option is enabled, the coordinate is relative to the video source, not the area.\nSet to -1 if no match was found."
+AdvSceneSwitcher.tempVar.video.matchY="Match Y coordinate"
+AdvSceneSwitcher.tempVar.video.matchY.description="The Y coordinate of the top-left corner of the best pattern match.\nIf the 'check area' option is enabled, the coordinate is relative to the video source, not the area.\nSet to -1 if no match was found."
+AdvSceneSwitcher.tempVar.video.matchWidth="Match width"
+AdvSceneSwitcher.tempVar.video.matchWidth.description="The width of the matched pattern in pixels."
+AdvSceneSwitcher.tempVar.video.matchHeight="Match height"
+AdvSceneSwitcher.tempVar.video.matchHeight.description="The height of the matched pattern in pixels."
 AdvSceneSwitcher.tempVar.video.objectCount="Object count"
 AdvSceneSwitcher.tempVar.video.objectCount.description="The number of objects the given model has identified in a given video input frame."
 AdvSceneSwitcher.tempVar.video.brightness="Average brightness"
@@ -2538,6 +2609,9 @@ AdvSceneSwitcher.selectDisplay="--select display--"
 AdvSceneSwitcher.invaildEntriesWillNotBeSaved="invalid entries will not be saved"
 AdvSceneSwitcher.selectWindowTip="Use \"OBS\" to specify OBS window\nUse \"Task Switching\"to specify ALT + TAB"
 
+AdvSceneSwitcher.keepSourceActive="Keep source active"
+AdvSceneSwitcher.keepSourceActive.help="When a source is not visible in the active scene it becomes inactive, which can cause it to stop producing output (e.g. video frames or game capture hooks).\nEnabling this option forces the source to remain active at all times, ensuring it continues to produce output even when not displayed.\n\nNote: Keeping a source permanently active may increase CPU and GPU usage, as the source continues to run even when not shown."
+
 AdvSceneSwitcher.settings.suffix.type.invalid=" (Invalid)"
 AdvSceneSwitcher.settings.suffix.type.bool=" (Bool)"
 AdvSceneSwitcher.settings.suffix.type.int=" (Int)"
@@ -2642,7 +2716,28 @@ FirstRunWizard.windowTitle="Advanced Scene Switcher - Setup Wizard"
 
 FirstRunWizard.welcome.title="Welcome to Advanced Scene Switcher"
 FirstRunWizard.welcome.subtitle="Let's create your first automation in a few easy steps."
-FirstRunWizard.welcome.body="<p>Advanced Scene Switcher lets you build <b>Macros</b> - rules of the form:</p><blockquote><i>When [condition] -> perform [action]</i></blockquote><p>This wizard creates a macro that <b>switches to a chosen OBS scene whenever a specific window comes into focus</b>.</p><p>You can skip at any time. Re-open this wizard later from the <b>General</b> tab inside the Advanced Scene Switcher dialog.</p>"
+FirstRunWizard.welcome.body="<p>Advanced Scene Switcher lets you build <b>Macros</b> - rules of the form:</p><blockquote><i>When [condition] -> perform [action]</i></blockquote><p>This wizard will guide you through creating your first automation. On the next page, choose the type of macro you want to set up.</p><p>You can skip at any time. Re-open this wizard later from the <b>General</b> tab inside the Advanced Scene Switcher dialog.</p>"
+
+FirstRunWizard.template.title="Choose an Automation Type"
+FirstRunWizard.template.subtitle="Select the kind of macro you would like to create."
+FirstRunWizard.template.window="Switch to a scene when a window comes into focus"
+FirstRunWizard.template.sequence="Run a timed sequence of scene switches"
+FirstRunWizard.template.audio="Show or hide a source based on audio activity"
+
+FirstRunWizard.audio.source.title="Choose an Audio Source"
+FirstRunWizard.audio.source.subtitle="Select the audio source to monitor and configure when it should be considered active."
+FirstRunWizard.audio.source.sourceRow="Audio source:{{source}}"
+FirstRunWizard.audio.source.thresholdRow="Show when volume is above{{threshold}}for{{duration}}"
+
+FirstRunWizard.audio.target.title="Choose a Target Source"
+FirstRunWizard.audio.target.subtitle="Select the source to show when audio is active and hide when it is not."
+FirstRunWizard.audio.target.sourceRow="Source to show/hide:{{source}}"
+
+FirstRunWizard.audio.review.title="Review Your Macro"
+FirstRunWizard.audio.review.subtitle="Click Back to make changes, or Finish to create the macro."
+FirstRunWizard.audio.review.summary="<b>When</b> <i>%1</i> output volume is above <b>%2 dB</b> for <b>%3</b>:<br><br>&nbsp;&nbsp;<b>Show</b> <i>%4</i> on the current scene<br><br><b>Otherwise:</b><br><br>&nbsp;&nbsp;<b>Hide</b> <i>%4</i> on the current scene"
+FirstRunWizard.audio.review.errorTitle="Macro Creation Failed"
+FirstRunWizard.audio.review.errorBody="The audio macro could not be created. Please check the OBS log for details."
 
 FirstRunWizard.scene.title="Choose a Target Scene"
 FirstRunWizard.scene.subtitle="Which OBS scene should become active when your chosen window comes into focus?"
@@ -2663,6 +2758,26 @@ FirstRunWizard.review.summary="<b>Macro name:</b> Window -> %1<br><br><b>Conditi
 FirstRunWizard.review.errorTitle="Macro Creation Failed"
 FirstRunWizard.review.errorBody="The macro could not be created automatically.\n\nYou can create it manually on the Macros tab:\n  Condition: Window -> contains \"%1\"\n  Action:    Switch scene -> \"%2\""
 
+FirstRunWizard.seqTrigger.title="Choose a Trigger Scene"
+FirstRunWizard.seqTrigger.subtitle="The sequence will start when you have been on this scene for the specified duration."
+FirstRunWizard.seqTrigger.scene="Trigger scene:{{scene}}"
+FirstRunWizard.seqTrigger.delay="Start sequence after{{duration}}"
+
+FirstRunWizard.seqScenes.title="Build Your Sequence"
+FirstRunWizard.seqScenes.subtitle="Add at least two scenes. The plugin will switch through them in order, waiting the configured time between each switch."
+FirstRunWizard.seqScenes.triggerInfo="When on \"%1\" for %2, switch to:"
+FirstRunWizard.seqScenes.addScene="Add scene"
+FirstRunWizard.seqScenes.removeTooltip="Remove this scene from the sequence"
+FirstRunWizard.seqScenes.switchTo="Switch to{{scene}}"
+FirstRunWizard.seqScenes.thenWait="then wait{{duration}}"
+
+FirstRunWizard.seqReview.title="Review Your Sequence"
+FirstRunWizard.seqReview.subtitle="Click Back to make changes, or Finish to create the macro."
+FirstRunWizard.seqReview.trigger="When on <b>%1</b> for at least <b>%2</b>:"
+FirstRunWizard.seqReview.step="After %1, switch to %2"
+FirstRunWizard.seqReview.errorTitle="Macro Creation Failed"
+FirstRunWizard.seqReview.errorBody="The sequence macro could not be created. Please check the OBS log for details."
+
 FirstRunWizard.done.title="You're all set!"
 FirstRunWizard.done.subtitle="Your first macro has been created and is now active."
 FirstRunWizard.done.body="<p>You can view and edit it on the <b>Macros</b> tab of the Advanced Scene Switcher dialog.</p><p>To learn more:</p><ul><li><a href=\"https://github.com/WarmUpTill/SceneSwitcher/wiki\">Plugin wiki</a></li><li><a href=\"https://obsproject.com/forum/resources/automatic-scene-switching.395/\">OBS forum thread</a></li></ul>"
@@ -2705,6 +2820,64 @@ Basic.Settings.Video.FPSCommon="Common FPS Values"
 Basic.Settings.Video.FPSInteger="Integer FPS Value"
 Basic.Settings.Video.FPSFraction="Fractional FPS Value"
 
+# Calendar widget
+AdvSceneSwitcher.calendar.today="Today"
+AdvSceneSwitcher.calendar.month="Month"
+AdvSceneSwitcher.calendar.week="Week"
+AdvSceneSwitcher.calendar.day="Day"
+AdvSceneSwitcher.calendar.moreEvents="+%1 more"
+
+# Macro Schedule tab
+AdvSceneSwitcher.macroScheduleTab.title="Macro Schedule"
+AdvSceneSwitcher.macroScheduleTab.help="No scheduled entries.\nClick '+' to schedule a macro."
+AdvSceneSwitcher.macroScheduleTab.add="Add"
+AdvSceneSwitcher.macroScheduleTab.add.tooltip="Add schedule entry"
+AdvSceneSwitcher.macroScheduleTab.edit="Edit"
+AdvSceneSwitcher.macroScheduleTab.remove="Remove"
+AdvSceneSwitcher.macroScheduleTab.remove.tooltip="Remove schedule entry"
+AdvSceneSwitcher.macroScheduleTab.enable="Enable"
+AdvSceneSwitcher.macroScheduleTab.disable="Disable"
+AdvSceneSwitcher.macroScheduleTab.showAll="Show All"
+AdvSceneSwitcher.macroScheduleTab.column.name="Name"
+AdvSceneSwitcher.macroScheduleTab.column.macro="Macro"
+AdvSceneSwitcher.macroScheduleTab.column.schedule="Schedule"
+AdvSceneSwitcher.macroScheduleTab.column.nextTrigger="Next Trigger"
+AdvSceneSwitcher.macroScheduleTab.column.status="Status"
+AdvSceneSwitcher.macroScheduleTab.remove.confirm="Are you sure you want to remove \"%1\"?"
+AdvSceneSwitcher.macroScheduleTab.remove.confirmMultiple="Are you sure you want to remove %1 entries?"
+AdvSceneSwitcher.macroScheduleTab.status.active="Active"
+AdvSceneSwitcher.macroScheduleTab.status.disabled="Disabled"
+AdvSceneSwitcher.macroScheduleTab.status.expired="Expired"
+
+# Macro Schedule entry dialog
+AdvSceneSwitcher.macroScheduleEntry.dialog.title.add="Add Schedule Entry"
+AdvSceneSwitcher.macroScheduleEntry.dialog.title.edit="Edit Schedule Entry"
+AdvSceneSwitcher.macroScheduleEntry.name="Name (optional):"
+AdvSceneSwitcher.macroScheduleEntry.name.placeholder="e.g. Daily stream start"
+AdvSceneSwitcher.macroScheduleEntry.macro="Macro:"
+AdvSceneSwitcher.macroScheduleEntry.startDateTime="Start:"
+AdvSceneSwitcher.macroScheduleEntry.endDate="End date:"
+AdvSceneSwitcher.macroScheduleEntry.endDate.help="Controls how far the entry spans visually in the calendar and optionally triggers an action when the date is reached."
+AdvSceneSwitcher.macroScheduleEntry.endDate.action.none="No action"
+AdvSceneSwitcher.macroScheduleEntry.endDate.action.disableEntry="Disable schedule entry"
+AdvSceneSwitcher.macroScheduleEntry.endDate.action.pauseMacro="Pause macro"
+AdvSceneSwitcher.macroScheduleEntry.endDate.action.stopMacro="Stop macro"
+AdvSceneSwitcher.macroScheduleEntry.repeat="Repeat"
+AdvSceneSwitcher.macroScheduleEntry.repeat.once="Once"
+AdvSceneSwitcher.macroScheduleEntry.repeat.every="Every %1"
+AdvSceneSwitcher.macroScheduleEntry.repeat.interval="Repeat interval:"
+AdvSceneSwitcher.macroScheduleEntry.noMacro="(no macro)"
+AdvSceneSwitcher.macroScheduleEntry.repeatEnd="End repeat:"
+AdvSceneSwitcher.macroScheduleEntry.repeatEnd.never="Never"
+AdvSceneSwitcher.macroScheduleEntry.repeatEnd.afterNTimes="After"
+AdvSceneSwitcher.macroScheduleEntry.repeatEnd.afterNTimes.suffix="occurrence(s)"
+AdvSceneSwitcher.macroScheduleEntry.repeatEnd.untilDate="Until"
+AdvSceneSwitcher.macroScheduleEntry.color="Color:"
+AdvSceneSwitcher.macroScheduleEntry.color.dialog="Pick entry color"
+AdvSceneSwitcher.macroScheduleEntry.checkConditions="Check macro conditions before running"
+AdvSceneSwitcher.macroScheduleEntry.runElseActionsOnConditionFailure="Run else actions if conditions are not met"
+AdvSceneSwitcher.macroScheduleEntry.enabled="Enabled"
+
 # Legacy tabs below - please don't waste your time adding translations for these :)
 # Transition Tab
 AdvSceneSwitcher.transitionTab.title="Transition"

data/locale/es-ES.ini

@@ -83,7 +83,6 @@ AdvSceneSwitcher.macroTab.highlightTrueConditions="Resaltar condiciones de la ma
 AdvSceneSwitcher.macroTab.highlightPerformedActions="Resaltar acciones realizadas recientemente de la macro seleccionada actualmente"
 
 ; Lógica de macros
-AdvSceneSwitcher.logic.none="Omitir entrada"
 AdvSceneSwitcher.logic.and="Y"
 AdvSceneSwitcher.logic.or="O"
 AdvSceneSwitcher.logic.andNot="Y no"
@@ -313,8 +312,8 @@ AdvSceneSwitcher.action.scene.blockUntilTransitionDone="Espere hasta que se comp
 AdvSceneSwitcher.action.wait="Esperar"
 AdvSceneSwitcher.action.wait.type.fixed="fijo"
 AdvSceneSwitcher.action.wait.type.random="aleatorio"
-AdvSceneSwitcher.action.wait.entry.fixed="Espere {{waitType}} de {{duration}}"
-AdvSceneSwitcher.action.wait.entry.random="Espere {{waitType}} de {{duration}} a {{duration2}}"
+AdvSceneSwitcher.action.wait.layout.fixed="Espere {{waitType}} de {{duration}}"
+AdvSceneSwitcher.action.wait.layout.random="Espere {{waitType}} de {{duration}} a {{duration2}}"
 AdvSceneSwitcher.action.audio="Audio"
 AdvSceneSwitcher.action.audio.type.mute="Silencio"
 AdvSceneSwitcher.action.audio.type.unmute="Activar silencio"

data/locale/fr-FR.ini

@@ -131,7 +131,6 @@ AdvSceneSwitcher.macroList.deleted="supprimé"
 AdvSceneSwitcher.macroList.duplicate="\"%1\" est déjà sélectionné !"
 
 ; Macro Logic
-AdvSceneSwitcher.logic.none="Ignorer l'entrée"
 AdvSceneSwitcher.logic.and="Et"
 AdvSceneSwitcher.logic.or="Ou"
 AdvSceneSwitcher.logic.andNot="Et pas"
@@ -258,10 +257,10 @@ AdvSceneSwitcher.condition.video.layout.modelPath="Données du modèle (classifi
 AdvSceneSwitcher.condition.video.layout.minNeighbor="Nombre minimum de voisins :{{minNeighbors}}"
 AdvSceneSwitcher.condition.video.layout.throttle="{{throttleEnable}}Réduire la charge CPU en effectuant la vérification uniquement toutes les{{throttleCount}}millisecondes"
 AdvSceneSwitcher.condition.video.layout.checkAreaEnable="Effectuer la vérification uniquement dans la zone"
-AdvSceneSwitcher.condition.video.layout.ocrColorPick="Vérifier la couleur du texte :{{textColor}}{{selectColor}}"
+AdvSceneSwitcher.condition.video.layout.ocrColorPick="Vérifier la couleur du texte :{{color}}"
 AdvSceneSwitcher.condition.video.layout.ocrTextType="Vérifier le type de texte :{{textType}}"
 AdvSceneSwitcher.condition.video.layout.ocrLanguage="Vérifier la langue :{{languageCode}}"
-AdvSceneSwitcher.condition.video.layout.color="Vérifier la couleur :{{color}}{{selectColor}}"
+AdvSceneSwitcher.condition.video.layout.color="Vérifier la couleur :{{color}}"
 AdvSceneSwitcher.condition.video.minSize="Taille minimale :"
 AdvSceneSwitcher.condition.video.maxSize="Taille maximale :"
 AdvSceneSwitcher.condition.video.selectArea="Sélectionner la zone"
@@ -461,8 +460,8 @@ AdvSceneSwitcher.action.scene.blockUntilTransitionDone="Attendre que la transiti
 AdvSceneSwitcher.action.wait="Attendre"
 AdvSceneSwitcher.action.wait.type.fixed="fixe"
 AdvSceneSwitcher.action.wait.type.random="aléatoire"
-AdvSceneSwitcher.action.wait.entry.fixed="Attendre pour{{waitType}}une durée de{{duration}}"
-AdvSceneSwitcher.action.wait.entry.random="Attendre pour{{waitType}}une durée de{{duration}}à{{duration2}}"
+AdvSceneSwitcher.action.wait.layout.fixed="Attendre pour{{waitType}}une durée de{{duration}}"
+AdvSceneSwitcher.action.wait.layout.random="Attendre pour{{waitType}}une durée de{{duration}}à{{duration2}}"
 AdvSceneSwitcher.action.audio="Audio"
 AdvSceneSwitcher.action.audio.type.mute="Muet"
 AdvSceneSwitcher.action.audio.type.unmute="Activer le son"

data/locale/ja-JP.ini

@@ -275,7 +275,6 @@ AdvSceneSwitcher.macroList.deleted="削除"
 AdvSceneSwitcher.macroList.duplicate="\"%1\" はすでに選択されています!"
 
 # Macro Logic
-AdvSceneSwitcher.logic.none="入力無視"
 ; AdvSceneSwitcher.logic.and="And"
 ; AdvSceneSwitcher.logic.or="Or"
 ; AdvSceneSwitcher.logic.andNot="And not"
@@ -415,12 +414,12 @@ AdvSceneSwitcher.condition.video.layout.minNeighbor="最小近傍数:{{minNeighb
 AdvSceneSwitcher.condition.video.layout.throttle="{{throttleEnable}}:{{throttleCount}}ミリ秒ごとにのみパフォーマンスチェックを実行することでCPU負荷を軽減します"
 AdvSceneSwitcher.condition.video.layout.checkAreaEnable="エリア内のみチェックを実施"
 ; AdvSceneSwitcher.condition.video.layout.checkArea="{{checkAreaEnable}}{{checkArea}}{{selectArea}}"
-AdvSceneSwitcher.condition.video.layout.ocrColorPick="テキストカラーの確認:{{textColor}}{{selectColor}}"
+AdvSceneSwitcher.condition.video.layout.ocrColorPick="テキストカラーの確認:{{color}}"
 AdvSceneSwitcher.condition.video.layout.ocrTextType="テキストタイプの確認:{{textType}}"
 AdvSceneSwitcher.condition.video.layout.ocrBaseDir="Tesseractベースディレクトリ:{{tesseractBaseDir}}"
 AdvSceneSwitcher.condition.video.layout.ocrLanguage="言語の確認:{{languageCode}}"
 AdvSceneSwitcher.condition.video.layout.ocrConfig="設定ファイル:{{configFile}}{{openConfigFile}}{{reloadConfig}}{{configFileHint}}"
-AdvSceneSwitcher.condition.video.layout.color="カラーを確認してください:{{color}}{{selectColor}}"
+AdvSceneSwitcher.condition.video.layout.color="カラーを確認してください:{{color}}"
 AdvSceneSwitcher.condition.video.minSize="最小サイズ："
 AdvSceneSwitcher.condition.video.maxSize="最大サイズ："
 AdvSceneSwitcher.condition.video.selectArea="範囲指定"
@@ -801,8 +800,8 @@ AdvSceneSwitcher.action.scene.blockUntilTransitionDone="目的のシーンへの
 ; AdvSceneSwitcher.action.wait="Wait"
 AdvSceneSwitcher.action.wait.type.fixed="指定"
 AdvSceneSwitcher.action.wait.type.random="ランダム"
-AdvSceneSwitcher.action.wait.entry.fixed="{{waitType}}期間{{duration}}待機します"
-AdvSceneSwitcher.action.wait.entry.random="{{duration}}から{{duration2}}までの{{waitType}}期間待ちます"
+AdvSceneSwitcher.action.wait.layout.fixed="{{waitType}}期間{{duration}}待機します"
+AdvSceneSwitcher.action.wait.layout.random="{{duration}}から{{duration2}}までの{{waitType}}期間待ちます"
 AdvSceneSwitcher.action.audio="音声"
 AdvSceneSwitcher.action.audio.type.mute="ミュート"
 AdvSceneSwitcher.action.audio.type.unmute="ミュート解除"
@@ -831,7 +830,6 @@ AdvSceneSwitcher.action.recording.type.changeOutputFolder="出力フォルダの
 AdvSceneSwitcher.action.recording.type.changeOutputFileFormat="ファイル名の書式変更"
 AdvSceneSwitcher.action.recording.pause.hint="録画設定によっては録画を一時停止できない場合がありますのでご注意ください"
 AdvSceneSwitcher.action.recording.split.hint="まずOBS設定で自動ファイル分割を有効にしてください！"
-; AdvSceneSwitcher.action.recording.entry="{{actions}}{{recordFolder}}{{recordFileFormat}}{{pauseHint}}{{splitHint}}"
 AdvSceneSwitcher.action.replay="リプレイバッファー"
 AdvSceneSwitcher.action.replay.saveWarn="警告: 頻繁に保存しすぎると、リプレイ バッファーが実際には保存されなくなる可能性があります。"
 AdvSceneSwitcher.action.replay.durationWarn="注意: 最大リプレイ時間の変更は、次回再生バッファを開始したときから適用されます！"

data/locale/pt-BR.ini

@@ -239,7 +239,6 @@ AdvSceneSwitcher.macroList.deleted="excluída"
 AdvSceneSwitcher.macroList.duplicate="\"%1\" já está selecionada!"
 
 ; Macro Logic
-AdvSceneSwitcher.logic.none="Ignorar entrada"
 AdvSceneSwitcher.logic.and="E"
 AdvSceneSwitcher.logic.or="Ou"
 AdvSceneSwitcher.logic.andNot="E não"
@@ -372,10 +371,10 @@ AdvSceneSwitcher.condition.video.layout.minNeighbor="Vizinhos mínimos:{{minNeig
 AdvSceneSwitcher.condition.video.layout.throttle="{{throttleEnable}}Reduzir carga de CPU realizando a verificação apenas a cada {{throttleCount}} milissegundos"
 AdvSceneSwitcher.condition.video.layout.checkAreaEnable="Realizar verificação apenas na área"
 AdvSceneSwitcher.condition.video.layout.checkArea="{{checkAreaEnable}}{{checkArea}}{{selectArea}}"
-AdvSceneSwitcher.condition.video.layout.ocrColorPick="Verificar cor do texto:{{textColor}}{{selectColor}}"
+AdvSceneSwitcher.condition.video.layout.ocrColorPick="Verificar cor do texto:{{color}}"
 AdvSceneSwitcher.condition.video.layout.ocrTextType="Verificar tipo de texto:{{textType}}"
 AdvSceneSwitcher.condition.video.layout.ocrLanguage="Verificar idioma:{{languageCode}}"
-AdvSceneSwitcher.condition.video.layout.color="Verificar cor:{{color}}{{selectColor}}"
+AdvSceneSwitcher.condition.video.layout.color="Verificar cor:{{color}}"
 AdvSceneSwitcher.condition.video.minSize="Tamanho mínimo:"
 AdvSceneSwitcher.condition.video.maxSize="Tamanho máximo:"
 AdvSceneSwitcher.condition.video.selectArea="Selecionar área"
@@ -719,8 +718,8 @@ AdvSceneSwitcher.action.scene.blockUntilTransitionDone="Aguardar até que a tran
 AdvSceneSwitcher.action.wait="Aguardar"
 AdvSceneSwitcher.action.wait.type.fixed="fixo"
 AdvSceneSwitcher.action.wait.type.random="aleatório"
-AdvSceneSwitcher.action.wait.entry.fixed="Aguardando por{{waitType}}duração de{{duration}}"
-AdvSceneSwitcher.action.wait.entry.random="Aguardando por{{waitType}}duração de{{duration}}para{{duration2}}"
+AdvSceneSwitcher.action.wait.layout.fixed="Aguardando por{{waitType}}duração de{{duration}}"
+AdvSceneSwitcher.action.wait.layout.random="Aguardando por{{waitType}}duração de{{duration}}para{{duration2}}"
 AdvSceneSwitcher.action.audio="Áudio"
 AdvSceneSwitcher.action.audio.type.mute="Silenciar"
 AdvSceneSwitcher.action.audio.type.unmute="Ativar som"

data/locale/ru-RU.ini

@@ -70,7 +70,6 @@ AdvSceneSwitcher.macroTab.name="Имя:"
 AdvSceneSwitcher.macroTab.defaultname="Макрос %1"
 AdvSceneSwitcher.macroTab.copy="Создать копию"
 ; Macro Logic
-AdvSceneSwitcher.logic.none="Игнорировать вход"
 AdvSceneSwitcher.logic.and="И"
 AdvSceneSwitcher.logic.or="Или"
 AdvSceneSwitcher.logic.andNot="И не"
@@ -115,8 +114,8 @@ AdvSceneSwitcher.action.scene="Переключить сцену"
 AdvSceneSwitcher.action.wait="Подождать"
 AdvSceneSwitcher.action.wait.type.fixed="фиксированный"
 AdvSceneSwitcher.action.wait.type.random="случайный"
-AdvSceneSwitcher.action.wait.entry.fixed="Ожидать {{waitType}} в течении {{duration}}"
-AdvSceneSwitcher.action.wait.entry.random="Ожидание {{waitType}} длительностью от {{duration}} до {{duration2}}"
+AdvSceneSwitcher.action.wait.layout.fixed="Ожидать {{waitType}} в течении {{duration}}"
+AdvSceneSwitcher.action.wait.layout.random="Ожидание {{waitType}} длительностью от {{duration}} до {{duration2}}"
 AdvSceneSwitcher.action.audio="Аудио"
 AdvSceneSwitcher.action.audio.type.mute="Замьютить"
 AdvSceneSwitcher.action.audio.type.unmute="Размьютить"

data/locale/tr-TR.ini

@@ -78,7 +78,6 @@ AdvSceneSwitcher.macroTab.expandAll="Hepsini Genişlet"
 AdvSceneSwitcher.macroTab.collapseAll="Hepsini Küçült"
 
 ; Macro Logic
-AdvSceneSwitcher.logic.none="Girişi yoksay"
 AdvSceneSwitcher.logic.and="Ve"
 AdvSceneSwitcher.logic.or="Ya da"
 AdvSceneSwitcher.logic.andNot="ve değil"
@@ -250,8 +249,8 @@ AdvSceneSwitcher.action.scene.blockUntilTransitionDone="Hedef sahneye geçiş ta
 AdvSceneSwitcher.action.wait="Bekle"
 AdvSceneSwitcher.action.wait.type.fixed="sabit"
 AdvSceneSwitcher.action.wait.type.random="rastgele"
-AdvSceneSwitcher.action.wait.entry.fixed="Şunu bekle {{waitType}} süre {{duration}}"
-AdvSceneSwitcher.action.wait.entry.random="Şunu bekle {{waitType}} bu aralıktan {{duration}} buna {{duration2}}"
+AdvSceneSwitcher.action.wait.layout.fixed="Şunu bekle {{waitType}} süre {{duration}}"
+AdvSceneSwitcher.action.wait.layout.random="Şunu bekle {{waitType}} bu aralıktan {{duration}} buna {{duration2}}"
 AdvSceneSwitcher.action.audio="Ses"
 AdvSceneSwitcher.action.audio.type.mute="Sessiz"
 AdvSceneSwitcher.action.audio.type.unmute="Ses açmak"

data/locale/zh-CN.ini

@@ -259,7 +259,6 @@ AdvSceneSwitcher.macroList.deleted="删除"
 AdvSceneSwitcher.macroList.duplicate="\"%1\" 已选择！"
 
 ; Macro Logic
-AdvSceneSwitcher.logic.none="忽略条件"
 AdvSceneSwitcher.logic.and="且"
 AdvSceneSwitcher.logic.or="或"
 AdvSceneSwitcher.logic.andNot="且不"
@@ -396,10 +395,10 @@ AdvSceneSwitcher.condition.video.layout.minNeighbor="最小区域: {{minNeighbor
 AdvSceneSwitcher.condition.video.layout.throttle="{{throttleEnable}}每隔{{throttleCount}} 毫秒,才执行一次检查,从而减少 CPU 负载."
 AdvSceneSwitcher.condition.video.layout.checkAreaEnable="仅在区域内执行检查"
 AdvSceneSwitcher.condition.video.layout.checkArea="{{checkAreaEnable}}{{checkArea}}{{selectArea}}"
-AdvSceneSwitcher.condition.video.layout.ocrColorPick="文本检查颜色:{{textColor}}{{selectColor}}"
+AdvSceneSwitcher.condition.video.layout.ocrColorPick="文本检查颜色:{{color}}"
 AdvSceneSwitcher.condition.video.layout.ocrTextType="文本检查类型:{{textType}}"
 AdvSceneSwitcher.condition.video.layout.ocrLanguage="语言检查:{{languageCode}}"
-AdvSceneSwitcher.condition.video.layout.color="颜色检查:{{color}}{{selectColor}}"
+AdvSceneSwitcher.condition.video.layout.color="颜色检查:{{color}}"
 AdvSceneSwitcher.condition.video.minSize="最小尺寸:"
 AdvSceneSwitcher.condition.video.maxSize="最大尺寸:"
 AdvSceneSwitcher.condition.video.selectArea="选择区域"
@@ -779,8 +778,8 @@ AdvSceneSwitcher.action.scene.blockUntilTransitionDone="等待转场到目标场
 AdvSceneSwitcher.action.wait="等待"
 AdvSceneSwitcher.action.wait.type.fixed="固定"
 AdvSceneSwitcher.action.wait.type.random="随机"
-AdvSceneSwitcher.action.wait.entry.fixed="等待时间{{waitType}}{{duration}}"
-AdvSceneSwitcher.action.wait.entry.random="等待时间{{waitType}}{{duration}} 到 {{duration2}}"
+AdvSceneSwitcher.action.wait.layout.fixed="等待时间{{waitType}}{{duration}}"
+AdvSceneSwitcher.action.wait.layout.random="等待时间{{waitType}}{{duration}} 到 {{duration2}}"
 AdvSceneSwitcher.action.audio="音频"
 AdvSceneSwitcher.action.audio.type.mute="静音"
 AdvSceneSwitcher.action.audio.type.unmute="取消静音"

forms/advanced-scene-switcher.ui

@@ -258,6 +258,13 @@
                 </property>
                </widget>
               </item>
+              <item>
+               <widget class="QCheckBox" name="settingsLock">
+                <property name="text">
+                 <string>AdvSceneSwitcher.generalTab.generalBehavior.settingsLock</string>
+                </property>
+               </widget>
+              </item>
              </layout>
             </widget>
            </item>

lib/advanced-scene-switcher.cpp

@@ -19,8 +19,10 @@
 #include <obs-frontend-api.h>
 #include <QAction>
 #include <QDirIterator>
+#include <QInputDialog>
 #include <QLibrary>
 #include <QMainWindow>
+#include <QMessageBox>
 #include <QTextStream>
 #include <regex>
 
@@ -41,9 +43,12 @@ AdvSceneSwitcher::AdvSceneSwitcher(QWidget *parent)
 {
 	switcher->settingsWindowOpened = true;
 	ui->setupUi(this);
-	std::lock_guard<std::mutex> lock(switcher->m);
-	switcher->Prune();
-	LoadUI();
+	{
+		std::lock_guard<std::mutex> lock(switcher->m);
+		switcher->Prune();
+		LoadUI();
+	}
+	CheckFirstTimeSetup();
 }
 
 AdvSceneSwitcher::~AdvSceneSwitcher()
@@ -139,7 +144,6 @@ void AdvSceneSwitcher::LoadUI()
 	SetTabOrder(ui->tabWidget);
 	SetCurrentTab(ui->tabWidget);
 	RestoreWindowGeo();
-	CheckFirstTimeSetup();
 
 	loading = false;
 }
@@ -457,12 +461,13 @@ void SwitcherData::Stop()
 		SetMacroAbortWait(true);
 		GetMacroWaitCV().notify_all();
 		GetMacroTransitionCV().notify_all();
-		StopAllMacros();
+		SignalStopAllMacros();
 		StopAndClearAllActionQueues();
 		CloseAllInputDialogs();
 		th->wait();
 		delete th;
 		th = nullptr;
+		WaitForAllMacros();
 		RunStopSteps();
 	}
 
@@ -506,6 +511,8 @@ bool SwitcherData::AnySceneTransitionStarted()
  ******************************************************************************/
 extern "C" EXPORT void FreeSceneSwitcher()
 {
+	switcher->Stop();
+
 	PlatformCleanup();
 	RunPluginCleanupSteps();
 
@@ -714,19 +721,54 @@ static void LoadPlugins()
 	}
 }
 
+static bool settingsPasswordIsCorrect(QWidget *parent)
+{
+	bool ok;
+	QString input = QInputDialog::getText(
+		parent,
+		obs_module_text(
+			"AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.title"),
+		obs_module_text(
+			"AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.passwordLabel"),
+		QLineEdit::Password, QString(), &ok);
+
+	if (!ok) {
+		return false;
+	}
+
+	if (input.toStdString() == switcher->settingsLockPassword) {
+		return true;
+	}
+
+	QMessageBox::warning(
+		parent,
+		obs_module_text(
+			"AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.title"),
+		obs_module_text(
+			"AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.wrongPassword"));
+	return false;
+}
+
 void OpenSettingsWindow()
 {
 	if (switcher->settingsWindowOpened) {
 		AdvSceneSwitcher::window->show();
 		AdvSceneSwitcher::window->raise();
 		AdvSceneSwitcher::window->activateWindow();
-	} else {
-		AdvSceneSwitcher::window =
-			new AdvSceneSwitcher(static_cast<QMainWindow *>(
-				obs_frontend_get_main_window()));
-		AdvSceneSwitcher::window->setAttribute(Qt::WA_DeleteOnClose);
-		AdvSceneSwitcher::window->show();
+		return;
 	}
+
+	auto parent =
+		static_cast<QMainWindow *>(obs_frontend_get_main_window());
+	if (switcher->settingsLockEnabled &&
+	    !switcher->settingsLockPassword.empty() &&
+	    !settingsPasswordIsCorrect(parent)) {
+		return;
+	}
+
+	AdvSceneSwitcher::window = new AdvSceneSwitcher(parent);
+	AdvSceneSwitcher::window->setAttribute(Qt::WA_DeleteOnClose);
+	AdvSceneSwitcher::window->show();
 }
 
 void AdvSceneSwitcher::HighlightMacroSettingsButton(bool enable)

lib/advanced-scene-switcher.hpp

@@ -68,6 +68,7 @@ public slots:
 	void on_warnPluginLoadFailure_stateChanged(int state);
 	void on_suppressCrashRecoveryDialog_stateChanged(int state);
 	void on_hideLegacyTabs_stateChanged(int state);
+	void on_settingsLock_stateChanged(int state);
 	void on_priorityUp_clicked();
 	void on_priorityDown_clicked();
 	void on_threadPriority_currentTextChanged(const QString &text);

lib/general.cpp

@@ -19,6 +19,8 @@
 
 #include <obs-frontend-api.h>
 #include <QFileDialog>
+#include <QInputDialog>
+#include <QMessageBox>
 
 namespace advss {
 
@@ -243,6 +245,64 @@ void AdvSceneSwitcher::on_hideLegacyTabs_stateChanged(int state)
 	ui->priorityBox->setVisible(!switcher->hideLegacyTabs);
 }
 
+void AdvSceneSwitcher::on_settingsLock_stateChanged(int state)
+{
+	if (loading) {
+		return;
+	}
+
+	if (!state) {
+		switcher->settingsLockEnabled = false;
+		switcher->settingsLockPassword = "";
+		return;
+	}
+
+	bool ok;
+	QString newPassword = QInputDialog::getText(
+		this,
+		obs_module_text(
+			"AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.title"),
+		obs_module_text(
+			"AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.newPasswordLabel"),
+		QLineEdit::Password, QString(), &ok);
+
+	const auto disablePassword = [this]() {
+		QSignalBlocker blocker(ui->settingsLock);
+		ui->settingsLock->setChecked(false);
+		ui->settingsLock->setCheckState(Qt::Unchecked);
+		switcher->settingsLockEnabled = false;
+		switcher->settingsLockPassword = "";
+	};
+
+	if (!ok || newPassword.isEmpty()) {
+		disablePassword();
+		return;
+	}
+
+	QString confirm = QInputDialog::getText(
+		this,
+		obs_module_text(
+			"AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.title"),
+		obs_module_text(
+			"AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.confirmPasswordLabel"),
+		QLineEdit::Password, QString(), &ok);
+	if (!ok || newPassword != confirm) {
+		if (ok) {
+			QMessageBox::warning(
+				this,
+				obs_module_text(
+					"AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.title"),
+				obs_module_text(
+					"AdvSceneSwitcher.generalTab.generalBehavior.settingsLock.passwordMismatch"));
+		}
+		disablePassword();
+		return;
+	}
+
+	switcher->settingsLockEnabled = true;
+	switcher->settingsLockPassword = newPassword.toStdString();
+}
+
 void AdvSceneSwitcher::SetDeprecationWarnings()
 {
 	QString toolTip =
@@ -391,18 +451,22 @@ void AdvSceneSwitcher::CheckFirstTimeSetup()
 		return;
 	}
 
-	auto macro = FirstRunWizard::ShowWizard(this);
+	bool wasSkipped = false;
+	auto macro = wiz::FirstRunWizard::ShowWizard(this, &wasSkipped);
 	if (macro) {
 		renameMacroIfNecessary(macro);
 		QTimer::singleShot(0, this,
 				   [this, macro]() { ui->macros->Add(macro); });
 	}
+	if (wasSkipped) {
+		ui->alwaysShowFeatureTabs->setChecked(true);
+	}
 	switcher->Start();
 }
 
 void AdvSceneSwitcher::on_openSetupWizard_clicked()
 {
-	auto macro = FirstRunWizard::ShowWizard(this);
+	auto macro = wiz::FirstRunWizard::ShowWizard(this);
 	if (!macro) {
 		return;
 	}
@@ -563,6 +627,9 @@ void SwitcherData::SaveGeneralSettings(obs_data_t *obj)
 			  disableFilterComboboxFilter);
 	obs_data_set_bool(obj, "warnPluginLoadFailure", warnPluginLoadFailure);
 	obs_data_set_bool(obj, "hideLegacyTabs", hideLegacyTabs);
+	obs_data_set_bool(obj, "settingsLockEnabled", settingsLockEnabled);
+	obs_data_set_string(obj, "settingsLockPassword",
+			    settingsLockPassword.c_str());
 
 	SaveFunctionPriorities(obj, functionNamesByPriority);
 
@@ -634,6 +701,8 @@ void SwitcherData::LoadGeneralSettings(obs_data_t *obj)
 	warnPluginLoadFailure = obs_data_get_bool(obj, "warnPluginLoadFailure");
 	obs_data_set_default_bool(obj, "hideLegacyTabs", true);
 	hideLegacyTabs = obs_data_get_bool(obj, "hideLegacyTabs");
+	settingsLockEnabled = obs_data_get_bool(obj, "settingsLockEnabled");
+	settingsLockPassword = obs_data_get_string(obj, "settingsLockPassword");
 
 	SetDefaultFunctionPriorities(obj);
 	LoadFunctionPriorities(obj, functionNamesByPriority);
@@ -956,6 +1025,7 @@ void AdvSceneSwitcher::SetupGeneralTab()
 	ui->warnPluginLoadFailure->setChecked(switcher->warnPluginLoadFailure);
 	ui->suppressCrashRecoveryDialog->setChecked(GetSuppressCrashDialog());
 	ui->hideLegacyTabs->setChecked(switcher->hideLegacyTabs);
+	ui->settingsLock->setChecked(switcher->settingsLockEnabled);
 
 	populatePriorityFunctionList(ui->priorityList);
 	populateThreadPriorityList(ui->threadPriority);

lib/legacy/switch-window.cpp

@@ -178,47 +178,19 @@ void AdvSceneSwitcher::on_ignoreWindows_currentRowChanged(int idx)
 	}
 }
 
-void checkWindowTitleSwitchDirect(WindowSwitch &s,
-				  std::string &currentWindowTitle, bool &match,
-				  OBSWeakSource &scene,
-				  OBSWeakSource &transition)
+static bool windowInfoMatchesSwitch(const WindowInfo &info,
+				    const WindowSwitch &s)
 {
-	bool focus = (!s.focus || s.window == currentWindowTitle);
-	bool fullscreen = (!s.fullscreen || IsFullscreen(s.window));
-	bool max = (!s.maximized || IsMaximized(s.window));
-
-	if (focus && fullscreen && max) {
-		match = true;
-		scene = s.getScene();
-		transition = s.transition;
+	if (s.focus && !info.focused) {
+		return false;
 	}
-}
-
-void checkWindowTitleSwitchRegex(WindowSwitch &s,
-				 std::string &currentWindowTitle,
-				 std::vector<std::string> windowList,
-				 bool &match, OBSWeakSource &scene,
-				 OBSWeakSource &transition)
-{
-	for (auto &window : windowList) {
-		try {
-			std::regex expr(s.window);
-			if (!std::regex_match(window, expr)) {
-				continue;
-			}
-		} catch (const std::regex_error &) {
-		}
-
-		bool focus = (!s.focus || window == currentWindowTitle);
-		bool fullscreen = (!s.fullscreen || IsFullscreen(window));
-		bool max = (!s.maximized || IsMaximized(window));
-
-		if (focus && fullscreen && max) {
-			match = true;
-			scene = s.getScene();
-			transition = s.transition;
-		}
+	if (s.fullscreen && !info.fullscreen) {
+		return false;
 	}
+	if (s.maximized && !info.maximized) {
+		return false;
+	}
+	return true;
 }
 
 bool SwitcherData::checkWindowTitleSwitch(OBSWeakSource &scene,
@@ -228,23 +200,37 @@ bool SwitcherData::checkWindowTitleSwitch(OBSWeakSource &scene,
 		return false;
 	}
 
-	std::string currentWindowTitle = switcher->currentTitle;
 	bool match = false;
-	const auto windowList = GetWindowList();
+
+	WindowQueryOptions options;
+	options.focus = true;
+	options.fullscreen = true;
+	options.maximized = true;
+	const auto windows = GetWindows(options);
 
 	for (WindowSwitch &s : windowSwitches) {
 		if (!s.initialized()) {
 			continue;
 		}
 
-		if (std::find(windowList.begin(), windowList.end(), s.window) !=
-		    windowList.end()) {
-			checkWindowTitleSwitchDirect(s, currentWindowTitle,
-						     match, scene, transition);
-		} else {
-			checkWindowTitleSwitchRegex(s, currentWindowTitle,
-						    windowList, match, scene,
-						    transition);
+		for (const auto &info : windows) {
+			bool titleMatch = false;
+			try {
+				std::regex expr(s.window);
+				titleMatch = info.title == s.window ||
+					     std::regex_match(info.title, expr);
+			} catch (const std::regex_error &) {
+				titleMatch = info.title == s.window;
+			}
+
+			if (!titleMatch || !windowInfoMatchesSwitch(info, s)) {
+				continue;
+			}
+
+			match = true;
+			scene = s.getScene();
+			transition = s.transition;
+			break;
 		}
 
 		if (match) {

lib/linux/advanced-scene-switcher-nix.cpp

@@ -236,17 +236,89 @@ std::string getWindowName(Window window)
 	return windowTitle;
 }
 
-std::vector<std::string> GetWindowList()
+std::vector<WindowInfo> GetWindows(const WindowQueryOptions &options)
 {
-	std::vector<std::string> windows;
-	for (auto window : getTopLevelWindows()) {
+	const std::string foregroundTitle = GetCurrentWindowTitle();
+	const auto topLevel = getTopLevelWindows();
+	auto display = disp();
+
+	std::vector<WindowInfo> result;
+	result.reserve(topLevel.size());
+
+	for (auto window : topLevel) {
 		auto name = getWindowName(window);
 		if (name.empty()) {
 			continue;
 		}
-		windows.emplace_back(name);
+
+		WindowInfo info;
+		info.title = name;
+
+		if (options.focus) {
+			info.focused = (name == foregroundTitle);
+		}
+
+		if (options.fullscreen || options.maximized) {
+			QStringList states = getStates(window);
+			if (options.fullscreen) {
+				info.fullscreen = states.contains(
+					"_NET_WM_STATE_FULLSCREEN");
+			}
+			if (options.maximized) {
+				info.maximized =
+					states.contains(
+						"_NET_WM_STATE_MAXIMIZED_VERT") &&
+					states.contains(
+						"_NET_WM_STATE_MAXIMIZED_HORZ");
+			}
+		}
+
+		if (options.geometry && display) {
+			XWindowAttributes attrs;
+			if (XGetWindowAttributes(display, window, &attrs)) {
+				int x = 0;
+				int y = 0;
+				Window child;
+				XTranslateCoordinates(
+					display, window,
+					DefaultRootWindow(display), 0, 0, &x,
+					&y, &child);
+				info.x = x;
+				info.y = y;
+				info.width = attrs.width;
+				info.height = attrs.height;
+			}
+		}
+
+		// windowClass and text not implemented on Linux
+		result.emplace_back(std::move(info));
 	}
-	return windows;
+
+	// When KWin compat is active, native Wayland windows are not tracked by
+	// X11 and therefore do not appear in the list above. Merge in any window
+	// reported by KWin that is not already present (matched by title) so that
+	// title and focus conditions work for native Wayland windows.
+	if (KWin) {
+		for (const auto &[pid, title] :
+		     FocusNotifier::getWindowList()) {
+			bool found = false;
+			for (const auto &info : result) {
+				if (info.title == title) {
+					found = true;
+					break;
+				}
+			}
+			if (!found) {
+				WindowInfo waylandWindow;
+				waylandWindow.title = title;
+				waylandWindow.focused =
+					(title == foregroundTitle);
+				result.emplace_back(std::move(waylandWindow));
+			}
+		}
+	}
+
+	return result;
 }
 
 int getActiveWindow(Window *&window)
@@ -290,68 +362,6 @@ std::string GetCurrentWindowTitle()
 	return name;
 }
 
-bool windowStatesAreSet(const std::string &windowTitle,
-			std::vector<QString> &expectedStates)
-{
-	if (!ewmhIsSupported()) {
-		return false;
-	}
-
-	std::vector<Window> windows = getTopLevelWindows();
-	for (auto &window : windows) {
-		auto name = getWindowName(window);
-		if (name.empty()) {
-			continue;
-		}
-
-		bool equals = windowTitle == name;
-		bool matches = QString::fromStdString(name).contains(
-			QRegularExpression(
-				QString::fromStdString(windowTitle)));
-
-		if (!(equals || matches)) {
-			continue;
-		}
-
-		QStringList states = getStates(window);
-		if (states.isEmpty()) {
-			if (expectedStates.empty()) {
-				return true;
-			}
-			return false;
-		}
-
-		for (const auto &state : expectedStates) {
-			if (!states.contains(state)) {
-				return false;
-			}
-		}
-		return true;
-	}
-	return false;
-}
-
-bool IsMaximized(const std::string &title)
-{
-	std::vector<QString> states;
-	states.emplace_back("_NET_WM_STATE_MAXIMIZED_VERT");
-	states.emplace_back("_NET_WM_STATE_MAXIMIZED_HORZ");
-	return windowStatesAreSet(title, states);
-}
-
-bool IsFullscreen(const std::string &title)
-{
-	std::vector<QString> states;
-	states.emplace_back("_NET_WM_STATE_FULLSCREEN");
-	return windowStatesAreSet(title, states);
-}
-
-std::optional<std::string> GetTextInWindow(const std::string &)
-{
-	// Not implemented
-	return {};
-}
-
 static void getProcessListProcps(QStringList &processes)
 {
 #ifdef PROCPS_AVAILABLE

lib/linux/kwin-helpers.cpp

@@ -12,35 +12,82 @@
 
 namespace advss {
 
+std::mutex FocusNotifier::_mutex;
 int FocusNotifier::activePID = -1;
 std::string FocusNotifier::activeTitle = {};
+std::map<std::string, std::pair<int, std::string>> FocusNotifier::_windows;
 
 int FocusNotifier::getActiveWindowPID()
 {
+	std::lock_guard<std::mutex> lock(_mutex);
 	return activePID;
 }
 
 std::string FocusNotifier::getActiveWindowTitle()
 {
+	std::lock_guard<std::mutex> lock(_mutex);
 	return activeTitle;
 }
 
+std::vector<std::pair<int, std::string>> FocusNotifier::getWindowList()
+{
+	std::lock_guard<std::mutex> lock(_mutex);
+	std::vector<std::pair<int, std::string>> result;
+	result.reserve(_windows.size());
+	for (const auto &entry : _windows) {
+		result.emplace_back(entry.second);
+	}
+	return result;
+}
+
 void FocusNotifier::focusChanged(const int pid)
 {
+	std::lock_guard<std::mutex> lock(_mutex);
 	activePID = pid;
 }
 
 void FocusNotifier::focusTitle(const QString &title)
 {
+	std::lock_guard<std::mutex> lock(_mutex);
 	activeTitle = title.toStdString();
 }
 
+void FocusNotifier::focusUpdate(const int pid, const QString &title)
+{
+	std::lock_guard<std::mutex> lock(_mutex);
+	activePID = pid;
+	activeTitle = title.toStdString();
+}
+
+void FocusNotifier::windowAdded(const QString &id, const int pid,
+				const QString &title)
+{
+	std::lock_guard<std::mutex> lock(_mutex);
+	_windows[id.toStdString()] = {pid, title.toStdString()};
+}
+
+void FocusNotifier::windowRemoved(const QString &id)
+{
+	std::lock_guard<std::mutex> lock(_mutex);
+	_windows.erase(id.toStdString());
+}
+
+void FocusNotifier::windowTitleChanged(const QString &id, const QString &title)
+{
+	std::lock_guard<std::mutex> lock(_mutex);
+	auto it = _windows.find(id.toStdString());
+	if (it != _windows.end()) {
+		it->second.second = title.toStdString();
+	}
+}
+
 bool isKWinAvailable()
 {
 	const QDBusConnectionInterface *interface =
 		QDBusConnection::sessionBus().interface();
-	if (!interface)
+	if (!interface) {
 		return false;
+	}
 
 	const QStringList services =
 		interface->registeredServiceNames().value();
@@ -53,25 +100,32 @@ bool startKWinScript(QString &scriptObjectPath)
 		"/tmp/AdvancedSceneSwitcher/KWinFocusNotifier.js";
 
 	const QString script =
-		R"(workspace.windowActivated.connect(function(client) {
-if (!client) return;
-if (!client.pid) return;
-if (!client.caption) return;
+		R"(var adss = "com.github.AdvancedSceneSwitcher";
+var adssPath = "/com/github/AdvancedSceneSwitcher";
 
-callDBus(
-    "com.github.AdvancedSceneSwitcher",
-	"/com/github/AdvancedSceneSwitcher",
-	"com.github.AdvancedSceneSwitcher",
-	"focusChanged",
-	client.pid
-);
-callDBus(
-    "com.github.AdvancedSceneSwitcher",
-	"/com/github/AdvancedSceneSwitcher",
-	"com.github.AdvancedSceneSwitcher",
-	"focusTitle",
-	client.caption
-);
+function trackWindow(window) {
+    var id = window.internalId.toString();
+    callDBus(adss, adssPath, adss, "windowAdded", id, window.pid, window.caption);
+    window.captionChanged.connect(function() {
+        callDBus(adss, adssPath, adss, "windowTitleChanged", id, window.caption);
+    });
+}
+
+var windows = workspace.windowList();
+for (var i = 0; i < windows.length; i++) {
+    trackWindow(windows[i]);
+}
+
+workspace.windowAdded.connect(trackWindow);
+
+workspace.windowRemoved.connect(function(window) {
+    callDBus(adss, adssPath, adss, "windowRemoved", window.internalId.toString());
+});
+
+workspace.windowActivated.connect(function(client) {
+    callDBus(adss, adssPath, adss, "focusUpdate",
+        client ? client.pid : 0,
+        client ? client.caption : "");
 }))";
 
 	if (const QDir dir; !dir.mkpath(QFileInfo(scriptPath).absolutePath())) {

lib/linux/kwin-helpers.h

@@ -2,7 +2,11 @@
 
 #include <QObject>
 #include <QString>
+#include <map>
+#include <mutex>
 #include <string>
+#include <utility>
+#include <vector>
 
 namespace advss {
 
@@ -10,18 +14,27 @@ class FocusNotifier final : public QObject {
 	Q_OBJECT
 	Q_CLASSINFO("D-Bus Interface", "com.github.AdvancedSceneSwitcher")
 
+	static std::mutex _mutex;
 	static int activePID;
 	static std::string activeTitle;
+	// Maps KWin internal window ID to {pid, title}
+	static std::map<std::string, std::pair<int, std::string>> _windows;
 
 public:
 	using QObject::QObject;
 
 	static int getActiveWindowPID();
 	static std::string getActiveWindowTitle();
+	static std::vector<std::pair<int, std::string>> getWindowList();
 
 public slots:
 	void focusChanged(const int pid);
 	void focusTitle(const QString &title);
+	void focusUpdate(const int pid, const QString &title);
+	void windowAdded(const QString &id, const int pid,
+			 const QString &title);
+	void windowRemoved(const QString &id);
+	void windowTitleChanged(const QString &id, const QString &title);
 };
 
 bool isKWinAvailable();

lib/macro/macro-action-edit.cpp

@@ -164,4 +164,9 @@ std::shared_ptr<MacroSegment> MacroActionEdit::Data() const
 	return *_entryData;
 }
 
+void MacroActionEdit::FocusTypeSelection()
+{
+	_actionSelection->setFocus();
+}
+
 } // namespace advss

lib/macro/macro-action-edit.hpp

@@ -17,6 +17,7 @@ public:
 			std::shared_ptr<MacroAction> * = nullptr);
 	void SetupWidgets(bool basicSetup = false);
 	void SetEntryData(std::shared_ptr<MacroAction> *);
+	void FocusTypeSelection() override;
 
 private slots:
 	void ActionSelectionChanged(const QString &text);

lib/macro/macro-action-macro.cpp

@@ -263,6 +263,7 @@ bool MacroActionMacro::Load(obs_data_t *obj)
 	if (obs_data_has_user_value(obj, "nestedMacro")) {
 		OBSDataAutoRelease nestedMacroData =
 			obs_data_get_obj(obj, "nestedMacro");
+		_nestedMacro = std::make_shared<Macro>();
 		_nestedMacro->Load(nestedMacroData);
 	}
 
@@ -309,6 +310,15 @@ void MacroActionMacro::ResolveVariablesToFixedValues()
 {
 	_actionIndex.ResolveVariables();
 	_label.ResolveVariables();
+
+	if (_action == Action::NESTED_MACRO) {
+		for (auto &action : _nestedMacro->Actions()) {
+			action->ResolveVariablesToFixedValues();
+		}
+		for (auto &action : _nestedMacro->ElseActions()) {
+			action->ResolveVariablesToFixedValues();
+		}
+	}
 }
 
 static void runActionsHelper(Macro *macro, bool runElseActions, bool setInputs,
@@ -871,6 +881,8 @@ void MacroActionMacroEdit::SetWidgetVisibility()
 	} else {
 		_noConditionsWarning->setVisible(false);
 	}
+	_runMacroHelp->setVisible(action ==
+				  MacroActionMacro::Action::RUN_MACRO);
 
 	_nestedMacro->setVisible(action ==
 				 MacroActionMacro::Action::NESTED_MACRO);

lib/macro/macro-action-variable.cpp

@@ -447,7 +447,19 @@ bool MacroActionVariable::PerformAction()
 		if (!value.has_value()) {
 			return true;
 		}
-		var->SetValue(*value);
+
+		if (!_jsonQueryExtractSingle) {
+			var->SetValue(*value);
+			return true;
+		}
+
+		auto extracted = ExtractSingleJsonArrayElement(*value);
+		if (extracted.has_value()) {
+			var->SetValue(*extracted);
+		} else {
+			var->SetValue(*value);
+		}
+
 		return true;
 	}
 	case Action::ARRAY_JSON: {
@@ -551,6 +563,8 @@ bool MacroActionVariable::Save(obs_data_t *obj) const
 	obs_data_set_bool(obj, "allowRepeatValues", _allowRepeatValues);
 	_jsonQuery.Save(obj, "jsonQuery");
 	_jsonIndex.Save(obj, "jsonIndex");
+	obs_data_set_bool(obj, "jsonQueryExtractSingle",
+			  _jsonQueryExtractSingle);
 
 	obs_data_set_int(obj, "version", 1);
 
@@ -611,6 +625,8 @@ bool MacroActionVariable::Load(obs_data_t *obj)
 	_allowRepeatValues = obs_data_get_bool(obj, "allowRepeatValues");
 	_jsonQuery.Load(obj, "jsonQuery");
 	_jsonIndex.Load(obj, "jsonIndex");
+	_jsonQueryExtractSingle =
+		obs_data_get_bool(obj, "jsonQueryExtractSingle");
 
 	return true;
 }
@@ -904,6 +920,15 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 			  "AdvSceneSwitcher.action.variable.type.queryJson.info"),
 		  this)),
 	  _jsonIndex(new VariableSpinBox(this)),
+	  _jsonExtractSingle(new QCheckBox(
+		  obs_module_text(
+			  "AdvSceneSwitcher.action.variable.type.queryJson.extractSingle"),
+		  this)),
+	  _jsonExtractSingleHelp(new HelpIcon(
+		  obs_module_text(
+			  "AdvSceneSwitcher.action.variable.type.queryJson.extractSingle.info"),
+		  this)),
+	  _jsonQueryLayout(new QVBoxLayout()),
 	  _entryLayout(new QHBoxLayout())
 {
 	_numValue->setMinimum(-9999999999);
@@ -935,6 +960,11 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 	_randomNumberEnd->setMaximum(9999999999);
 	_randomValues->SetMaxStringSize(99999999);
 	_jsonIndex->setMaximum(999);
+	auto jsonExtractSingleLayout = new QHBoxLayout();
+	jsonExtractSingleLayout->addWidget(_jsonExtractSingle);
+	jsonExtractSingleLayout->addWidget(_jsonExtractSingleHelp);
+	jsonExtractSingleLayout->addStretch();
+	_jsonQueryLayout->addLayout(jsonExtractSingleLayout);
 
 	QWidget::connect(_variables, SIGNAL(SelectionChanged(const QString &)),
 			 this, SLOT(VariableChanged(const QString &)));
@@ -1033,6 +1063,8 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 		_jsonIndex,
 		SIGNAL(NumberVariableChanged(const NumberVariable<int> &)),
 		this, SLOT(JsonIndexChanged(const NumberVariable<int> &)));
+	QWidget::connect(_jsonExtractSingle, SIGNAL(stateChanged(int)), this,
+			 SLOT(JsonQueryExtractSingleChanged(int)));
 
 	const std::unordered_map<std::string, QWidget *> widgetPlaceholders = {
 		{"{{variables}}", _variables},
@@ -1109,6 +1141,7 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 
 	auto layout = new QVBoxLayout;
 	layout->addLayout(_entryLayout);
+	layout->addLayout(_jsonQueryLayout);
 	layout->addLayout(_substringLayout);
 	layout->addWidget(_segmentValueStatus);
 	layout->addWidget(_segmentValue);
@@ -1180,6 +1213,7 @@ void MacroActionVariableEdit::UpdateEntryData()
 	_randomValues->SetStringList(_entryData->_randomValues);
 	_jsonQuery->setText(_entryData->_jsonQuery);
 	_jsonIndex->SetValue(_entryData->_jsonIndex);
+	_jsonExtractSingle->setChecked(_entryData->_jsonQueryExtractSingle);
 
 	SetWidgetVisibility();
 }
@@ -1545,6 +1579,12 @@ void MacroActionVariableEdit::JsonIndexChanged(const NumberVariable<int> &value)
 	_entryData->_jsonIndex = value;
 }
 
+void MacroActionVariableEdit::JsonQueryExtractSingleChanged(int value)
+{
+	GUARD_LOADING_AND_LOCK();
+	_entryData->_jsonQueryExtractSingle = value;
+}
+
 void MacroActionVariableEdit::SetWidgetVisibility()
 {
 	if (!_entryData) {
@@ -1593,6 +1633,10 @@ void MacroActionVariableEdit::SetWidgetVisibility()
 		   MacroActionVariable::Action::TRUNCATE) {
 		layoutString = obs_module_text(
 			"AdvSceneSwitcher.action.variable.layout.truncate");
+	} else if (_entryData->_action ==
+		   MacroActionVariable::Action::COPY_VAR) {
+		layoutString = obs_module_text(
+			"AdvSceneSwitcher.action.variable.layout.copy");
 	} else {
 		layoutString = obs_module_text(
 			"AdvSceneSwitcher.action.variable.layout.other");
@@ -1740,6 +1784,9 @@ void MacroActionVariableEdit::SetWidgetVisibility()
 				   MacroActionVariable::Action::QUERY_JSON);
 	_jsonIndex->setVisible(_entryData->_action ==
 			       MacroActionVariable::Action::ARRAY_JSON);
+	SetLayoutVisible(_jsonQueryLayout,
+			 _entryData->_action ==
+				 MacroActionVariable::Action::QUERY_JSON);
 
 	adjustSize();
 	updateGeometry();

lib/macro/macro-action-variable.hpp

@@ -116,6 +116,7 @@ public:
 
 	StringVariable _jsonQuery = "$.some.nested.value";
 	IntVariable _jsonIndex = 0;
+	bool _jsonQueryExtractSingle = true;
 
 private:
 	void DecrementCurrentSegmentVariableRef();
@@ -187,6 +188,7 @@ private slots:
 	void AllowRepeatValuesChanged(int);
 	void JsonQueryChanged();
 	void JsonIndexChanged(const NumberVariable<int> &);
+	void JsonQueryExtractSingleChanged(int);
 
 signals:
 	void HeaderInfoChanged(const QString &);
@@ -239,8 +241,11 @@ private:
 	QCheckBox *_allowRepeatValues;
 	QVBoxLayout *_randomValueLayout;
 	VariableLineEdit *_jsonQuery;
-	QLabel *_jsonQueryHelp;
+	HelpIcon *_jsonQueryHelp;
 	VariableSpinBox *_jsonIndex;
+	QCheckBox *_jsonExtractSingle;
+	HelpIcon *_jsonExtractSingleHelp;
+	QVBoxLayout *_jsonQueryLayout;
 	QHBoxLayout *_entryLayout;
 
 	std::shared_ptr<MacroActionVariable> _entryData;

lib/macro/macro-condition-edit.cpp

@@ -1,10 +1,12 @@
 #include "macro-condition-edit.hpp"
 #include "advanced-scene-switcher.hpp"
+#include "macro-signals.hpp"
 #include "macro-settings.hpp"
 #include "macro.hpp"
 #include "path-helpers.hpp"
 #include "plugin-state-helpers.hpp"
 #include "section.hpp"
+#include "switch-button.hpp"
 #include "ui-helpers.hpp"
 #include "utility.hpp"
 
@@ -102,12 +104,15 @@ MacroConditionEdit::MacroConditionEdit(
 	QWidget *parent, std::shared_ptr<MacroCondition> *entryData,
 	bool isRootCondition)
 	: MacroSegmentEdit(parent),
+	  _enable(new SwitchButton()),
 	  _logicSelection(new QComboBox()),
 	  _conditionSelection(new FilterComboBox()),
 	  _dur(new DurationModifierEdit()),
 	  _entryData(entryData),
 	  _isRoot(isRootCondition)
 {
+	QWidget::connect(_enable, SIGNAL(checked(bool)), this,
+			 SLOT(ConditionEnableChanged(bool)));
 	QWidget::connect(_logicSelection, SIGNAL(currentIndexChanged(int)),
 			 this, SLOT(LogicSelectionChanged(int)));
 	QWidget::connect(_conditionSelection,
@@ -122,6 +127,7 @@ MacroConditionEdit::MacroConditionEdit(
 	Logic::PopulateLogicTypeSelection(_logicSelection, isRootCondition);
 	populateConditionSelection(_conditionSelection);
 
+	_section->AddHeaderWidget(_enable);
 	_section->AddHeaderWidget(_logicSelection);
 	_section->AddHeaderWidget(_conditionSelection);
 	_section->AddHeaderWidget(_headerInfo);
@@ -154,8 +160,17 @@ void MacroConditionEdit::LogicSelectionChanged(int idx)
 	const auto logic = static_cast<Logic::Type>(
 		_logicSelection->itemData(idx).toInt());
 	(*_entryData)->SetLogicType(logic);
+}
 
-	SetEnableAppearance(logic != Logic::Type::NONE);
+void MacroConditionEdit::ConditionEnableChanged(bool value)
+{
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
+	(*_entryData)->SetEnabled(value);
+	SetDisableEffect(!value);
 }
 
 bool MacroConditionEdit::IsRootNode() const
@@ -168,7 +183,9 @@ void MacroConditionEdit::SetLogicSelection()
 	const auto logic = (*_entryData)->GetLogicType();
 	_logicSelection->setCurrentIndex(
 		_logicSelection->findData(static_cast<int>(logic)));
-	SetEnableAppearance(logic != Logic::Type::NONE);
+	const bool enabled = (*_entryData)->Enabled();
+	_enable->setChecked(enabled);
+	SetEnableAppearance(enabled);
 }
 
 void MacroConditionEdit::SetRootNode(bool root)
@@ -239,10 +256,12 @@ void MacroConditionEdit::ConditionSelectionChanged(const QString &text)
 	{
 		auto lock = LockContext();
 		auto logic = (*_entryData)->GetLogicType();
+		const bool enabled = (*_entryData)->Enabled();
 		_entryData->reset();
 		*_entryData = MacroConditionFactory::Create(id, macro);
 		(*_entryData)->SetIndex(idx);
 		(*_entryData)->SetLogicType(logic);
+		(*_entryData)->SetEnabled(enabled);
 		(*_entryData)->PostLoad();
 		RunAndClearPostLoadSteps();
 	}
@@ -256,6 +275,9 @@ void MacroConditionEdit::ConditionSelectionChanged(const QString &text)
 	SetupVarMappings((*_entryData).get());
 	_dur->setVisible(MacroConditionFactory::UsesDurationModifier(id));
 	SetFocusPolicyOfWidgets();
+
+	emit MacroSignalManager::Instance()->ConditionTypeCreated(
+		QString::fromStdString(id));
 }
 
 void MacroConditionEdit::DurationChanged(const Duration &seconds)
@@ -283,4 +305,9 @@ std::shared_ptr<MacroSegment> MacroConditionEdit::Data() const
 	return *_entryData;
 }
 
+void MacroConditionEdit::FocusTypeSelection()
+{
+	_conditionSelection->setFocus();
+}
+
 } // namespace advss

lib/macro/macro-condition-edit.hpp

@@ -8,6 +8,8 @@
 
 namespace advss {
 
+class SwitchButton;
+
 class DurationModifierEdit : public QWidget {
 	Q_OBJECT
 public:
@@ -41,17 +43,20 @@ public:
 	void SetRootNode(bool);
 	void SetupWidgets(bool basicSetup = false);
 	void SetEntryData(std::shared_ptr<MacroCondition> *);
+	void FocusTypeSelection() override;
 
 private slots:
 	void LogicSelectionChanged(int idx);
 	void ConditionSelectionChanged(const QString &text);
 	void DurationChanged(const Duration &value);
 	void DurationModifierChanged(DurationModifier::Type m);
+	void ConditionEnableChanged(bool);
 
 private:
 	void SetLogicSelection();
 	std::shared_ptr<MacroSegment> Data() const;
 
+	SwitchButton *_enable;
 	QComboBox *_logicSelection;
 	FilterComboBox *_conditionSelection;
 	DurationModifierEdit *_dur;

lib/macro/macro-condition.cpp

@@ -31,6 +31,10 @@ bool MacroCondition::Load(obs_data_t *obj)
 {
 	MacroSegment::Load(obj);
 	_logic.Load(obj, "logic");
+	if (_logic.GetType() == Logic::Type::NONE) {
+		SetEnabled(false);
+		_logic.SetType(Logic::Type::AND);
+	}
 	_durationModifier.Load(obj);
 	return true;
 }
@@ -50,7 +54,8 @@ void MacroCondition::ValidateLogicSelection(bool isRootCondition,
 		return;
 	}
 
-	_logic.SetType(Logic::Type::NONE);
+	_logic.SetType(Logic::Type::AND);
+	SetEnabled(false);
 	blog(LOG_WARNING,
 	     "setting invalid logic selection to 'ignore' for macro %s",
 	     context);

lib/macro/macro-edit.cpp

@@ -650,6 +650,18 @@ void MacroEdit::HighlightCondition(int idx, QColor color) const
 	ui->conditionsList->Highlight(idx, color);
 }
 
+void MacroEdit::ScrollAndFocusNewSegment(MacroSegmentList *list, int newIdx,
+					 int *currentIdx)
+{
+	QTimer::singleShot(0, this, [this, list, newIdx, currentIdx]() {
+		list->ensureWidgetVisible(list->WidgetAt(*currentIdx));
+		auto *widget = list->WidgetAt(newIdx);
+		if (widget) {
+			widget->FocusTypeSelection();
+		}
+	});
+}
+
 static void resetSegmentHighlights(MacroSegmentList *list)
 {
 	MacroSegmentEdit *widget = nullptr;
@@ -1087,10 +1099,7 @@ void MacroEdit::AddMacroAction(Macro *macro, int idx, const std::string &id,
 	ui->actionsList->SetHelpMsgVisible(false);
 	emit(MacroSegmentOrderChanged());
 
-	QTimer::singleShot(0, this, [this]() {
-		ui->actionsList->ensureWidgetVisible(
-			ui->actionsList->WidgetAt(currentActionIdx));
-	});
+	ScrollAndFocusNewSegment(ui->actionsList, idx, &currentActionIdx);
 }
 
 void MacroEdit::AddMacroAction(int idx)
@@ -1118,6 +1127,9 @@ void MacroEdit::AddMacroAction(int idx)
 		macro->Actions().at(idx - 1)->Save(data);
 	}
 	AddMacroAction(macro.get(), idx, id, data);
+	if (idx < (int)macro->Actions().size()) {
+		macro->Actions().at(idx)->FixupVarMappingRefs();
+	}
 }
 
 void MacroEdit::on_actionAdd_clicked()
@@ -1395,10 +1407,8 @@ void MacroEdit::AddMacroElseAction(Macro *macro, int idx, const std::string &id,
 	ui->elseActionsList->SetHelpMsgVisible(false);
 	emit(MacroSegmentOrderChanged());
 
-	QTimer::singleShot(0, this, [this]() {
-		ui->elseActionsList->ensureWidgetVisible(
-			ui->elseActionsList->WidgetAt(currentElseActionIdx));
-	});
+	ScrollAndFocusNewSegment(ui->elseActionsList, idx,
+				 &currentElseActionIdx);
 }
 
 void MacroEdit::AddMacroElseAction(int idx)
@@ -1426,6 +1436,9 @@ void MacroEdit::AddMacroElseAction(int idx)
 		macro->ElseActions().at(idx - 1)->Save(data);
 	}
 	AddMacroElseAction(macro.get(), idx, id, data);
+	if (idx < (int)macro->ElseActions().size()) {
+		macro->ElseActions().at(idx)->FixupVarMappingRefs();
+	}
 }
 
 void MacroEdit::RemoveMacroElseAction(int idx)
@@ -1570,6 +1583,9 @@ void MacroEdit::AddMacroCondition(int idx)
 		macro->Conditions().at(idx - 1)->Save(data);
 	}
 	AddMacroCondition(macro.get(), idx, id, data.Get(), logic);
+	if (idx < (int)macro->Conditions().size()) {
+		macro->Conditions().at(idx)->FixupVarMappingRefs();
+	}
 }
 
 void MacroEdit::AddMacroCondition(Macro *macro, int idx, const std::string &id,
@@ -1602,10 +1618,7 @@ void MacroEdit::AddMacroCondition(Macro *macro, int idx, const std::string &id,
 	ui->conditionsList->SetHelpMsgVisible(false);
 	emit(MacroSegmentOrderChanged());
 
-	QTimer::singleShot(0, this, [this]() {
-		ui->conditionsList->ensureWidgetVisible(
-			ui->conditionsList->WidgetAt(currentConditionIdx));
-	});
+	ScrollAndFocusNewSegment(ui->conditionsList, idx, &currentConditionIdx);
 }
 
 void MacroEdit::on_conditionAdd_clicked()

lib/macro/macro-edit.hpp

@@ -116,6 +116,8 @@ private:
 	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(MacroSection type, int idx);
 	void
 	SetupContextMenu(const QPoint &pos,

lib/macro/macro-export-builtin-extensions.cpp

@@ -0,0 +1,89 @@
+#include "macro-export-extensions.hpp"
+
+#include "action-queue.hpp"
+#include "variable.hpp"
+
+#include <obs.hpp>
+
+namespace advss {
+
+static bool setup();
+static bool setupDone = setup();
+
+static bool setup()
+{
+	// --- Variables ---
+	AddMacroExportExtension(
+		{"AdvSceneSwitcher.macroTab.export.variables", "variables",
+		 [](obs_data_t *data, const QStringList &selectedIds) {
+			 if (selectedIds.isEmpty()) {
+				 SaveVariables(data);
+				 return;
+			 }
+			 OBSDataArrayAutoRelease array =
+				 obs_data_array_create();
+			 for (const auto &v : GetVariables()) {
+				 const QString name =
+					 QString::fromStdString(v->Name());
+				 if (!selectedIds.contains(name)) {
+					 continue;
+				 }
+				 OBSDataAutoRelease item = obs_data_create();
+				 v->Save(item);
+				 obs_data_array_push_back(array, item);
+			 }
+			 obs_data_set_array(data, "variables", array);
+		 },
+		 [](obs_data_t *data, const QStringList &) {
+			 ImportVariables(data);
+		 },
+		 []() -> QList<QPair<QString, QString>> {
+			 QList<QPair<QString, QString>> items;
+			 for (const auto &v : GetVariables()) {
+				 const QString name =
+					 QString::fromStdString(v->Name());
+				 items.append({name, name});
+			 }
+			 return items;
+		 }});
+
+	// --- Action Queues ---
+	AddMacroExportExtension(
+		{"AdvSceneSwitcher.macroTab.export.actionQueues",
+		 "actionQueues",
+		 [](obs_data_t *data, const QStringList &selectedIds) {
+			 if (selectedIds.isEmpty()) {
+				 SaveActionQueues(data);
+				 return;
+			 }
+			 OBSDataArrayAutoRelease array =
+				 obs_data_array_create();
+			 for (const auto &q : GetActionQueues()) {
+				 const QString name =
+					 QString::fromStdString(q->Name());
+				 if (!selectedIds.contains(name)) {
+					 continue;
+				 }
+				 OBSDataAutoRelease item = obs_data_create();
+				 q->Save(item);
+				 obs_data_array_push_back(array, item);
+			 }
+			 obs_data_set_array(data, "actionQueues", array);
+		 },
+		 [](obs_data_t *data, const QStringList &) {
+			 ImportQueues(data);
+		 },
+		 []() -> QList<QPair<QString, QString>> {
+			 QList<QPair<QString, QString>> items;
+			 for (const auto &q : GetActionQueues()) {
+				 const QString name =
+					 QString::fromStdString(q->Name());
+				 items.append({name, name});
+			 }
+			 return items;
+		 }});
+
+	return true;
+}
+
+} // namespace advss

lib/macro/macro-export-extensions.cpp

@@ -0,0 +1,17 @@
+#include "macro-export-extensions.hpp"
+
+namespace advss {
+
+static std::vector<MacroExportExtension> extensions;
+
+void AddMacroExportExtension(const MacroExportExtension &ext)
+{
+	extensions.emplace_back(ext);
+}
+
+const std::vector<MacroExportExtension> &GetMacroExportExtensions()
+{
+	return extensions;
+}
+
+} // namespace advss

lib/macro/macro-export-extensions.hpp

@@ -0,0 +1,41 @@
+#pragma once
+
+#include "export-symbol-helper.hpp"
+
+#include <functional>
+#include <obs-data.h>
+#include <QList>
+#include <QPair>
+#include <QString>
+#include <vector>
+
+namespace advss {
+
+struct MacroExportExtension {
+	const char *displayNameKey;
+	const char *jsonKey;
+
+	// Export callback.
+	// Write content into 'data'.  'selectedIds' contains the item IDs the
+	// user explicitly checked; if empty (no per-item widget provided) save
+	// everything.
+	std::function<void(obs_data_t *data, const QStringList &selectedIds)>
+		save;
+
+	// Import callback.
+	// Read content from 'data'.  'selectedIds' contains the item IDs the
+	// user explicitly checked; if empty import every item found in 'data'.
+	std::function<void(obs_data_t *data, const QStringList &selectedIds)>
+		load;
+
+	// Optional: enumerate items available for export as (id, displayName)
+	// pairs.  When nullptr the extension appears as a single all-or-nothing
+	// checkbox in the export dialog.
+	std::function<QList<QPair<QString, QString>>()> getExportItems =
+		nullptr;
+};
+
+EXPORT void AddMacroExportExtension(const MacroExportExtension &ext);
+const std::vector<MacroExportExtension> &GetMacroExportExtensions();
+
+} // namespace advss

lib/macro/macro-export-import-dialog.cpp

@@ -1,22 +1,183 @@
 #include "macro-export-import-dialog.hpp"
+#include "macro-export-extensions.hpp"
 #include "obs-module-helper.hpp"
+#include "section.hpp"
 
 #include <obs.hpp>
-#include <QLayout>
-#include <QLabel>
 #include <QDialogButtonBox>
+#include <QLabel>
+#include <QLayout>
+#include <QScrollArea>
+#include <QSplitter>
+#include <algorithm>
+#include <numeric>
 
 namespace advss {
 
 static bool usePlainText = false;
 
-MacroExportImportDialog::MacroExportImportDialog(Type type)
+// ---------------------------------------------------------------------------
+// Compress / decompress helpers
+// ---------------------------------------------------------------------------
+
+static QString compressMacroString(const QString &input)
+{
+	QByteArray inputData = input.toUtf8();
+	auto compressedData = qCompress(inputData);
+	QByteArray encodedData = compressedData.toBase64();
+	return QString::fromUtf8(encodedData);
+}
+
+static QString decompressMacroString(const QString &input)
+{
+	QByteArray encodedData = input.toUtf8();
+	QByteArray compressedData = QByteArray::fromBase64(encodedData);
+	auto outputData = qUncompress(compressedData);
+	return QString::fromUtf8(outputData);
+}
+
+static bool isValidData(const QString &json)
+{
+	OBSDataAutoRelease data =
+		obs_data_create_from_json(json.toStdString().c_str());
+	return !!data;
+}
+
+// ---------------------------------------------------------------------------
+// Extension section
+// ---------------------------------------------------------------------------
+
+QWidget *MacroExportImportDialog::BuildExtensionWidget()
+{
+	auto wrapper = new QWidget(this);
+	auto wrapperLayout = new QVBoxLayout(wrapper);
+	wrapperLayout->setContentsMargins(0, 0, 0, 0);
+	wrapperLayout->setSpacing(4);
+
+	wrapperLayout->addWidget(new QLabel(obs_module_text(
+		"AdvSceneSwitcher.macroTab.export.additionalContent")));
+
+	auto outerContent = new QWidget();
+	auto outerLayout = new QVBoxLayout(outerContent);
+	outerLayout->setContentsMargins(4, 4, 4, 4);
+	outerLayout->setSpacing(4);
+
+	const auto &extensions = GetMacroExportExtensions();
+
+	std::vector<int> order(extensions.size());
+	std::iota(order.begin(), order.end(), 0);
+	std::sort(order.begin(), order.end(), [&](int a, int b) {
+		return QString::localeAwareCompare(
+			       obs_module_text(extensions[a].displayNameKey),
+			       obs_module_text(extensions[b].displayNameKey)) <
+		       0;
+	});
+
+	for (int extIdx : order) {
+		const auto &ext = extensions[extIdx];
+		ExtensionUI ui;
+
+		// Simple all-or-nothing checkbox (no sub-items).
+		if (!ext.getExportItems) {
+			ui.mainCheck = new QCheckBox(
+				obs_module_text(ext.displayNameKey),
+				outerContent);
+			ui.mainCheck->setChecked(false);
+			connect(ui.mainCheck, &QCheckBox::stateChanged, this,
+				&MacroExportImportDialog::UpdateExportString);
+			outerLayout->addWidget(ui.mainCheck);
+			_extensionUIs.append(std::move(ui));
+			_extensionOrder.push_back(extIdx);
+			continue;
+		}
+
+		// Extensions with per-item selection get their own inner
+		// Section: the main checkbox sits in the header (next to the
+		// toggle arrow) and the per-item checkboxes live in the
+		// collapsible content area.
+		auto items = ext.getExportItems();
+		if (items.isEmpty()) {
+			continue;
+		}
+
+		std::sort(items.begin(), items.end(),
+			  [](const QPair<QString, QString> &a,
+			     const QPair<QString, QString> &b) {
+				  return QString::localeAwareCompare(
+						 a.second, b.second) < 0;
+			  });
+
+		auto innerSection = new Section(200, outerContent);
+
+		ui.mainCheck =
+			new QCheckBox(obs_module_text(ext.displayNameKey));
+		ui.mainCheck->setChecked(false);
+		innerSection->AddHeaderWidget(ui.mainCheck);
+
+		auto subWidget = new QWidget();
+		auto subLayout = new QVBoxLayout(subWidget);
+		subLayout->setContentsMargins(4, 2, 4, 2);
+		subLayout->setSpacing(2);
+
+		for (const auto &[id, displayName] : items) {
+			auto cb = new QCheckBox(displayName, subWidget);
+			cb->setChecked(false);
+			subLayout->addWidget(cb);
+			ui.itemChecks.append({id, cb});
+			connect(cb, &QCheckBox::stateChanged, this,
+				&MacroExportImportDialog::UpdateExportString);
+		}
+
+		// Main checkbox toggles all sub-items.
+		// Capture uiIdx (position in _extensionUIs after append).
+		const int uiIdx = _extensionUIs.size();
+		connect(ui.mainCheck, &QCheckBox::stateChanged, this,
+			[this, uiIdx](int state) {
+				if (state == Qt::PartiallyChecked)
+					return;
+				const bool checked = (state == Qt::Checked);
+				if (uiIdx < _extensionUIs.size()) {
+					for (auto &[id, cb] :
+					     _extensionUIs[uiIdx].itemChecks) {
+						QSignalBlocker b(cb);
+						cb->setChecked(checked);
+					}
+				}
+				UpdateExportString();
+			});
+
+		innerSection->SetContent(subWidget, true);
+		outerLayout->addWidget(innerSection);
+		_extensionUIs.append(std::move(ui));
+		_extensionOrder.push_back(extIdx);
+	}
+
+	outerLayout->addStretch();
+
+	auto scrollArea = new QScrollArea(wrapper);
+	scrollArea->setWidget(outerContent);
+	scrollArea->setWidgetResizable(true);
+	scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+	scrollArea->setFrameShape(QFrame::NoFrame);
+	wrapperLayout->addWidget(scrollArea);
+
+	return wrapper;
+}
+
+// ---------------------------------------------------------------------------
+// Constructor
+// ---------------------------------------------------------------------------
+
+MacroExportImportDialog::MacroExportImportDialog(Type type,
+						 const QString &baseJson)
 	: QDialog(nullptr),
+	  _baseJson(baseJson),
 	  _importExportString(new QPlainTextEdit(this)),
 	  _usePlainText(new QCheckBox(obs_module_text(
 		  "AdvSceneSwitcher.macroTab.export.usePlainText")))
 {
 	_importExportString->setReadOnly(type == Type::EXPORT_MACRO);
+
 	auto label = new QLabel(obs_module_text(
 		type == Type::EXPORT_MACRO
 			? "AdvSceneSwitcher.macroTab.export.info"
@@ -39,40 +200,90 @@ MacroExportImportDialog::MacroExportImportDialog(Type type)
 	connect(_usePlainText, &QCheckBox::stateChanged, this,
 		&MacroExportImportDialog::UsePlainTextChanged);
 
-	auto layout = new QVBoxLayout;
-	layout->addWidget(label);
-	layout->addWidget(_importExportString);
-	layout->addWidget(_usePlainText);
+	auto layout = new QVBoxLayout(this);
+
+	if (type == Type::EXPORT_MACRO && !GetMacroExportExtensions().empty()) {
+		auto splitter = new QSplitter(Qt::Vertical, this);
+		splitter->setChildrenCollapsible(false);
+		splitter->addWidget(BuildExtensionWidget());
+
+		auto textWidget = new QWidget(splitter);
+		auto textLayout = new QVBoxLayout(textWidget);
+		textLayout->setContentsMargins(0, 0, 0, 0);
+		textLayout->addWidget(label);
+		textLayout->addWidget(_importExportString);
+		textLayout->addWidget(_usePlainText);
+		splitter->addWidget(textWidget);
+
+		layout->addWidget(splitter);
+	} else {
+		layout->addWidget(label);
+		layout->addWidget(_importExportString);
+		layout->addWidget(_usePlainText);
+	}
+
 	layout->addWidget(buttons);
 	setLayout(layout);
 
 	setWindowTitle(obs_module_text("AdvSceneSwitcher.windowTitle"));
+
+	if (type == Type::EXPORT_MACRO) {
+		RefreshExportText();
+	}
 }
 
-QString compressMacroString(const QString &input)
+// ---------------------------------------------------------------------------
+// Export string helpers
+// ---------------------------------------------------------------------------
+
+QString MacroExportImportDialog::BuildExportJson() const
 {
-	QByteArray inputData = input.toUtf8();
-	auto compressedData = qCompress(inputData);
-	QByteArray encodedData = compressedData.toBase64();
-	return QString::fromUtf8(encodedData);
+	OBSDataAutoRelease data =
+		obs_data_create_from_json(_baseJson.toStdString().c_str());
+	if (!data) {
+		return _baseJson;
+	}
+
+	const auto &extensions = GetMacroExportExtensions();
+	for (int i = 0; i < (int)_extensionUIs.size(); ++i) {
+		const auto &ui = _extensionUIs[i];
+
+		QStringList selectedIds;
+		if (ui.itemChecks.isEmpty()) {
+			if (!ui.mainCheck->isChecked()) {
+				continue;
+			}
+		} else {
+			for (const auto &[id, cb] : ui.itemChecks) {
+				if (cb->isChecked()) {
+					selectedIds << id;
+				}
+			}
+			if (selectedIds.isEmpty()) {
+				continue;
+			}
+		}
+
+		extensions[_extensionOrder[i]].save(data, selectedIds);
+	}
+
+	const char *json = obs_data_get_json(data);
+	return json ? QString::fromUtf8(json) : QString{};
 }
 
-QString decompressMacroString(const QString &input)
+void MacroExportImportDialog::RefreshExportText()
 {
-	QByteArray encodedData = input.toUtf8();
-	QByteArray compressedData = QByteArray::fromBase64(encodedData);
-	auto outputData = qUncompress(compressedData);
-	return QString::fromUtf8(outputData);
+	const QString json = BuildExportJson();
+	if (usePlainText) {
+		_importExportString->setPlainText(json);
+	} else {
+		_importExportString->setPlainText(compressMacroString(json));
+	}
 }
 
-void MacroExportImportDialog::ExportMacros(const QString &json)
+void MacroExportImportDialog::UpdateExportString()
 {
-	MacroExportImportDialog dialog(
-		MacroExportImportDialog::Type::EXPORT_MACRO);
-	dialog._importExportString->setPlainText(compressMacroString(json));
-	dialog.adjustSize();
-	dialog.updateGeometry();
-	dialog.exec();
+	RefreshExportText();
 }
 
 void MacroExportImportDialog::UsePlainTextChanged(int value)
@@ -90,26 +301,45 @@ void MacroExportImportDialog::UsePlainTextChanged(int value)
 	usePlainText = value;
 }
 
-static bool isValidData(const QString &json)
+// ---------------------------------------------------------------------------
+// Static entry points
+// ---------------------------------------------------------------------------
+
+void MacroExportImportDialog::ExportMacros(obs_data_t *macroData)
 {
-	OBSDataAutoRelease data =
-		obs_data_create_from_json(json.toStdString().c_str());
-	return !!data;
+	const char *rawJson = obs_data_get_json(macroData);
+	const QString baseJson = rawJson ? QString::fromUtf8(rawJson)
+					 : QString{};
+
+	MacroExportImportDialog dialog(Type::EXPORT_MACRO, baseJson);
+	dialog.adjustSize();
+	dialog.updateGeometry();
+	dialog.exec();
 }
 
 bool MacroExportImportDialog::ImportMacros(QString &json)
 {
-	MacroExportImportDialog dialog(
-		MacroExportImportDialog::Type::IMPORT_MACRO);
-	if (dialog.exec() == QDialog::Accepted) {
-		json = decompressMacroString(
-			dialog._importExportString->toPlainText());
-		if (!isValidData(json)) { // Fallback to support raw json format
-			json = dialog._importExportString->toPlainText();
-		}
-		return true;
+	MacroExportImportDialog dialog(Type::IMPORT_MACRO);
+	if (dialog.exec() != QDialog::Accepted) {
+		return false;
 	}
-	return false;
+
+	json = decompressMacroString(dialog._importExportString->toPlainText());
+	if (!isValidData(json)) {
+		// Fallback: support raw (uncompressed) JSON pasted directly.
+		json = dialog._importExportString->toPlainText();
+	}
+
+	// Invoke all extension load callbacks.
+	OBSDataAutoRelease data =
+		obs_data_create_from_json(json.toStdString().c_str());
+	if (data) {
+		for (const auto &ext : GetMacroExportExtensions()) {
+			ext.load(data, {});
+		}
+	}
+
+	return true;
 }
 
 } // namespace advss

lib/macro/macro-export-import-dialog.hpp

@@ -1,25 +1,47 @@
 #pragma once
+
 #include <QCheckBox>
 #include <QDialog>
+#include <QList>
 #include <QPlainTextEdit>
 
+#include <obs-data.h>
+#include <vector>
+
 namespace advss {
 
 class MacroExportImportDialog : public QDialog {
 	Q_OBJECT
 public:
 	enum class Type { EXPORT_MACRO, IMPORT_MACRO };
-	MacroExportImportDialog(Type type);
 
-	static void ExportMacros(const QString &json);
+	static void ExportMacros(obs_data_t *macroData);
 	static bool ImportMacros(QString &json);
 
 private slots:
 	void UsePlainTextChanged(int);
+	void UpdateExportString();
 
 private:
+	explicit MacroExportImportDialog(Type type,
+					 const QString &baseJson = {});
+
+	// Per-extension widgets
+	struct ExtensionUI {
+		QCheckBox *mainCheck = nullptr;
+		// (itemId, checkbox) pairs - empty when no per-item selection.
+		QList<QPair<QString, QCheckBox *>> itemChecks;
+	};
+
+	QWidget *BuildExtensionWidget();
+	QString BuildExportJson() const;
+	void RefreshExportText();
+
+	QString _baseJson;
 	QPlainTextEdit *_importExportString;
 	QCheckBox *_usePlainText;
+	QList<ExtensionUI> _extensionUIs;
+	std::vector<int> _extensionOrder;
 };
 
 } // namespace advss

lib/macro/macro-helpers.cpp

@@ -214,6 +214,20 @@ bool MacroIsPaused(const Macro *macro)
 	return macro ? macro->Paused() : true;
 }
 
+void SetMacroPaused(Macro *macro, bool paused)
+{
+	if (macro) {
+		macro->SetPaused(paused);
+	}
+}
+
+void StopMacro(Macro *macro)
+{
+	if (macro) {
+		macro->Stop();
+	}
+}
+
 bool MacroWasPausedSince(
 	const Macro *macro,
 	const std::chrono::high_resolution_clock::time_point &time)
@@ -237,14 +251,20 @@ void AddMacroHelperThread(Macro *macro, std::thread &&newThread)
 	macro->AddHelperThread(std::move(newThread));
 }
 
-bool RunMacroActions(Macro *macro)
+bool RunMacroActions(Macro *macro, bool forceParallel, bool ignorePause)
 {
-	return macro && macro->PerformActions(true);
+	return macro && macro->PerformActions(true, forceParallel, ignorePause);
 }
 
-bool RunMacroElseActions(Macro *macro)
+bool RunMacroElseActions(Macro *macro, bool forceParallel, bool ignorePause)
 {
-	return macro && macro->PerformActions(false);
+	return macro &&
+	       macro->PerformActions(false, forceParallel, ignorePause);
+}
+
+bool CheckMacroConditions(Macro *macro, bool ignorePause)
+{
+	return macro && macro->CheckConditions(ignorePause);
 }
 
 void ResetMacroConditionTimers(Macro *macro)

lib/macro/macro-helpers.hpp

@@ -58,6 +58,8 @@ LastMacroConditionCheckTime(const Macro *);
 
 EXPORT bool MacroIsStopped(const Macro *);
 EXPORT bool MacroIsPaused(const Macro *);
+EXPORT void SetMacroPaused(Macro *, bool paused);
+EXPORT void StopMacro(Macro *);
 EXPORT bool
 MacroWasPausedSince(const Macro *,
 		    const std::chrono::high_resolution_clock::time_point &);
@@ -66,11 +68,16 @@ EXPORT bool MacroWasCheckedSinceLastStart(const Macro *);
 EXPORT void AddMacroHelperThread(Macro *, std::thread &&);
 
 EXPORT bool CheckMacros();
+EXPORT bool CheckMacroConditions(Macro *, bool ignorePause = false);
 
-EXPORT bool RunMacroActions(Macro *);
-bool RunMacroElseActions(Macro *);
+EXPORT bool RunMacroActions(Macro *, bool forceParallel = false,
+			    bool ignorePause = false);
+EXPORT bool RunMacroElseActions(Macro *, bool forceParallel = false,
+				bool ignorePause = false);
 EXPORT bool RunMacros();
-void StopAllMacros();
+
+void SignalStopAllMacros();
+void WaitForAllMacros();
 
 EXPORT void LoadMacros(obs_data_t *obj);
 EXPORT void SaveMacros(obs_data_t *obj);

lib/macro/macro-ref.cpp

@@ -1,6 +1,8 @@
 #include "macro-ref.hpp"
 #include "macro.hpp"
 
+#include "plugin-state-helpers.hpp"
+
 namespace advss {
 
 MacroRef::MacroRef(std::string name)
@@ -19,6 +21,7 @@ void MacroRef::Load(obs_data_t *obj)
 	auto name = obs_data_get_string(obj, "macro");
 	_postLoadName = name;
 	_macro = GetWeakMacroByName(name);
+	AddPostLoadStep([this]() { MacroRef::PostLoad(); });
 }
 
 void MacroRef::PostLoad()
@@ -71,11 +74,11 @@ void LoadMacroList(obs_data_t *obj, std::vector<MacroRef> &macros,
 {
 	obs_data_array_t *array = obs_data_get_array(obj, name.c_str());
 	size_t count = obs_data_array_count(array);
+	macros.reserve(macros.size() + count);
 	for (size_t i = 0; i < count; i++) {
 		obs_data_t *array_obj = obs_data_array_item(array, i);
-		MacroRef ref;
-		ref.Load(array_obj);
-		macros.push_back(ref);
+		macros.emplace_back();
+		macros.back().Load(array_obj);
 		obs_data_release(array_obj);
 	}
 	obs_data_array_release(array);

lib/macro/macro-run-button.cpp

@@ -108,7 +108,7 @@ void MacroRunButton::Pressed()
 	const bool abortMacro = DisplayMessage(
 		err.arg(QString::fromStdString(macro->Name())), true);
 	if (abortMacro) {
-		macro->Stop();
+		macro->SignalStop();
 	}
 }
 

lib/macro/macro-segment-copy-paste.cpp

@@ -72,15 +72,24 @@ void MacroEdit::PasteMacroSegment()
 		}
 		AddMacroCondition(macro.get(), macro->Conditions().size(),
 				  copyInfo.segment->GetId(), data.Get(), logic);
+		if (!macro->Conditions().empty()) {
+			macro->Conditions().back()->FixupVarMappingRefs();
+		}
 		break;
 	}
 	case MacroSegmentCopyInfo::Type::ACTION:
 		AddMacroAction(macro.get(), macro->Actions().size(),
 			       copyInfo.segment->GetId(), data.Get());
+		if (!macro->Actions().empty()) {
+			macro->Actions().back()->FixupVarMappingRefs();
+		}
 		break;
 	case MacroSegmentCopyInfo::Type::ELSE:
 		AddMacroElseAction(macro.get(), macro->ElseActions().size(),
 				   copyInfo.segment->GetId(), data.Get());
+		if (!macro->ElseActions().empty()) {
+			macro->ElseActions().back()->FixupVarMappingRefs();
+		}
 		break;
 	default:
 		break;

lib/macro/macro-segment.cpp

@@ -54,6 +54,23 @@ const std::vector<VarMapping> &MacroSegment::GetVarMappings() const
 void MacroSegment::SetVarMappings(const std::vector<VarMapping> &mappings)
 {
 	_varMappings = mappings;
+	IncrementTempVarInUseGeneration();
+}
+
+void MacroSegment::FixupVarMappingRefs()
+{
+	for (auto &mapping : _varMappings) {
+		if (!mapping.tempVar.HasValidID()) {
+			continue;
+		}
+		for (const auto &var : _tempVariables) {
+			if (var.ID() == mapping.tempVar.GetID()) {
+				mapping.tempVar = var.GetRef();
+				break;
+			}
+		}
+	}
+	NotifyUIAboutTempVarChange(this);
 }
 
 std::vector<TempVariable> MacroSegment::GetOwnTempVars() const
@@ -80,7 +97,7 @@ bool MacroSegment::Save(obs_data_t *obj) const
 	obs_data_set_bool(data, "useCustomLabel", _useCustomLabel);
 	obs_data_set_string(data, "customLabel", _customLabel.c_str());
 	obs_data_set_bool(data, "enabled", _enabled);
-	obs_data_set_int(data, "version", 1);
+	obs_data_set_int(data, "version", 2);
 
 	OBSDataArrayAutoRelease mappingsArray = obs_data_array_create();
 	for (const auto &mapping : _varMappings) {
@@ -112,6 +129,12 @@ bool MacroSegment::Load(obs_data_t *obj)
 		_enabled = obs_data_get_bool(obj, "enabled");
 	}
 
+	// Reset the previously unused "enabled" value for conditions to "true"
+	if (obs_data_get_int(data, "version") < 2 &&
+	    obs_data_has_user_value(obj, "logic")) {
+		_enabled = true;
+	}
+
 	_varMappings.clear();
 	OBSDataArrayAutoRelease mappingsArray =
 		obs_data_get_array(data, "varMappings");

lib/macro/macro-segment.hpp

@@ -57,6 +57,7 @@ public:
 	const std::vector<VarMapping> &GetVarMappings() const;
 	void SetVarMappings(const std::vector<VarMapping> &mappings);
 	std::vector<TempVariable> GetOwnTempVars() const;
+	void FixupVarMappingRefs();
 
 protected:
 	friend bool SupportsVariableValue(MacroSegment *);
@@ -133,6 +134,7 @@ public:
 	void SetSelected(bool);
 	virtual std::shared_ptr<MacroSegment> Data() const = 0;
 	virtual void SetupWidgets(bool basicSetup = false) = 0;
+	virtual void FocusTypeSelection() {}
 
 	void SetupVarMappings(MacroSegment *segment);
 

lib/macro/macro-signals.hpp

@@ -18,6 +18,7 @@ signals:
 	void Remove(const QString &);
 	void SegmentOrderChanged();
 	void HighlightChanged(bool value);
+	void ConditionTypeCreated(const QString &typeId);
 
 private:
 	MacroSignalManager(QObject *parent = nullptr);

lib/macro/macro-tab.cpp

@@ -1,5 +1,4 @@
 #include "advanced-scene-switcher.hpp"
-#include "action-queue.hpp"
 #include "macro-action-edit.hpp"
 #include "macro-condition-edit.hpp"
 #include "macro-export-import-dialog.hpp"
@@ -316,13 +315,9 @@ void AdvSceneSwitcher::ExportMacros() const
 		obs_data_array_push_back(macroArray, obj);
 	}
 	obs_data_set_array(data, "macros", macroArray);
-	SaveVariables(data);
-	SaveActionQueues(data);
 	obs_data_set_string(data, "version", g_GIT_TAG);
-	auto json = obs_data_get_json(data);
-	QString exportString(json);
 
-	MacroExportImportDialog::ExportMacros(exportString);
+	MacroExportImportDialog::ExportMacros(data);
 }
 
 bool AdvSceneSwitcher::ResolveMacroImportNameConflict(
@@ -384,8 +379,6 @@ void AdvSceneSwitcher::ImportMacros()
 		ImportMacros();
 		return;
 	}
-	ImportVariables(data);
-	ImportQueues(data);
 
 	auto version = obs_data_get_string(data, "version");
 	if (strcmp(version, g_GIT_TAG) != 0) {
@@ -402,7 +395,7 @@ void AdvSceneSwitcher::ImportMacros()
 	std::vector<std::shared_ptr<Macro>> importedMacros;
 	auto &tempMacros = GetTemporaryMacros();
 
-	auto lock = LockContext();
+	std::unique_lock<std::mutex> lock(*GetMutex());
 	for (size_t i = 0; i < count; i++) {
 		tempMacros.clear();
 
@@ -412,10 +405,14 @@ void AdvSceneSwitcher::ImportMacros()
 		macro->Load(array_obj);
 		RunAndClearPostLoadSteps();
 
-		if (macroNameExists(macro->Name()) &&
-		    !ResolveMacroImportNameConflict(macro)) {
-			groupSize--;
-			continue;
+		if (macroNameExists(macro->Name())) {
+			lock.unlock();
+			bool resolved = ResolveMacroImportNameConflict(macro);
+			lock.lock();
+			if (!resolved) {
+				groupSize--;
+				continue;
+			}
 		}
 
 		importedMacros.emplace_back(macro);
@@ -557,6 +554,10 @@ void AdvSceneSwitcher::HighlightOnChange() const
 		return;
 	}
 
+	if (macro->Paused()) {
+		return;
+	}
+
 	if (macro->ActionTriggerModePreventedActionsSince(
 		    lastOnChangeHighlightCheckTime)) {
 		HighlightWidget(ui->actionTriggerMode, Qt::yellow,

lib/macro/macro.cpp

@@ -129,12 +129,11 @@ static bool checkCondition(const std::shared_ptr<MacroCondition> &condition)
 	const auto timeSpent = endTime - startTime;
 
 	if (timeSpent >= perfLogThreshold) {
-		const long int ms =
-			std::chrono::duration_cast<std::chrono::milliseconds>(
-				timeSpent)
-				.count();
 		blog(LOG_WARNING,
-		     "spent %ld ms in %s condition check of macro '%s'!", ms,
+		     "spent %lld ms in %s condition check of macro '%s'!",
+		     (long long)std::chrono::duration_cast<
+			     std::chrono::milliseconds>(timeSpent)
+			     .count(),
 		     condition->GetId().c_str(),
 		     condition->GetMacro()->Name().c_str());
 	}
@@ -157,6 +156,15 @@ bool Macro::CheckConditionHelper(
 		return conditionMatched;
 	};
 
+	if (!condition->Enabled()) {
+		vblog(LOG_INFO, "ignoring condition '%s' for '%s'",
+		      condition->GetId().c_str(), _name.c_str());
+		if (!_useShortCircuitEvaluation) {
+			(void)evaluateCondition();
+		}
+		return _matched;
+	}
+
 	const auto logicType = condition->GetLogicType();
 	if (logicType == Logic::Type::NONE) {
 		vblog(LOG_INFO, "ignoring condition '%s' for '%s'",
@@ -281,7 +289,7 @@ bool Macro::CheckConditions(bool ignorePause)
 
 	const bool hasActionsToExecute = _matched ? (_actions.size() > 0)
 						  : (_elseActions.size() > 0);
-	if (!_actionModeMatch && hasActionsToExecute) {
+	if (!_actionModeMatch && hasActionsToExecute && !_paused) {
 		_lastActionRunModePreventTime =
 			std::chrono::high_resolution_clock::now();
 	}
@@ -380,7 +388,7 @@ bool Macro::ShouldRunActions() const
 		!_paused && (_matched || _elseActions.size() > 0) &&
 		_actionModeMatch;
 
-	if (VerboseLoggingEnabled() && !_actionModeMatch) {
+	if (VerboseLoggingEnabled() && !_actionModeMatch && !_paused) {
 		if (_matched && _actions.size() > 0) {
 			blog(LOG_INFO, "skip actions for Macro %s (on change)",
 			     _name.c_str());
@@ -544,6 +552,12 @@ Macro::PauseStateSaveBehavior Macro::GetPauseStateSaveBehavior() const
 	return _pauseSaveBehavior;
 }
 
+void Macro::SignalStop()
+{
+	_stop = true;
+	GetMacroWaitCV().notify_all();
+}
+
 void Macro::Stop()
 {
 	_stop = true;
@@ -1308,7 +1322,14 @@ bool RunMacros()
 	return true;
 }
 
-void StopAllMacros()
+void SignalStopAllMacros()
+{
+	for (const auto &m : GetAllMacros()) {
+		m->SignalStop();
+	}
+}
+
+void WaitForAllMacros()
 {
 	for (const auto &m : GetAllMacros()) {
 		m->Stop();

lib/macro/macro.hpp

@@ -61,6 +61,7 @@ public:
 	PauseStateSaveBehavior GetPauseStateSaveBehavior() const;
 
 	void Stop();
+	void SignalStop();
 	bool GetStop() const { return _stop; }
 	void ResetTimers();
 
@@ -228,7 +229,7 @@ void LoadMacros(obs_data_t *obj);
 void SaveMacros(obs_data_t *obj);
 bool CheckMacros();
 bool RunMacros();
-void StopAllMacros();
+void WaitForAllMacros();
 void InvalidateMacroTempVarValues();
 std::shared_ptr<Macro> GetMacroWithInvalidConditionInterval();
 

lib/osx/advanced-scene-switcher-osx.mm

@@ -6,6 +6,7 @@
 #import <Carbon/Carbon.h>
 #include <Carbon/Carbon.h>
 #include <util/platform.h>
+#include <set>
 #include <vector>
 #include <QStringList>
 #include <QRegularExpression>
@@ -14,41 +15,13 @@
 
 namespace advss {
 
-std::vector<std::string> GetWindowList()
+static std::string nsStringToStdString(NSString *str)
 {
-	std::vector<std::string> windows;
-	@autoreleasepool {
-		CFArrayRef cfApps = CGWindowListCopyWindowInfo(
-			kCGWindowListOptionOnScreenOnly, kCGNullWindowID);
-		NSMutableArray *apps = (__bridge NSMutableArray *)cfApps;
-		for (NSDictionary *app in apps) {
-			std::string name([[app objectForKey:@"kCGWindowName"]
-						 UTF8String],
-					 [[app objectForKey:@"kCGWindowName"]
-						 lengthOfBytesUsingEncoding:
-							 NSUTF8StringEncoding]);
-			std::string owner(
-				[[app objectForKey:@"kCGWindowOwnerName"]
-					UTF8String],
-				[[app objectForKey:@"kCGWindowOwnerName"]
-					lengthOfBytesUsingEncoding:
-						NSUTF8StringEncoding]);
-
-			if (!name.empty() &&
-			    find(windows.begin(), windows.end(), name) ==
-				    windows.end()) {
-				windows.emplace_back(name);
-			}
-			if (!owner.empty() &&
-			    find(windows.begin(), windows.end(), owner) ==
-				    windows.end()) {
-				windows.emplace_back(owner);
-			}
-		}
-		apps = nil;
-		CFRelease(cfApps);
+	if (!str) {
+		return "";
 	}
-	return windows;
+	const char *utf8 = [str UTF8String];
+	return utf8 ? utf8 : "";
 }
 
 std::string GetCurrentWindowTitle()
@@ -100,100 +73,49 @@ std::string GetCurrentWindowTitle()
 	return title;
 }
 
-bool isWindowOriginOnScreen(NSDictionary *app, NSScreen *screen,
-			    bool fullscreen = false)
-{
-	NSArray *screens = [NSScreen screens];
-	NSRect mainScreenFrame = [screens[0] frame];
-	NSRect screenFrame;
-	if (fullscreen) {
-		screenFrame = [screen frame];
-	} else {
-		screenFrame = [screen visibleFrame];
-	}
-	NSRect windowBounds;
-	CGRectMakeWithDictionaryRepresentation(
-		(CFDictionaryRef)[app objectForKey:@"kCGWindowBounds"],
-		&windowBounds);
-
-	return (windowBounds.origin.x == screenFrame.origin.x &&
-		(mainScreenFrame.size.height - screenFrame.size.height -
-			 windowBounds.origin.y ==
-		 screenFrame.origin.y));
-}
 
 bool isWindowMaximizedOnScreen(NSDictionary *app, NSScreen *screen)
 {
-	double maximizedTolerance = 0.99;
-	NSRect screenFrame = [screen frame];
 	NSRect windowBounds;
 	CGRectMakeWithDictionaryRepresentation(
 		(CFDictionaryRef)[app objectForKey:@"kCGWindowBounds"],
 		&windowBounds);
 
-	int sumX = windowBounds.origin.x + windowBounds.size.width;
-	int sumY = windowBounds.origin.y + windowBounds.size.height;
+	// CGWindowList: flipped coords, origin at top-left of main display.
+	// NSScreen: Cocoa coords, origin at bottom-left of main display.
+	NSRect mainFrame = [[NSScreen screens][0] frame];
+	NSRect visFrame = [screen visibleFrame];
 
-	// Return false if window spans over multiple screens
-	if (sumX > screenFrame.size.width) {
+	// Convert visible area to CGWindow coordinates.
+	// screenTop is just below the menubar; screenBottom is just above the
+	// dock.
+	CGFloat screenLeft = visFrame.origin.x;
+	CGFloat screenTop =
+		mainFrame.size.height - visFrame.origin.y - visFrame.size.height;
+	CGFloat screenRight = screenLeft + visFrame.size.width;
+	CGFloat screenBottom = screenTop + visFrame.size.height;
+
+	const double tolerance = 4.0;
+
+	// Width must span the full visible width.
+	if (fabs(windowBounds.origin.x - screenLeft) > tolerance) {
 		return false;
 	}
-	if (sumY > screenFrame.size.height) {
+	if (fabs((windowBounds.origin.x + windowBounds.size.width) -
+		 screenRight) > tolerance) {
 		return false;
 	}
-
-	return ((double)sumX / (double)screenFrame.size.width) >
-		       maximizedTolerance &&
-	       ((double)sumY / (double)screenFrame.size.height) >
-		       maximizedTolerance;
-}
-
-bool nameMachesPattern(std::string windowName, std::string pattern)
-{
-	return QString::fromStdString(windowName)
-		.contains(QRegularExpression(QString::fromStdString(pattern)));
-}
-
-bool IsMaximized(const std::string &title)
-{
-	@autoreleasepool {
-		NSArray *screens = [NSScreen screens];
-		CFArrayRef cfApps = CGWindowListCopyWindowInfo(
-			kCGWindowListOptionOnScreenOnly, kCGNullWindowID);
-		NSMutableArray *apps = (__bridge NSMutableArray *)cfApps;
-		for (NSDictionary *app in apps) {
-			std::string name([[app objectForKey:@"kCGWindowName"]
-						 UTF8String],
-					 [[app objectForKey:@"kCGWindowName"]
-						 lengthOfBytesUsingEncoding:
-							 NSUTF8StringEncoding]);
-			std::string owner(
-				[[app objectForKey:@"kCGWindowOwnerName"]
-					UTF8String],
-				[[app objectForKey:@"kCGWindowOwnerName"]
-					lengthOfBytesUsingEncoding:
-						NSUTF8StringEncoding]);
-
-			bool equals = (title == name || title == owner);
-			bool matches = nameMachesPattern(name, title) ||
-				       nameMachesPattern(owner, title);
-			if (equals || matches) {
-				for (NSScreen *screen in screens) {
-					if (isWindowOriginOnScreen(app,
-								   screen) &&
-					    isWindowMaximizedOnScreen(app,
-								      screen)) {
-						apps = nil;
-						CFRelease(cfApps);
-						return true;
-					}
-				}
-			}
-		}
-		apps = nil;
-		CFRelease(cfApps);
+	// Bottom edge must align with the visible bottom (above dock).
+	if (fabs((windowBounds.origin.y + windowBounds.size.height) -
+		 screenBottom) > tolerance) {
+		return false;
 	}
-	return false;
+	// Top edge must be at or above the menubar line (some apps extend
+	// their window frame behind the menubar).
+	if (windowBounds.origin.y > screenTop + tolerance) {
+		return false;
+	}
+	return true;
 }
 
 bool isWindowFullscreenOnScreen(NSDictionary *app, NSScreen *screen)
@@ -207,52 +129,176 @@ bool isWindowFullscreenOnScreen(NSDictionary *app, NSScreen *screen)
 	return NSEqualSizes(windowBounds.size, screenFrame.size);
 }
 
-bool IsFullscreen(const std::string &title)
+std::vector<WindowInfo> GetWindows(const WindowQueryOptions &options)
 {
+	std::vector<WindowInfo> result;
+	const std::string foregroundTitle = GetCurrentWindowTitle();
+
 	@autoreleasepool {
 		NSArray *screens = [NSScreen screens];
-		CFArrayRef cfApps = CGWindowListCopyWindowInfo(
-			kCGWindowListOptionOnScreenOnly, kCGNullWindowID);
-		NSMutableArray *apps = (__bridge NSMutableArray *)cfApps;
-		for (NSDictionary *app in apps) {
-			std::string name([[app objectForKey:@"kCGWindowName"]
-						 UTF8String],
-					 [[app objectForKey:@"kCGWindowName"]
-						 lengthOfBytesUsingEncoding:
-							 NSUTF8StringEncoding]);
-			std::string owner(
-				[[app objectForKey:@"kCGWindowOwnerName"]
-					UTF8String],
-				[[app objectForKey:@"kCGWindowOwnerName"]
-					lengthOfBytesUsingEncoding:
-						NSUTF8StringEncoding]);
 
-			bool equals = (title == name || title == owner);
-			bool matches = nameMachesPattern(name, title) ||
-				       nameMachesPattern(owner, title);
-			if (equals || matches) {
+		CFArrayRef cfApps = CGWindowListCopyWindowInfo(
+			kCGWindowListExcludeDesktopElements, kCGNullWindowID);
+		NSMutableArray *apps = (__bridge NSMutableArray *)cfApps;
+
+		// Pre-compute which PIDs own at least one fullscreen-sized window.
+		// A fullscreen app reports a small chrome/title bar window first and
+		// its full-size content window second; checking only the first
+		// window's bounds gives a false negative.
+		std::set<int> fullscreenPIDs;
+		if (options.fullscreen) {
+			for (NSDictionary *app in apps) {
+				int layer = [[app objectForKey:@"kCGWindowLayer"]
+					intValue];
+				if (layer != 0) {
+					continue;
+				}
 				for (NSScreen *screen in screens) {
-					if (isWindowOriginOnScreen(app, screen,
-								   true) &&
-					    isWindowFullscreenOnScreen(
-						    app, screen)) {
-						apps = nil;
-						CFRelease(cfApps);
-						return true;
+					if (isWindowFullscreenOnScreen(app,
+								       screen)) {
+						int pid = [[app objectForKey:
+							@"kCGWindowOwnerPID"]
+							intValue];
+						fullscreenPIDs.insert(pid);
+						break;
 					}
 				}
 			}
 		}
+
+		std::set<int> maximizedPIDs;
+		if (options.maximized) {
+			for (NSDictionary *app in apps) {
+				int layer = [[app objectForKey:@"kCGWindowLayer"]
+					intValue];
+				if (layer != 0) {
+					continue;
+				}
+				for (NSScreen *screen in screens) {
+					if (isWindowMaximizedOnScreen(app,
+								      screen)) {
+						int pid = [[app objectForKey:
+							@"kCGWindowOwnerPID"]
+							intValue];
+						maximizedPIDs.insert(pid);
+						break;
+					}
+				}
+			}
+		}
+
+		// Pre-compute the largest-area window bounds per PID.
+		// CGWindowList often lists small auxiliary windows (toolbars,
+		// chrome) before the main content window; using the largest area
+		// avoids reporting those wrong bounds for geometry.
+		std::map<int, NSRect> largestBoundsPerPID;
+		if (options.geometry || options.maximized) {
+			for (NSDictionary *app in apps) {
+				int layer = [[app objectForKey:@"kCGWindowLayer"]
+					intValue];
+				if (layer != 0) {
+					continue;
+				}
+				NSRect b = NSZeroRect;
+				CGRectMakeWithDictionaryRepresentation(
+					(CFDictionaryRef)[app
+						objectForKey:@"kCGWindowBounds"],
+					&b);
+				int pid = [[app objectForKey:@"kCGWindowOwnerPID"]
+					intValue];
+				auto it = largestBoundsPerPID.find(pid);
+				if (it == largestBoundsPerPID.end() ||
+				    b.size.width * b.size.height >
+					    it->second.size.width *
+						    it->second.size.height) {
+					largestBoundsPerPID[pid] = b;
+				}
+			}
+		}
+
+		// Track titles already added to avoid duplicates (name + owner)
+		std::vector<std::string> seen;
+
+		for (NSDictionary *app in apps) {
+			int layer =
+				[[app objectForKey:@"kCGWindowLayer"] intValue];
+			if (layer != 0) {
+				continue;
+			}
+
+			std::string name = nsStringToStdString(
+				[app objectForKey:@"kCGWindowName"]);
+			std::string owner = nsStringToStdString(
+				[app objectForKey:@"kCGWindowOwnerName"]);
+
+			// Collect geometry once (used for multiple fields)
+			NSRect bounds = NSZeroRect;
+			if (options.geometry || options.fullscreen ||
+			    options.maximized) {
+				CGRectMakeWithDictionaryRepresentation(
+					(CFDictionaryRef)[app
+						objectForKey:@"kCGWindowBounds"],
+					&bounds);
+			}
+
+			// Process both the window name and the owner name as
+			// separate entries, matching the old GetWindowList() behaviour
+			for (int pass = 0; pass < 2; ++pass) {
+				const std::string &title = (pass == 0) ? name
+								       : owner;
+				if (title.empty()) {
+					continue;
+				}
+				if (std::find(seen.begin(), seen.end(),
+					      title) != seen.end()) {
+					continue;
+				}
+				seen.emplace_back(title);
+
+				WindowInfo info;
+				info.title = title;
+
+				if (options.focus) {
+					info.focused =
+						(title == foregroundTitle);
+				}
+
+				if (options.geometry || options.fullscreen ||
+				    options.maximized) {
+					int pid = [[app objectForKey:
+						@"kCGWindowOwnerPID"]
+						intValue];
+					auto it = largestBoundsPerPID.find(pid);
+					const NSRect &geoBounds =
+						(it != largestBoundsPerPID.end())
+							? it->second
+							: bounds;
+					info.x = (int)geoBounds.origin.x;
+					info.y = (int)geoBounds.origin.y;
+					info.width = (int)geoBounds.size.width;
+					info.height = (int)geoBounds.size.height;
+
+					if (options.fullscreen) {
+						info.fullscreen =
+							fullscreenPIDs.count(pid) >
+							0;
+					}
+
+					if (options.maximized) {
+						info.maximized =
+							maximizedPIDs.count(pid) >
+							0;
+					}
+				}
+
+				// windowClass and text not implemented on macOS
+				result.emplace_back(std::move(info));
+			}
+		}
 		apps = nil;
 		CFRelease(cfApps);
 	}
-	return false;
-}
-
-std::optional<std::string> GetTextInWindow(const std::string &)
-{
-	// Not implemented
-	return {};
+	return result;
 }
 
 int SecondsSinceLastInput()
@@ -341,8 +387,7 @@ QStringList GetProcessPathsFromName(const QString &name)
 				continue;
 			}
 			const char *nameStr = appName.UTF8String;
-			if (!nameStr ||
-			    name != QString::fromUtf8(nameStr)) {
+			if (!nameStr || name != QString::fromUtf8(nameStr)) {
 				continue;
 			}
 			NSURL *url = app.executableURL;

lib/platform-funcs.hpp

@@ -11,11 +11,31 @@ namespace advss {
 
 enum class HotkeyType;
 
-EXPORT std::vector<std::string> GetWindowList();
+struct WindowQueryOptions {
+	bool geometry = false;
+	bool focus = false;
+	bool fullscreen = false;
+	bool maximized = false;
+	bool windowClass = false; // Windows only, no-op on other platforms
+	bool text = false; // Windows only, expensive, no-op on other platforms
+};
+
+struct WindowInfo {
+	std::string title;
+	bool focused = false;
+	bool fullscreen = false;
+	bool maximized = false;
+	int x = 0;
+	int y = 0;
+	int width = 0;
+	int height = 0;
+	std::string windowClass;
+	std::optional<std::string> text;
+};
+
+EXPORT std::vector<WindowInfo>
+GetWindows(const WindowQueryOptions &options = {});
 EXPORT std::string GetCurrentWindowTitle();
-EXPORT bool IsFullscreen(const std::string &title);
-EXPORT bool IsMaximized(const std::string &title);
-EXPORT std::optional<std::string> GetTextInWindow(const std::string &window);
 EXPORT int SecondsSinceLastInput();
 EXPORT QStringList GetProcessList();
 EXPORT std::string GetForegroundProcessName();

lib/switcher-data.hpp

@@ -163,6 +163,8 @@ public:
 	bool disableHints = false;
 	bool disableFilterComboboxFilter = false;
 	bool hideLegacyTabs = true;
+	bool settingsLockEnabled = false;
+	std::string settingsLockPassword;
 	bool saveWindowGeo = false;
 	QPoint windowPos = {};
 	QSize windowSize = {};

lib/utils/condition-logic.cpp

@@ -8,7 +8,6 @@
 namespace advss {
 
 const std::map<Logic::Type, const char *> Logic::localeMap = {
-	{Logic::Type::NONE, {"AdvSceneSwitcher.logic.none"}},
 	{Logic::Type::AND, {"AdvSceneSwitcher.logic.and"}},
 	{Logic::Type::OR, {"AdvSceneSwitcher.logic.or"}},
 	{Logic::Type::AND_NOT, {"AdvSceneSwitcher.logic.andNot"}},
@@ -67,7 +66,7 @@ void Logic::PopulateLogicTypeSelection(QComboBox *list, bool isRootCondition)
 					 return typeValue < rootOffset;
 				 }}
 			       : std::function<bool(int)>{[](int typeValue) {
-					 return typeValue >= rootOffset;
+					 return typeValue > rootOffset;
 				 }};
 	for (const auto &[type, name] : localeMap) {
 		const int typeValue = static_cast<int>(type);

lib/utils/duration-control.cpp

@@ -11,6 +11,7 @@ static void populateUnits(QComboBox *list)
 	list->addItem(obs_module_text("AdvSceneSwitcher.unit.seconds"));
 	list->addItem(obs_module_text("AdvSceneSwitcher.unit.minutes"));
 	list->addItem(obs_module_text("AdvSceneSwitcher.unit.hours"));
+	list->addItem(obs_module_text("AdvSceneSwitcher.unit.days"));
 }
 
 DurationSelection::DurationSelection(QWidget *parent, bool showUnitSelection,
@@ -66,6 +67,8 @@ static int durationUnitToMultiplier(Duration::Unit u)
 		return 60;
 	case Duration::Unit::HOURS:
 		return 3600;
+	case Duration::Unit::DAYS:
+		return 86400;
 	default:
 		break;
 	}

lib/utils/duration.cpp

@@ -121,6 +121,8 @@ static std::string durationUnitToString(Duration::Unit u)
 		return obs_module_text("AdvSceneSwitcher.unit.minutes");
 	case Duration::Unit::HOURS:
 		return obs_module_text("AdvSceneSwitcher.unit.hours");
+	case Duration::Unit::DAYS:
+		return obs_module_text("AdvSceneSwitcher.unit.days");
 	default:
 		break;
 	}
@@ -151,6 +153,8 @@ static int durationUnitToMultiplier(Duration::Unit u)
 		return 60;
 	case Duration::Unit::HOURS:
 		return 3600;
+	case Duration::Unit::DAYS:
+		return 86400;
 	default:
 		break;
 	}

lib/utils/duration.hpp

@@ -27,6 +27,7 @@ public:
 		SECONDS,
 		MINUTES,
 		HOURS,
+		DAYS,
 	};
 	EXPORT Unit GetUnit() const { return _unit; }
 

lib/utils/first-run-wizard-audio.cpp

@@ -0,0 +1,425 @@
+#include "first-run-wizard-audio.hpp"
+#include "first-run-wizard-helpers.hpp"
+
+#include "layout-helpers.hpp"
+#include "log-helper.hpp"
+#include "macro-settings.hpp"
+#include "selection-helpers.hpp"
+
+#include <obs-data.h>
+#include <obs.hpp>
+
+#include <QHBoxLayout>
+#include <QMessageBox>
+#include <QVBoxLayout>
+#include <QWidget>
+
+namespace advss {
+
+namespace wiz {
+
+// Builds the obs_data blob for an audio volume condition,
+// matching MacroConditionAudio::Save() output.
+//
+// Checks output volume (checkType 0) ABOVE (outputCondition 0) the given
+// threshold in dB, held for at least `duration`.
+//
+// {
+//   "segmentSettings": { "enabled": true, "version": 2 },
+//   "id": "audio",
+//   "logic": 0,
+//   "durationModifier": {
+//     "time_constraint": 1,        // AT_LEAST
+//     "seconds": <Duration::Save output>
+//   },
+//   "audioSource": { "type": 0, "name": "<source>" },
+//   "monitor": 0,
+//   "volume":      { "value": 0.0, "type": 0 },
+//   "syncOffset":  { "value": 0,   "type": 0 },
+//   "balance":     { "value": 0.5, "type": 0 },
+//   "checkType": 0,                // OUTPUT_VOLUME
+//   "outputCondition": 0,          // ABOVE
+//   "volumeCondition": 0,
+//   "useDb": true,
+//   "volumeDB": { "value": <thresholdDb>, "type": 0 },
+//   "version": 3
+// }
+static OBSDataAutoRelease buildAudioConditionData(const QString &sourceName,
+						  double thresholdDb,
+						  const Duration &duration)
+{
+	OBSDataAutoRelease seg = obs_data_create();
+	obs_data_set_bool(seg, "enabled", true);
+	obs_data_set_int(seg, "version", 2);
+
+	OBSDataAutoRelease durMod = obs_data_create();
+	obs_data_set_int(durMod, "time_constraint", 1);
+	duration.Save(durMod, "seconds");
+
+	OBSDataAutoRelease audioSrc = obs_data_create();
+	obs_data_set_int(audioSrc, "type", 0);
+	obs_data_set_string(audioSrc, "name", sourceName.toUtf8().constData());
+
+	OBSDataAutoRelease volume = obs_data_create();
+	obs_data_set_double(volume, "value", 0.0);
+	obs_data_set_int(volume, "type", 0);
+
+	OBSDataAutoRelease syncOffset = obs_data_create();
+	obs_data_set_int(syncOffset, "value", 0);
+	obs_data_set_int(syncOffset, "type", 0);
+
+	OBSDataAutoRelease balance = obs_data_create();
+	obs_data_set_double(balance, "value", 0.5);
+	obs_data_set_int(balance, "type", 0);
+
+	OBSDataAutoRelease volumeDB = obs_data_create();
+	obs_data_set_double(volumeDB, "value", thresholdDb);
+	obs_data_set_int(volumeDB, "type", 0);
+
+	OBSDataAutoRelease data = obs_data_create();
+	obs_data_set_obj(data, "segmentSettings", seg);
+	obs_data_set_string(data, "id", "audio");
+	obs_data_set_int(data, "logic", 0);
+	obs_data_set_obj(data, "durationModifier", durMod);
+	obs_data_set_obj(data, "audioSource", audioSrc);
+	obs_data_set_int(data, "monitor", 0);
+	obs_data_set_obj(data, "volume", volume);
+	obs_data_set_obj(data, "syncOffset", syncOffset);
+	obs_data_set_obj(data, "balance", balance);
+	obs_data_set_int(data, "checkType", 0);
+	obs_data_set_int(data, "outputCondition", 0);
+	obs_data_set_int(data, "volumeCondition", 0);
+	obs_data_set_bool(data, "useDb", true);
+	obs_data_set_obj(data, "volumeDB", volumeDB);
+	obs_data_set_int(data, "version", 3);
+
+	return data;
+}
+
+// Builds the obs_data blob for a scene-visibility action on the current scene,
+// matching MacroActionSceneVisibility::Save() output.
+//
+// sceneSelection type 3 = current scene.
+// action 0 = SHOW, action 1 = HIDE.
+static OBSDataAutoRelease buildVisibilityActionData(const QString &sourceName,
+						    int action)
+{
+	OBSDataAutoRelease seg = obs_data_create();
+	obs_data_set_bool(seg, "enabled", true);
+	obs_data_set_int(seg, "version", 2);
+
+	OBSDataAutoRelease sceneSel = obs_data_create();
+	obs_data_set_int(sceneSel, "type", 3); // current scene
+	obs_data_set_string(sceneSel, "canvasSelection", "Main");
+
+	OBSDataAutoRelease itemSel = obs_data_create();
+	obs_data_set_int(itemSel, "type", 0);
+	obs_data_set_int(itemSel, "idxType", 0);
+	obs_data_set_int(itemSel, "idx", 0);
+	obs_data_set_string(itemSel, "item", sourceName.toUtf8().constData());
+
+	OBSDataAutoRelease data = obs_data_create();
+	obs_data_set_obj(data, "segmentSettings", seg);
+	obs_data_set_string(data, "id", "scene_visibility");
+	obs_data_set_obj(data, "sceneSelection", sceneSel);
+	obs_data_set_obj(data, "sceneItemSelection", itemSel);
+	obs_data_set_bool(data, "updateTransition", false);
+	obs_data_set_int(data, "transitionType", 0);
+	obs_data_set_string(data, "transition", "");
+	obs_data_set_bool(data, "updateDuration", false);
+	Duration().Save(data, "duration");
+	obs_data_set_int(data, "action", action);
+
+	return data;
+}
+
+// ===========================================================================
+// AudioSourcePage
+// ===========================================================================
+
+AudioSourcePage::AudioSourcePage(QWidget *parent)
+	: QWizardPage(parent),
+	  _sourceCombo(new QComboBox(this)),
+	  _thresholdSpinbox(new QDoubleSpinBox(this)),
+	  _durationSelection(new DurationSelection(this, true, 0.0)),
+	  _volmeterLayout(new QVBoxLayout)
+{
+	setTitle(obs_module_text("FirstRunWizard.audio.source.title"));
+	setSubTitle(obs_module_text("FirstRunWizard.audio.source.subtitle"));
+
+	_sourceCombo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+
+	_thresholdSpinbox->setRange(-100.0, 0.0);
+	_thresholdSpinbox->setValue(-24.0);
+	_thresholdSpinbox->setDecimals(1);
+	_thresholdSpinbox->setSingleStep(1.0);
+	_thresholdSpinbox->setSuffix(" dB");
+
+	_durationSelection->SetDuration(Duration(1.0));
+
+	registerField("audioSourceName*", _sourceCombo, "currentText",
+		      SIGNAL(currentTextChanged(QString)));
+
+	connect(_sourceCombo, &QComboBox::currentTextChanged, this,
+		&QWizardPage::completeChanged);
+	connect(_sourceCombo, &QComboBox::currentTextChanged, this,
+		&AudioSourcePage::UpdateVolmeter);
+	connect(_thresholdSpinbox,
+		QOverload<double>::of(&QDoubleSpinBox::valueChanged), this,
+		&AudioSourcePage::SyncSliderFromSpinbox);
+
+	auto *sourceRow = new QHBoxLayout;
+	PlaceWidgets(obs_module_text("FirstRunWizard.audio.source.sourceRow"),
+		     sourceRow, {{"{{source}}", _sourceCombo}}, false);
+
+	auto *thresholdRow = new QHBoxLayout;
+	PlaceWidgets(
+		obs_module_text("FirstRunWizard.audio.source.thresholdRow"),
+		thresholdRow,
+		{{"{{threshold}}", _thresholdSpinbox},
+		 {"{{duration}}", _durationSelection}},
+		false);
+
+	auto *layout = new QVBoxLayout(this);
+	layout->addLayout(sourceRow);
+	layout->addLayout(thresholdRow);
+	layout->addLayout(_volmeterLayout);
+	layout->addStretch();
+}
+
+void AudioSourcePage::initializePage()
+{
+	_sourceCombo->clear();
+	PopulateAudioSelection(_sourceCombo, false);
+}
+
+void AudioSourcePage::UpdateVolmeter()
+{
+	delete _volControl;
+	_volControl = nullptr;
+
+	OBSSourceAutoRelease source = obs_get_source_by_name(
+		_sourceCombo->currentText().toUtf8().constData());
+	if (!source) {
+		return;
+	}
+
+	_volControl = new VolControl(source.Get());
+	_volmeterLayout->addWidget(_volControl);
+
+	connect(_volControl->GetSlider(), &DoubleSlider::DoubleValChanged, this,
+		&AudioSourcePage::SyncSpinboxFromSlider);
+	SyncSliderFromSpinbox();
+}
+
+void AudioSourcePage::SyncSpinboxFromSlider()
+{
+	if (!_volControl) {
+		return;
+	}
+	const QSignalBlocker blocker(_thresholdSpinbox);
+	_thresholdSpinbox->setValue(_volControl->GetSlider()->DoubleValue() -
+				    100.0);
+}
+
+void AudioSourcePage::SyncSliderFromSpinbox()
+{
+	if (!_volControl) {
+		return;
+	}
+	const QSignalBlocker blocker(_volControl->GetSlider());
+	_volControl->GetSlider()->SetDoubleVal(_thresholdSpinbox->value() +
+					       100.0);
+}
+
+bool AudioSourcePage::isComplete() const
+{
+	return _sourceCombo->count() > 0 &&
+	       !_sourceCombo->currentText().isEmpty();
+}
+
+Duration AudioSourcePage::GetDuration() const
+{
+	return _durationSelection->GetDuration();
+}
+
+// ===========================================================================
+// AudioTargetPage
+// ===========================================================================
+
+AudioTargetPage::AudioTargetPage(QWidget *parent)
+	: QWizardPage(parent),
+	  _sourceCombo(new QComboBox(this))
+{
+	setTitle(obs_module_text("FirstRunWizard.audio.target.title"));
+	setSubTitle(obs_module_text("FirstRunWizard.audio.target.subtitle"));
+
+	_sourceCombo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+
+	registerField("audioTargetSource*", _sourceCombo, "currentText",
+		      SIGNAL(currentTextChanged(QString)));
+
+	connect(_sourceCombo, &QComboBox::currentTextChanged, this,
+		&QWizardPage::completeChanged);
+
+	auto *row = new QHBoxLayout;
+	PlaceWidgets(obs_module_text("FirstRunWizard.audio.target.sourceRow"),
+		     row, {{"{{source}}", _sourceCombo}}, false);
+
+	auto *layout = new QVBoxLayout(this);
+	layout->addLayout(row);
+	layout->addStretch();
+}
+
+void AudioTargetPage::initializePage()
+{
+	QStringList names;
+	auto enumScenes = [](void *param, obs_source_t *src) -> bool {
+		auto *list = reinterpret_cast<QStringList *>(param);
+		obs_scene_t *scene = obs_scene_from_source(src);
+		obs_scene_enum_items(
+			scene,
+			[](obs_scene_t *, obs_sceneitem_t *item,
+			   void *p) -> bool {
+				auto *l = reinterpret_cast<QStringList *>(p);
+				OBSSource s = obs_sceneitem_get_source(item);
+				if (s) {
+					*l << obs_source_get_name(s);
+				}
+				return true;
+			},
+			list);
+		return true;
+	};
+	obs_enum_scenes(enumScenes, &names);
+	names.sort(Qt::CaseInsensitive);
+	names.removeDuplicates();
+
+	const QString prev = _sourceCombo->currentText();
+	_sourceCombo->clear();
+	_sourceCombo->addItems(names);
+	const int idx = _sourceCombo->findText(prev);
+	if (idx >= 0) {
+		_sourceCombo->setCurrentIndex(idx);
+	}
+}
+
+bool AudioTargetPage::isComplete() const
+{
+	return _sourceCombo->count() > 0 &&
+	       !_sourceCombo->currentText().isEmpty();
+}
+
+// ===========================================================================
+// AudioReviewPage
+// ===========================================================================
+
+AudioReviewPage::AudioReviewPage(QWidget *parent, std::shared_ptr<Macro> &macro)
+	: QWizardPage(parent),
+	  _summary(new QLabel(this)),
+	  _macro(macro)
+{
+	setTitle(obs_module_text("FirstRunWizard.audio.review.title"));
+	setSubTitle(obs_module_text("FirstRunWizard.audio.review.subtitle"));
+
+	detail::setupSummaryLabel(_summary);
+
+	auto *layout = new QVBoxLayout(this);
+	layout->addWidget(_summary);
+	layout->addStretch();
+}
+
+void AudioReviewPage::initializePage()
+{
+	const QString audioSource = field("audioSourceName").toString();
+	const QString targetSource = field("audioTargetSource").toString();
+
+	auto *sourcePage = qobject_cast<AudioSourcePage *>(
+		wizard()->page(PAGE_AUDIO_SOURCE));
+	const double thresholdDb = sourcePage ? sourcePage->GetThresholdDb()
+					      : -24.0;
+	const Duration duration = sourcePage ? sourcePage->GetDuration()
+					     : Duration(1.0);
+
+	_summary->setText(
+		QString(obs_module_text("FirstRunWizard.audio.review.summary"))
+			.arg(audioSource.toHtmlEscaped())
+			.arg(thresholdDb, 0, 'f', 1)
+			.arg(QString::fromStdString(duration.ToString()))
+			.arg(targetSource.toHtmlEscaped()));
+}
+
+bool AudioReviewPage::validatePage()
+{
+	const QString audioSource = field("audioSourceName").toString();
+	const QString targetSource = field("audioTargetSource").toString();
+	const std::string name =
+		("Audio: " + audioSource + " -> " + targetSource).toStdString();
+
+	auto *sourcePage = qobject_cast<AudioSourcePage *>(
+		wizard()->page(PAGE_AUDIO_SOURCE));
+	const double thresholdDb = sourcePage ? sourcePage->GetThresholdDb()
+					      : -24.0;
+	const Duration duration = sourcePage ? sourcePage->GetDuration()
+					     : Duration(1.0);
+
+	_macro = std::make_shared<Macro>(name, GetGlobalMacroSettings());
+	if (!_macro) {
+		blog(LOG_WARNING,
+		     "FirstRunWizard: audio macro allocation failed");
+		return true;
+	}
+
+	_macro->SetActionConditionSplitterPosition(
+		{QWIDGETSIZE_MAX / 2, QWIDGETSIZE_MAX / 2});
+	_macro->SetElseActionSplitterPosition(
+		{QWIDGETSIZE_MAX / 2, QWIDGETSIZE_MAX / 2});
+
+	OBSDataAutoRelease condData =
+		buildAudioConditionData(audioSource, thresholdDb, duration);
+	if (!detail::addCondition(_macro.get(), "audio", condData)) {
+		_macro.reset();
+		QMessageBox::warning(
+			this,
+			obs_module_text(
+				"FirstRunWizard.audio.review.errorTitle"),
+			obs_module_text(
+				"FirstRunWizard.audio.review.errorBody"));
+		return true;
+	}
+
+	OBSDataAutoRelease showData =
+		buildVisibilityActionData(targetSource, 0);
+	if (!detail::addAction(_macro.get(), "scene_visibility", showData)) {
+		_macro.reset();
+		QMessageBox::warning(
+			this,
+			obs_module_text(
+				"FirstRunWizard.audio.review.errorTitle"),
+			obs_module_text(
+				"FirstRunWizard.audio.review.errorBody"));
+		return true;
+	}
+
+	OBSDataAutoRelease hideData =
+		buildVisibilityActionData(targetSource, 1);
+	if (!detail::addElseAction(_macro.get(), "scene_visibility",
+				   hideData)) {
+		_macro.reset();
+		QMessageBox::warning(
+			this,
+			obs_module_text(
+				"FirstRunWizard.audio.review.errorTitle"),
+			obs_module_text(
+				"FirstRunWizard.audio.review.errorBody"));
+		return true;
+	}
+
+	blog(LOG_INFO, "FirstRunWizard: created audio macro '%s'",
+	     name.c_str());
+	return true;
+}
+
+} // namespace wiz
+
+} // namespace advss

lib/utils/first-run-wizard-audio.hpp

@@ -0,0 +1,83 @@
+#pragma once
+
+#include "duration-control.hpp"
+#include "duration.hpp"
+#include "first-run-wizard.hpp"
+#include "volume-control.hpp"
+
+#include <QComboBox>
+#include <QDoubleSpinBox>
+#include <QLabel>
+#include <QVBoxLayout>
+
+#include <memory>
+
+namespace advss {
+
+namespace wiz {
+
+// ---------------------------------------------------------------------------
+// AudioSourcePage
+//   Registers wizard field "audioSourceName" (QString).
+//   Volume threshold and duration are read back via getters.
+// ---------------------------------------------------------------------------
+class AudioSourcePage : public QWizardPage {
+	Q_OBJECT
+public:
+	explicit AudioSourcePage(QWidget *parent = nullptr);
+	void initializePage() override;
+	bool isComplete() const override;
+	int nextId() const override { return PAGE_AUDIO_TARGET; }
+
+	double GetThresholdDb() const { return _thresholdSpinbox->value(); }
+	Duration GetDuration() const;
+
+private slots:
+	void UpdateVolmeter();
+	void SyncSpinboxFromSlider();
+	void SyncSliderFromSpinbox();
+
+private:
+	QComboBox *_sourceCombo;
+	QDoubleSpinBox *_thresholdSpinbox;
+	DurationSelection *_durationSelection;
+	QVBoxLayout *_volmeterLayout;
+	VolControl *_volControl = nullptr;
+};
+
+// ---------------------------------------------------------------------------
+// AudioTargetPage
+//   Registers wizard field "audioTargetSource" (QString).
+// ---------------------------------------------------------------------------
+class AudioTargetPage : public QWizardPage {
+	Q_OBJECT
+public:
+	explicit AudioTargetPage(QWidget *parent = nullptr);
+	void initializePage() override;
+	bool isComplete() const override;
+	int nextId() const override { return PAGE_AUDIO_REVIEW; }
+
+private:
+	QComboBox *_sourceCombo;
+};
+
+// ---------------------------------------------------------------------------
+// AudioReviewPage
+//   Displays a summary and builds the macro from wizard fields on Finish.
+// ---------------------------------------------------------------------------
+class AudioReviewPage : public QWizardPage {
+	Q_OBJECT
+public:
+	explicit AudioReviewPage(QWidget *parent,
+				 std::shared_ptr<advss::Macro> &macro);
+	void initializePage() override;
+	bool validatePage() override;
+	int nextId() const override { return PAGE_DONE; }
+
+private:
+	QLabel *_summary;
+	std::shared_ptr<advss::Macro> &_macro;
+};
+
+} // namespace wiz
+} // namespace advss

lib/utils/first-run-wizard-helpers.hpp

@@ -0,0 +1,85 @@
+#pragma once
+
+#include "log-helper.hpp"
+#include "macro.hpp"
+#include "macro-action-factory.hpp"
+#include "macro-condition-factory.hpp"
+
+#include <obs-data.h>
+
+#include <QFrame>
+#include <QLabel>
+
+#include <string>
+
+namespace advss::wiz::detail {
+
+static bool addCondition(advss::Macro *macro, const std::string &id,
+			 obs_data_t *data)
+{
+	auto cond = MacroConditionFactory::Create(id, macro);
+	if (!cond) {
+		blog(LOG_WARNING,
+		     "FirstRunWizard: condition factory returned null for '%s'",
+		     id.c_str());
+		return false;
+	}
+	if (!cond->Load(data)) {
+		blog(LOG_WARNING,
+		     "FirstRunWizard: condition Load() failed for '%s'",
+		     id.c_str());
+		return false;
+	}
+	macro->Conditions().emplace_back(cond);
+	return true;
+}
+
+static bool addAction(advss::Macro *macro, const std::string &id,
+		      obs_data_t *data)
+{
+	auto action = MacroActionFactory::Create(id, macro);
+	if (!action) {
+		blog(LOG_WARNING,
+		     "FirstRunWizard: action factory returned null for '%s'",
+		     id.c_str());
+		return false;
+	}
+	if (!action->Load(data)) {
+		blog(LOG_WARNING,
+		     "FirstRunWizard: action Load() failed for '%s'",
+		     id.c_str());
+		return false;
+	}
+	macro->Actions().emplace_back(action);
+	return true;
+}
+
+static bool addElseAction(advss::Macro *macro, const std::string &id,
+			  obs_data_t *data)
+{
+	auto action = MacroActionFactory::Create(id, macro);
+	if (!action) {
+		blog(LOG_WARNING,
+		     "FirstRunWizard: else-action factory returned null for '%s'",
+		     id.c_str());
+		return false;
+	}
+	if (!action->Load(data)) {
+		blog(LOG_WARNING,
+		     "FirstRunWizard: else-action Load() failed for '%s'",
+		     id.c_str());
+		return false;
+	}
+	macro->ElseActions().emplace_back(action);
+	return true;
+}
+
+static void setupSummaryLabel(QLabel *label)
+{
+	label->setWordWrap(true);
+	label->setTextFormat(Qt::RichText);
+	label->setFrameShape(QFrame::StyledPanel);
+	label->setContentsMargins(12, 12, 12, 12);
+}
+
+} // namespace advss::wiz::detail

lib/utils/first-run-wizard-sequence.cpp

@@ -0,0 +1,499 @@
+#include "first-run-wizard-sequence.hpp"
+#include "first-run-wizard-helpers.hpp"
+
+#include "layout-helpers.hpp"
+#include "log-helper.hpp"
+#include "macro-settings.hpp"
+#include "selection-helpers.hpp"
+
+#include <obs-data.h>
+
+#include <QFrame>
+#include <QHBoxLayout>
+#include <QMessageBox>
+#include <QScrollArea>
+#include <QVBoxLayout>
+
+namespace advss {
+
+namespace wiz {
+
+// Builds the obs_data blob for a "current scene == sceneName for at least
+// triggerDuration" condition, matching MacroConditionScene::Save().
+//
+// {
+//   "segmentSettings": { "enabled": true, "version": 2 },
+//   "id": "scene",
+//   "logic": 0,
+//   "durationModifier": {
+//     "time_constraint": 1,       // AT_LEAST
+//     "seconds": <Duration::Save output>
+//   },
+//   "sceneSelection": { "type": 0, "name": "<scene>", "canvasSelection": "Main" },
+//   "type": 10,                   // CURRENT_SCENE
+//   "version": 1
+// }
+static OBSDataAutoRelease
+buildSceneConditionData(const QString &scene, const Duration &triggerDuration)
+{
+	OBSDataAutoRelease seg = obs_data_create();
+	obs_data_set_bool(seg, "enabled", true);
+	obs_data_set_int(seg, "version", 2);
+
+	OBSDataAutoRelease durMod = obs_data_create();
+	obs_data_set_int(durMod, "time_constraint", 1);
+	triggerDuration.Save(durMod, "seconds");
+
+	OBSDataAutoRelease sceneSel = obs_data_create();
+	obs_data_set_int(sceneSel, "type", 0);
+	obs_data_set_string(sceneSel, "name", scene.toUtf8().constData());
+	obs_data_set_string(sceneSel, "canvasSelection", "Main");
+
+	OBSDataAutoRelease data = obs_data_create();
+	obs_data_set_obj(data, "segmentSettings", seg);
+	obs_data_set_string(data, "id", "scene");
+	obs_data_set_int(data, "logic", 0);
+	obs_data_set_obj(data, "durationModifier", durMod);
+	obs_data_set_obj(data, "sceneSelection", sceneSel);
+	obs_data_set_int(data, "type", 10);
+	obs_data_set_int(data, "version", 1);
+
+	return data;
+}
+
+// Builds the obs_data blob for a scene-switch action,
+// matching MacroActionSwitchScene::Save().
+//
+// {
+//   "segmentSettings": { "enabled": true, "version": 2 },
+//   "id": "scene_switch",
+//   "action": 0,
+//   "sceneSelection": { "type": 0, "name": "<scene>", "canvasSelection": "Main" },
+//   "transitionType": 1,           // scene's default transition
+//   "blockUntilTransitionDone": true,
+//   "sceneType": 0
+// }
+static OBSDataAutoRelease buildSceneSwitchData(const QString &scene)
+{
+	OBSDataAutoRelease seg = obs_data_create();
+	obs_data_set_bool(seg, "enabled", true);
+	obs_data_set_int(seg, "version", 2);
+
+	OBSDataAutoRelease sceneSel = obs_data_create();
+	obs_data_set_int(sceneSel, "type", 0);
+	obs_data_set_string(sceneSel, "name", scene.toUtf8().constData());
+	obs_data_set_string(sceneSel, "canvasSelection", "Main");
+
+	OBSDataAutoRelease data = obs_data_create();
+	obs_data_set_obj(data, "segmentSettings", seg);
+	obs_data_set_string(data, "id", "scene_switch");
+	obs_data_set_int(data, "action", 0);
+	obs_data_set_obj(data, "sceneSelection", sceneSel);
+	obs_data_set_int(data, "transitionType", 1);
+	obs_data_set_bool(data, "blockUntilTransitionDone", true);
+	obs_data_set_int(data, "sceneType", 0);
+
+	return data;
+}
+
+// Builds the obs_data blob for a wait action, matching MacroActionWait::Save().
+//
+// {
+//   "segmentSettings": { "enabled": true, "version": 2 },
+//   "id": "wait",
+//   "duration": <Duration::Save output>,
+//   "waitType": 0,
+//   "version": 1
+// }
+static OBSDataAutoRelease buildWaitData(const Duration &duration)
+{
+	OBSDataAutoRelease seg = obs_data_create();
+	obs_data_set_bool(seg, "enabled", true);
+	obs_data_set_int(seg, "version", 2);
+
+	OBSDataAutoRelease data = obs_data_create();
+	obs_data_set_obj(data, "segmentSettings", seg);
+	obs_data_set_string(data, "id", "wait");
+	duration.Save(data, "duration");
+	obs_data_set_int(data, "waitType", 0);
+	obs_data_set_int(data, "version", 1);
+
+	return data;
+}
+
+// ===========================================================================
+// SequenceTriggerPage
+// ===========================================================================
+
+SequenceTriggerPage::SequenceTriggerPage(QWidget *parent)
+	: QWizardPage(parent),
+	  _sceneCombo(new QComboBox(this)),
+	  _delaySelection(new DurationSelection(this, true, 0.0))
+{
+	setTitle(obs_module_text("FirstRunWizard.seqTrigger.title"));
+	setSubTitle(obs_module_text("FirstRunWizard.seqTrigger.subtitle"));
+
+	_sceneCombo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+	_delaySelection->SetDuration(Duration(5.0));
+
+	registerField("seqTriggerScene*", _sceneCombo, "currentText",
+		      SIGNAL(currentTextChanged(QString)));
+
+	connect(_sceneCombo, &QComboBox::currentTextChanged, this,
+		&QWizardPage::completeChanged);
+
+	auto *sceneRow = new QHBoxLayout;
+	PlaceWidgets(obs_module_text("FirstRunWizard.seqTrigger.scene"),
+		     sceneRow, {{"{{scene}}", _sceneCombo}}, false);
+
+	auto *delayRow = new QHBoxLayout;
+	PlaceWidgets(obs_module_text("FirstRunWizard.seqTrigger.delay"),
+		     delayRow, {{"{{duration}}", _delaySelection}}, false);
+
+	auto *layout = new QVBoxLayout(this);
+	layout->addLayout(sceneRow);
+	layout->addLayout(delayRow);
+	layout->addStretch();
+}
+
+void SequenceTriggerPage::initializePage()
+{
+	_sceneCombo->clear();
+	for (const QString &name : GetSceneNames()) {
+		_sceneCombo->addItem(name);
+	}
+}
+
+bool SequenceTriggerPage::isComplete() const
+{
+	return _sceneCombo->count() > 0 &&
+	       !_sceneCombo->currentText().isEmpty();
+}
+
+Duration SequenceTriggerPage::GetTriggerDuration() const
+{
+	return _delaySelection->GetDuration();
+}
+
+// ===========================================================================
+// SequenceScenesPage
+// ===========================================================================
+
+SequenceScenesPage::SequenceScenesPage(QWidget *parent)
+	: QWizardPage(parent),
+	  _triggerInfoLabel(new QLabel(this)),
+	  _stepsContainer(new QWidget(this)),
+	  _stepsLayout(new QVBoxLayout(_stepsContainer))
+{
+	setTitle(obs_module_text("FirstRunWizard.seqScenes.title"));
+	setSubTitle(obs_module_text("FirstRunWizard.seqScenes.subtitle"));
+
+	_triggerInfoLabel->setWordWrap(true);
+	_triggerInfoLabel->setFrameShape(QFrame::StyledPanel);
+	_triggerInfoLabel->setContentsMargins(8, 4, 8, 4);
+
+	_stepsLayout->setContentsMargins(0, 0, 0, 0);
+	_stepsLayout->setSpacing(4);
+
+	auto *scrollArea = new QScrollArea(this);
+	scrollArea->setWidget(_stepsContainer);
+	scrollArea->setWidgetResizable(true);
+	scrollArea->setFrameShape(QFrame::NoFrame);
+
+	auto *addBtn = new QPushButton(
+		obs_module_text("FirstRunWizard.seqScenes.addScene"), this);
+	connect(addBtn, &QPushButton::clicked, this,
+		&SequenceScenesPage::onAddStepClicked);
+
+	auto *layout = new QVBoxLayout(this);
+	layout->addWidget(_triggerInfoLabel);
+	layout->addWidget(scrollArea, 1);
+	layout->addWidget(addBtn, 0, Qt::AlignLeft);
+}
+
+void SequenceScenesPage::initializePage()
+{
+	const QString triggerScene = field("seqTriggerScene").toString();
+	auto *triggerPage = qobject_cast<SequenceTriggerPage *>(
+		wizard()->page(PAGE_SEQ_TRIGGER));
+	const Duration triggerDuration =
+		triggerPage ? triggerPage->GetTriggerDuration() : Duration(5.0);
+	_triggerInfoLabel->setText(
+		QString(obs_module_text("FirstRunWizard.seqScenes.triggerInfo"))
+			.arg(triggerScene)
+			.arg(QString::fromStdString(
+				triggerDuration.ToString())));
+
+	if (_initialized) {
+		return;
+	}
+	_initialized = true;
+
+	// Pre-select the scenes after the trigger scene so the user doesn't
+	// have to start by deselecting it manually.
+	const QStringList scenes = GetSceneNames();
+	const int count = static_cast<int>(scenes.size());
+	const int triggerIdx = scenes.indexOf(triggerScene);
+	const int firstIdx = count > 0 ? (triggerIdx + 1) % count : 0;
+	const int secondIdx = count > 0 ? (triggerIdx + 2) % count : 0;
+	AddStep(firstIdx);
+	AddStep(secondIdx);
+}
+
+bool SequenceScenesPage::isComplete() const
+{
+	return _rows.size() >= 2;
+}
+
+QVector<QPair<QString, Duration>> SequenceScenesPage::GetSteps() const
+{
+	QVector<QPair<QString, Duration>> steps;
+	steps.reserve(_rows.size());
+	for (int i = 0; i < _rows.size(); ++i) {
+		const Duration delay = (i < _rows.size() - 1)
+					       ? _rows[i].delay->GetDuration()
+					       : Duration();
+		steps.append({_rows[i].scene->currentText(), delay});
+	}
+	return steps;
+}
+
+void SequenceScenesPage::onAddStepClicked()
+{
+	const QStringList scenes = GetSceneNames();
+	const int count = static_cast<int>(scenes.size());
+	int nextIdx = 0;
+	if (!_rows.isEmpty() && count > 0) {
+		const int lastIdx = _rows.last().scene->currentIndex();
+		nextIdx = (lastIdx + 1) % count;
+	}
+	AddStep(nextIdx);
+	emit completeChanged();
+}
+
+void SequenceScenesPage::AddStep(int defaultSceneIndex)
+{
+	auto *row = new QWidget(_stepsContainer);
+	auto *rowLayout = new QHBoxLayout(row);
+	rowLayout->setContentsMargins(0, 0, 0, 0);
+
+	auto *sceneCombo = new QComboBox(row);
+	sceneCombo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+	const QStringList scenes = GetSceneNames();
+	for (const QString &name : scenes) {
+		sceneCombo->addItem(name);
+	}
+	if (defaultSceneIndex >= 0 && defaultSceneIndex < scenes.size()) {
+		sceneCombo->setCurrentIndex(defaultSceneIndex);
+	}
+	PlaceWidgets(obs_module_text("FirstRunWizard.seqScenes.switchTo"),
+		     rowLayout, {{"{{scene}}", sceneCombo}}, false);
+
+	auto *delayWidget = new QWidget(row);
+	auto *delayLayout = new QHBoxLayout(delayWidget);
+	delayLayout->setContentsMargins(0, 0, 0, 0);
+	auto *durationSel = new DurationSelection(delayWidget, true, 0.1);
+	durationSel->SetDuration(Duration(5.0));
+	PlaceWidgets(obs_module_text("FirstRunWizard.seqScenes.thenWait"),
+		     delayLayout, {{"{{duration}}", durationSel}}, false);
+	rowLayout->addWidget(delayWidget);
+
+	auto *removeBtn = new QPushButton(row);
+	removeBtn->setProperty("themeID",
+			       QVariant(QString::fromUtf8("removeIconSmall")));
+	removeBtn->setProperty("class",
+			       QVariant(QString::fromUtf8("icon-trash")));
+	removeBtn->setToolTip(
+		obs_module_text("FirstRunWizard.seqScenes.removeTooltip"));
+	removeBtn->setMaximumSize(22, 22);
+	rowLayout->addWidget(removeBtn);
+
+	_rows.append({row, sceneCombo, delayWidget, durationSel, removeBtn});
+	_stepsLayout->addWidget(row);
+
+	UpdateDelayVisibility();
+	UpdateRemoveButtons();
+
+	connect(removeBtn, &QPushButton::clicked, this,
+		[this, row]() { RemoveStep(row); });
+}
+
+void SequenceScenesPage::RemoveStep(QWidget *rowWidget)
+{
+	int idx = -1;
+	for (int i = 0; i < _rows.size(); ++i) {
+		if (_rows[i].row == rowWidget) {
+			idx = i;
+			break;
+		}
+	}
+	if (idx < 0) {
+		return;
+	}
+
+	_stepsLayout->removeWidget(_rows[idx].row);
+	_rows[idx].row->deleteLater();
+	_rows.removeAt(idx);
+
+	UpdateDelayVisibility();
+	UpdateRemoveButtons();
+	emit completeChanged();
+}
+
+void SequenceScenesPage::UpdateDelayVisibility()
+{
+	for (int i = 0; i < _rows.size(); ++i) {
+		_rows[i].delayWidget->setVisible(i < _rows.size() - 1);
+	}
+}
+
+void SequenceScenesPage::UpdateRemoveButtons()
+{
+	const bool canRemove = _rows.size() > 1;
+	for (auto &step : _rows) {
+		step.remove->setEnabled(canRemove);
+	}
+}
+
+// ===========================================================================
+// SequenceReviewPage
+// ===========================================================================
+
+SequenceReviewPage::SequenceReviewPage(QWidget *parent,
+				       std::shared_ptr<Macro> &macro)
+	: QWizardPage(parent),
+	  _summary(new QLabel(this)),
+	  _macro(macro)
+{
+	setTitle(obs_module_text("FirstRunWizard.seqReview.title"));
+	setSubTitle(obs_module_text("FirstRunWizard.seqReview.subtitle"));
+
+	detail::setupSummaryLabel(_summary);
+
+	auto *layout = new QVBoxLayout(this);
+	layout->addWidget(_summary);
+	layout->addStretch();
+}
+
+void SequenceReviewPage::initializePage()
+{
+	const QString triggerScene = field("seqTriggerScene").toString();
+
+	auto *triggerPage = qobject_cast<SequenceTriggerPage *>(
+		wizard()->page(PAGE_SEQ_TRIGGER));
+	const Duration triggerDuration =
+		triggerPage ? triggerPage->GetTriggerDuration() : Duration(5.0);
+
+	auto *seqPage = qobject_cast<SequenceScenesPage *>(
+		wizard()->page(PAGE_SEQ_SCENES));
+	const auto steps = seqPage ? seqPage->GetSteps()
+				   : QVector<QPair<QString, Duration>>{};
+
+	QString html =
+		QString("<p>%1</p>")
+			.arg(QString(obs_module_text(
+					     "FirstRunWizard.seqReview.trigger"))
+				     .arg(triggerScene.toHtmlEscaped())
+				     .arg(QString::fromStdString(
+					     triggerDuration.ToString())));
+
+	html += "<ol>";
+	for (int i = 0; i < steps.size(); ++i) {
+		const QString scene = steps[i].first.toHtmlEscaped();
+		if (i == 0) {
+			html += "<li>" + scene + "</li>";
+		} else {
+			const QString waitStr = QString::fromStdString(
+				steps[i - 1].second.ToString());
+			html += "<li>" +
+				QString(obs_module_text(
+						"FirstRunWizard.seqReview.step"))
+					.arg(waitStr)
+					.arg(scene) +
+				"</li>";
+		}
+	}
+	html += "</ol>";
+
+	_summary->setText(html);
+}
+
+bool SequenceReviewPage::validatePage()
+{
+	const QString triggerScene = field("seqTriggerScene").toString();
+	const std::string name = ("Sequence: " + triggerScene).toStdString();
+
+	auto *triggerPage = qobject_cast<SequenceTriggerPage *>(
+		wizard()->page(PAGE_SEQ_TRIGGER));
+	const Duration triggerDuration =
+		triggerPage ? triggerPage->GetTriggerDuration() : Duration(5.0);
+
+	auto *seqPage = qobject_cast<SequenceScenesPage *>(
+		wizard()->page(PAGE_SEQ_SCENES));
+	if (!seqPage) {
+		return true;
+	}
+	const auto steps = seqPage->GetSteps();
+
+	_macro = std::make_shared<Macro>(name, GetGlobalMacroSettings());
+	if (!_macro) {
+		blog(LOG_WARNING,
+		     "FirstRunWizard: sequence macro allocation failed");
+		return true;
+	}
+	_macro->SetRunInParallel(true);
+
+	// --- Condition ---
+	OBSDataAutoRelease condData =
+		buildSceneConditionData(triggerScene, triggerDuration);
+	if (!detail::addCondition(_macro.get(), "scene", condData)) {
+		_macro.reset();
+		QMessageBox::warning(
+			this,
+			obs_module_text("FirstRunWizard.seqReview.errorTitle"),
+			obs_module_text("FirstRunWizard.seqReview.errorBody"));
+		return true;
+	}
+
+	// --- Actions: scene_switch interleaved with wait ---
+	for (int i = 0; i < steps.size(); ++i) {
+		OBSDataAutoRelease switchData =
+			buildSceneSwitchData(steps[i].first);
+		if (!detail::addAction(_macro.get(), "scene_switch",
+				       switchData)) {
+			_macro.reset();
+			QMessageBox::warning(
+				this,
+				obs_module_text(
+					"FirstRunWizard.seqReview.errorTitle"),
+				obs_module_text(
+					"FirstRunWizard.seqReview.errorBody"));
+			return true;
+		}
+
+		const bool isLastStep = (i == steps.size() - 1);
+		if (!isLastStep) {
+			OBSDataAutoRelease waitData =
+				buildWaitData(steps[i].second);
+			if (!detail::addAction(_macro.get(), "wait",
+					       waitData)) {
+				_macro.reset();
+				QMessageBox::warning(
+					this,
+					obs_module_text(
+						"FirstRunWizard.seqReview.errorTitle"),
+					obs_module_text(
+						"FirstRunWizard.seqReview.errorBody"));
+				return true;
+			}
+		}
+	}
+
+	blog(LOG_INFO, "FirstRunWizard: created sequence macro '%s'",
+	     name.c_str());
+	return true;
+}
+
+} // namespace wiz
+
+} // namespace advss

lib/utils/first-run-wizard-sequence.hpp

@@ -0,0 +1,101 @@
+#pragma once
+
+#include "duration-control.hpp"
+#include "duration.hpp"
+#include "first-run-wizard.hpp"
+
+#include <QComboBox>
+#include <QLabel>
+#include <QPushButton>
+#include <QVector>
+#include <QWidget>
+
+#include <memory>
+
+class QVBoxLayout;
+
+namespace advss {
+
+namespace wiz {
+
+// ---------------------------------------------------------------------------
+// SequenceTriggerPage
+//   Registers wizard field "seqTriggerScene" (QString).
+//   Trigger duration is read back via GetTriggerDuration().
+// ---------------------------------------------------------------------------
+class SequenceTriggerPage : public QWizardPage {
+	Q_OBJECT
+public:
+	explicit SequenceTriggerPage(QWidget *parent = nullptr);
+	void initializePage() override;
+	bool isComplete() const override;
+	int nextId() const override { return PAGE_SEQ_SCENES; }
+
+	Duration GetTriggerDuration() const;
+
+private:
+	QComboBox *_sceneCombo;
+	DurationSelection *_delaySelection;
+};
+
+// ---------------------------------------------------------------------------
+// SequenceScenesPage
+//   Lets the user build an ordered list of scenes with delays between them.
+//   The delay after the last scene is ignored when building the macro.
+// ---------------------------------------------------------------------------
+struct SequenceStep {
+	QWidget *row;
+	QComboBox *scene;
+	QWidget *delayWidget; // hidden for the last row
+	DurationSelection *delay;
+	QPushButton *remove;
+};
+
+class SequenceScenesPage : public QWizardPage {
+	Q_OBJECT
+public:
+	explicit SequenceScenesPage(QWidget *parent = nullptr);
+	void initializePage() override;
+	bool isComplete() const override;
+	int nextId() const override { return PAGE_SEQ_REVIEW; }
+
+	// Returns (sceneName, delayAfter) pairs. The last entry's delayAfter
+	// is always a default-constructed Duration and must be ignored by the caller.
+	QVector<QPair<QString, Duration>> GetSteps() const;
+
+private slots:
+	void onAddStepClicked();
+
+private:
+	void AddStep(int defaultSceneIndex = 0);
+	void RemoveStep(QWidget *rowWidget);
+	void UpdateDelayVisibility();
+	void UpdateRemoveButtons();
+
+	QLabel *_triggerInfoLabel;
+	QWidget *_stepsContainer;
+	QVBoxLayout *_stepsLayout;
+	QVector<SequenceStep> _rows;
+	bool _initialized = false;
+};
+
+// ---------------------------------------------------------------------------
+// SequenceReviewPage
+//   Displays a summary and builds the macro from wizard fields on Finish.
+// ---------------------------------------------------------------------------
+class SequenceReviewPage : public QWizardPage {
+	Q_OBJECT
+public:
+	explicit SequenceReviewPage(QWidget *parent,
+				    std::shared_ptr<advss::Macro> &macro);
+	void initializePage() override;
+	bool validatePage() override;
+	int nextId() const override { return PAGE_DONE; }
+
+private:
+	QLabel *_summary;
+	std::shared_ptr<advss::Macro> &_macro;
+};
+
+} // namespace wiz
+} // namespace advss

lib/utils/first-run-wizard-window.cpp

@@ -0,0 +1,308 @@
+#include "first-run-wizard-window.hpp"
+#include "first-run-wizard-helpers.hpp"
+
+#include "macro-settings.hpp"
+#include "obs-module-helper.hpp"
+#include "platform-funcs.hpp"
+#include "selection-helpers.hpp"
+
+#include <obs.hpp>
+
+#include <QHBoxLayout>
+#include <QMessageBox>
+#include <QRegularExpression>
+#include <QVBoxLayout>
+
+namespace advss {
+
+namespace wiz {
+
+static constexpr char kConditionIdWindow[] = "window";
+static constexpr char kActionIdSceneSwitch[] = "scene_switch";
+
+static QString detectFocusedWindow()
+{
+	return QString::fromStdString(GetCurrentWindowTitle());
+}
+
+static QString escapeForRegex(const QString &input)
+{
+	return QRegularExpression::escape(input);
+}
+
+// ===========================================================================
+// WindowSceneSelectionPage
+// ===========================================================================
+
+WindowSceneSelectionPage::WindowSceneSelectionPage(QWidget *parent)
+	: QWizardPage(parent)
+{
+	setTitle(obs_module_text("FirstRunWizard.scene.title"));
+	setSubTitle(obs_module_text("FirstRunWizard.scene.subtitle"));
+
+	auto label =
+		new QLabel(obs_module_text("FirstRunWizard.scene.label"), this);
+	_sceneCombo = new QComboBox(this);
+	_sceneCombo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+
+	// registerField with * suffix means the field is mandatory for Next
+	registerField("targetScene*", _sceneCombo, "currentText",
+		      SIGNAL(currentTextChanged(QString)));
+
+	connect(_sceneCombo, &QComboBox::currentTextChanged, this,
+		&QWizardPage::completeChanged);
+
+	auto row = new QHBoxLayout;
+	row->addWidget(label);
+	row->addWidget(_sceneCombo, 1);
+
+	auto layout = new QVBoxLayout(this);
+	layout->addLayout(row);
+	layout->addStretch();
+}
+
+void WindowSceneSelectionPage::initializePage()
+{
+	_sceneCombo->clear();
+	for (const QString &name : GetSceneNames()) {
+		_sceneCombo->addItem(name);
+	}
+}
+
+bool WindowSceneSelectionPage::isComplete() const
+{
+	return _sceneCombo->count() > 0 &&
+	       !_sceneCombo->currentText().isEmpty();
+}
+
+// ===========================================================================
+// WindowConditionPage
+// ===========================================================================
+
+WindowConditionPage::WindowConditionPage(QWidget *parent)
+	: QWizardPage(parent),
+	  _detectTimer(new QTimer(this))
+{
+	setTitle(obs_module_text("FirstRunWizard.window.title"));
+	setSubTitle(obs_module_text("FirstRunWizard.window.subtitle"));
+
+	auto label = new QLabel(obs_module_text("FirstRunWizard.window.label"),
+				this);
+	_windowEdit = new QLineEdit(this);
+	_windowEdit->setPlaceholderText(
+		obs_module_text("FirstRunWizard.window.placeholder"));
+
+	_autoDetect = new QPushButton(
+		obs_module_text("FirstRunWizard.window.autoDetect"), this);
+	_autoDetect->setToolTip(
+		obs_module_text("FirstRunWizard.window.autoDetectTooltip"));
+
+	registerField("windowTitle*", _windowEdit);
+
+	connect(_windowEdit, &QLineEdit::textChanged, this,
+		&QWizardPage::completeChanged);
+	connect(_autoDetect, &QPushButton::clicked, this,
+		&WindowConditionPage::onAutoDetectClicked);
+	connect(_detectTimer, &QTimer::timeout, this,
+		&WindowConditionPage::onCountdownTick);
+
+	auto row = new QHBoxLayout;
+	row->addWidget(label);
+	row->addWidget(_windowEdit, 1);
+
+	auto hint =
+		new QLabel(obs_module_text("FirstRunWizard.window.hint"), this);
+	hint->setTextFormat(Qt::RichText);
+	hint->setWordWrap(true);
+
+	auto layout = new QVBoxLayout(this);
+	layout->addLayout(row);
+	layout->addWidget(_autoDetect, 0, Qt::AlignLeft);
+	layout->addWidget(hint);
+	layout->addStretch();
+}
+
+void WindowConditionPage::initializePage()
+{
+	if (_windowEdit->text().isEmpty()) {
+		QString detected = detectFocusedWindow();
+		if (!detected.isEmpty()) {
+			_windowEdit->setText(detected);
+		}
+	}
+}
+
+bool WindowConditionPage::isComplete() const
+{
+	return !_windowEdit->text().trimmed().isEmpty();
+}
+
+void WindowConditionPage::onAutoDetectClicked()
+{
+	_countdown = 3;
+	_autoDetect->setEnabled(false);
+	_autoDetect->setText(
+		QString(obs_module_text(
+				"FirstRunWizard.window.autoDetectCountdown"))
+			.arg(_countdown));
+	_detectTimer->start(1000);
+}
+
+void WindowConditionPage::onCountdownTick()
+{
+	--_countdown;
+	if (_countdown > 0) {
+		_autoDetect->setText(
+			QString(obs_module_text(
+					"FirstRunWizard.window.autoDetectCountdown"))
+				.arg(_countdown));
+		return;
+	}
+
+	_detectTimer->stop();
+	QString title = detectFocusedWindow();
+	if (!title.isEmpty()) {
+		_windowEdit->setText(title);
+	}
+
+	_autoDetect->setEnabled(true);
+	_autoDetect->setText(
+		obs_module_text("FirstRunWizard.window.autoDetect"));
+}
+
+// ===========================================================================
+// WindowReviewPage
+// ===========================================================================
+
+WindowReviewPage::WindowReviewPage(QWidget *parent,
+				   std::shared_ptr<Macro> &macro)
+	: QWizardPage(parent),
+	  _macro(macro)
+{
+	setTitle(obs_module_text("FirstRunWizard.review.title"));
+	setSubTitle(obs_module_text("FirstRunWizard.review.subtitle"));
+
+	_summary = new QLabel(this);
+	detail::setupSummaryLabel(_summary);
+
+	auto layout = new QVBoxLayout(this);
+	layout->addWidget(_summary);
+	layout->addStretch();
+}
+
+void WindowReviewPage::initializePage()
+{
+	const QString scene = field("targetScene").toString();
+	const QString window = field("windowTitle").toString();
+
+	_summary->setText(
+		QString(obs_module_text("FirstRunWizard.review.summary"))
+			.arg(scene.toHtmlEscaped(), window.toHtmlEscaped()));
+}
+
+bool WindowReviewPage::validatePage()
+{
+	const QString scene = field("targetScene").toString();
+	const QString window = escapeForRegex(field("windowTitle").toString());
+	const std::string name = ("Window -> " + scene).toStdString();
+
+	// Build condition data blob
+	// ---------------------------------------------------------------
+	// Condition blob — mirrors MacroConditionWindow::Save() output:
+	//
+	// {
+	//     "segmentSettings": { "enabled": true, "version": 1 },
+	//     "id": "window",
+	//     "checkTitle": true,
+	//     "window": "<user input>",
+	//     "windowRegexConfig": {
+	//         "enable": true,   // use regex-style partial matching
+	//         "partial": true,  // match anywhere in the title
+	//         "options": 3      // case-insensitive (QRegularExpression flags)
+	//     },
+	//     "focus": true,        // only trigger when window is focused
+	//     "version": 1
+	// }
+	// ---------------------------------------------------------------
+	OBSDataAutoRelease condSegment = obs_data_create();
+	obs_data_set_bool(condSegment, "enabled", true);
+	obs_data_set_int(condSegment, "version", 1);
+
+	OBSDataAutoRelease condRegex = obs_data_create();
+	obs_data_set_bool(condRegex, "enable", true);
+	obs_data_set_bool(condRegex, "partial", true);
+	obs_data_set_int(condRegex, "options", 3); // CaseInsensitiveOption
+
+	OBSDataAutoRelease condData = obs_data_create();
+	obs_data_set_obj(condData, "segmentSettings", condSegment);
+	obs_data_set_string(condData, "id", "window");
+	obs_data_set_bool(condData, "checkTitle", true);
+	obs_data_set_string(condData, "window", window.toUtf8().constData());
+	obs_data_set_obj(condData, "windowRegexConfig", condRegex);
+	obs_data_set_bool(condData, "focus", true);
+	obs_data_set_int(condData, "version", 1);
+
+	// Build action data blob
+	// ---------------------------------------------------------------
+	// Action blob — mirrors MacroActionSwitchScene::Save() output:
+	//
+	// {
+	//     "segmentSettings": { "enabled": true, "version": 1 },
+	//     "id": "scene_switch",
+	//     "action": 0,              // 0 = switch scene
+	//     "sceneSelection": {
+	//         "type": 0,            // 0 = scene by name
+	//         "name": "<scene>",
+	//         "canvasSelection": "Main"
+	//     },
+	//     "transitionType": 1,      // 1 = use scene's default transition
+	//     "blockUntilTransitionDone": false,
+	//     "sceneType": 0
+	// }
+	// ---------------------------------------------------------------
+	OBSDataAutoRelease actionSegment = obs_data_create();
+	obs_data_set_bool(actionSegment, "enabled", true);
+	obs_data_set_int(actionSegment, "version", 1);
+
+	OBSDataAutoRelease sceneSelection = obs_data_create();
+	obs_data_set_int(sceneSelection, "type", 0);
+	obs_data_set_string(sceneSelection, "name", scene.toUtf8().constData());
+	obs_data_set_string(sceneSelection, "canvasSelection", "Main");
+
+	OBSDataAutoRelease actionData = obs_data_create();
+	obs_data_set_obj(actionData, "segmentSettings", actionSegment);
+	obs_data_set_string(actionData, "id", "scene_switch");
+	obs_data_set_int(actionData, "action", 0);
+	obs_data_set_obj(actionData, "sceneSelection", sceneSelection);
+	obs_data_set_int(actionData, "transitionType", 1);
+	obs_data_set_bool(actionData, "blockUntilTransitionDone", false);
+	obs_data_set_int(actionData, "sceneType", 0);
+
+	_macro = std::make_shared<Macro>(name, GetGlobalMacroSettings());
+	if (!_macro) {
+		blog(LOG_WARNING,
+		     "FirstRunWizard: window macro allocation failed");
+		return true;
+	}
+
+	if (!detail::addCondition(_macro.get(), kConditionIdWindow, condData) ||
+	    !detail::addAction(_macro.get(), kActionIdSceneSwitch,
+			       actionData)) {
+		QMessageBox::warning(
+			this,
+			obs_module_text("FirstRunWizard.review.errorTitle"),
+			QString(obs_module_text(
+					"FirstRunWizard.review.errorBody"))
+				.arg(window, scene));
+		_macro.reset();
+		// Still advance so the user is not stuck.
+		return true;
+	}
+
+	blog(LOG_INFO, "FirstRunWizard: created macro '%s'", name.c_str());
+	return true;
+}
+
+} // namespace wiz
+
+} // namespace advss

lib/utils/first-run-wizard-window.hpp

@@ -0,0 +1,76 @@
+#pragma once
+
+#include "first-run-wizard.hpp"
+
+#include <QComboBox>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QTimer>
+
+#include <memory>
+
+namespace advss {
+
+namespace wiz {
+
+// ---------------------------------------------------------------------------
+// WindowSceneSelectionPage
+//   Registers wizard field "targetScene" (QString).
+// ---------------------------------------------------------------------------
+class WindowSceneSelectionPage : public QWizardPage {
+	Q_OBJECT
+public:
+	explicit WindowSceneSelectionPage(QWidget *parent = nullptr);
+	void initializePage() override;
+	bool isComplete() const override;
+	int nextId() const override { return PAGE_WINDOW_CONDITION; }
+
+private:
+	QComboBox *_sceneCombo;
+};
+
+// ---------------------------------------------------------------------------
+// WindowConditionPage
+//   Registers wizard field "windowTitle" (QString).
+//   Auto-detect button samples the focused window after a countdown.
+// ---------------------------------------------------------------------------
+class WindowConditionPage : public QWizardPage {
+	Q_OBJECT
+public:
+	explicit WindowConditionPage(QWidget *parent = nullptr);
+	void initializePage() override;
+	bool isComplete() const override;
+	int nextId() const override { return PAGE_WINDOW_REVIEW; }
+
+private slots:
+	void onAutoDetectClicked();
+	void onCountdownTick();
+
+private:
+	QLineEdit *_windowEdit;
+	QPushButton *_autoDetect;
+	QTimer *_detectTimer;
+	int _countdown = 3;
+};
+
+// ---------------------------------------------------------------------------
+// WindowReviewPage
+//   Displays a summary and builds the macro from wizard fields on Finish.
+// ---------------------------------------------------------------------------
+class WindowReviewPage : public QWizardPage {
+	Q_OBJECT
+public:
+	explicit WindowReviewPage(QWidget *parent,
+				  std::shared_ptr<advss::Macro> &macro);
+	void initializePage() override;
+	bool validatePage() override;
+	int nextId() const override { return PAGE_DONE; }
+
+private:
+	QLabel *_summary;
+	std::shared_ptr<advss::Macro> &_macro;
+};
+
+} // namespace wiz
+} // namespace advss

lib/utils/first-run-wizard.cpp

@@ -1,28 +1,17 @@
 #include "first-run-wizard.hpp"
+#include "first-run-wizard-audio.hpp"
+#include "first-run-wizard-sequence.hpp"
+#include "first-run-wizard-window.hpp"
 
-#include "log-helper.hpp"
 #include "macro.hpp"
-#include "macro-action-factory.hpp"
-#include "macro-condition-factory.hpp"
-#include "macro-settings.hpp"
-#include "platform-funcs.hpp"
-#include "selection-helpers.hpp"
 
 #include <obs-frontend-api.h>
-#include <obs-data.h>
 #include <util/config-file.h>
 
-#include <QFrame>
-#include <QHBoxLayout>
-#include <QMessageBox>
-#include <QRegularExpression>
 #include <QVBoxLayout>
 
 namespace advss {
 
-static constexpr char kConditionIdWindow[] = "window";
-static constexpr char kActionIdSceneSwitch[] = "scene_switch";
-
 // ---------------------------------------------------------------------------
 // OBS global config helpers
 // ---------------------------------------------------------------------------
@@ -42,7 +31,7 @@ bool IsFirstRun()
 	return config_get_bool(cfg, kConfigSection, kFirstRunKey);
 }
 
-static void WriteFirstRun(bool value)
+static void writeFirstRun(bool value)
 {
 #if LIBOBS_API_VER >= MAKE_SEMANTIC_VERSION(31, 0, 0)
 	config_t *cfg = obs_frontend_get_user_config();
@@ -53,10 +42,10 @@ static void WriteFirstRun(bool value)
 	config_save_safe(cfg, "tmp", nullptr);
 }
 
-static QString DetectFocusedWindow()
-{
-	return QString::fromStdString(GetCurrentWindowTitle());
-}
+} // namespace advss
+
+namespace advss {
+namespace wiz {
 
 // ===========================================================================
 // WelcomePage
@@ -78,271 +67,39 @@ WelcomePage::WelcomePage(QWidget *parent) : QWizardPage(parent)
 }
 
 // ===========================================================================
-// SceneSelectionPage
+// TemplatePage
 // ===========================================================================
 
-SceneSelectionPage::SceneSelectionPage(QWidget *parent) : QWizardPage(parent)
-{
-	setTitle(obs_module_text("FirstRunWizard.scene.title"));
-	setSubTitle(obs_module_text("FirstRunWizard.scene.subtitle"));
-
-	auto label =
-		new QLabel(obs_module_text("FirstRunWizard.scene.label"), this);
-	_sceneCombo = new QComboBox(this);
-	_sceneCombo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-
-	// registerField with * suffix means the field is mandatory for Next
-	registerField("targetScene*", _sceneCombo, "currentText",
-		      SIGNAL(currentTextChanged(QString)));
-
-	connect(_sceneCombo, &QComboBox::currentTextChanged, this,
-		&QWizardPage::completeChanged);
-
-	auto row = new QHBoxLayout;
-	row->addWidget(label);
-	row->addWidget(_sceneCombo, 1);
-
-	auto layout = new QVBoxLayout(this);
-	layout->addLayout(row);
-	layout->addStretch();
-}
-
-void SceneSelectionPage::initializePage()
-{
-	_sceneCombo->clear();
-	for (const QString &name : GetSceneNames())
-		_sceneCombo->addItem(name);
-}
-
-bool SceneSelectionPage::isComplete() const
-{
-	return _sceneCombo->count() > 0 &&
-	       !_sceneCombo->currentText().isEmpty();
-}
-
-// ===========================================================================
-// WindowConditionPage
-// ===========================================================================
-
-WindowConditionPage::WindowConditionPage(QWidget *parent)
+TemplatePage::TemplatePage(QWidget *parent)
 	: QWizardPage(parent),
-	  _detectTimer(new QTimer(this))
+	  _windowRadio(new QRadioButton(
+		  obs_module_text("FirstRunWizard.template.window"), this)),
+	  _sequenceRadio(new QRadioButton(
+		  obs_module_text("FirstRunWizard.template.sequence"), this)),
+	  _audioRadio(new QRadioButton(
+		  obs_module_text("FirstRunWizard.template.audio"), this))
 {
-	setTitle(obs_module_text("FirstRunWizard.window.title"));
-	setSubTitle(obs_module_text("FirstRunWizard.window.subtitle"));
+	setTitle(obs_module_text("FirstRunWizard.template.title"));
+	setSubTitle(obs_module_text("FirstRunWizard.template.subtitle"));
 
-	auto label = new QLabel(obs_module_text("FirstRunWizard.window.label"),
-				this);
-	_windowEdit = new QLineEdit(this);
-	_windowEdit->setPlaceholderText(
-		obs_module_text("FirstRunWizard.window.placeholder"));
+	_windowRadio->setChecked(true);
 
-	_autoDetect = new QPushButton(
-		obs_module_text("FirstRunWizard.window.autoDetect"), this);
-	_autoDetect->setToolTip(
-		obs_module_text("FirstRunWizard.window.autoDetectTooltip"));
-
-	registerField("windowTitle*", _windowEdit);
-
-	connect(_windowEdit, &QLineEdit::textChanged, this,
-		&QWizardPage::completeChanged);
-	connect(_autoDetect, &QPushButton::clicked, this,
-		&WindowConditionPage::onAutoDetectClicked);
-	connect(_detectTimer, &QTimer::timeout, this,
-		&WindowConditionPage::onCountdownTick);
-
-	auto row = new QHBoxLayout;
-	row->addWidget(label);
-	row->addWidget(_windowEdit, 1);
-
-	auto hint =
-		new QLabel(obs_module_text("FirstRunWizard.window.hint"), this);
-	hint->setTextFormat(Qt::RichText);
-	hint->setWordWrap(true);
-
-	auto layout = new QVBoxLayout(this);
-	layout->addLayout(row);
-	layout->addWidget(_autoDetect, 0, Qt::AlignLeft);
-	layout->addWidget(hint);
+	auto *layout = new QVBoxLayout(this);
+	layout->addWidget(_windowRadio);
+	layout->addWidget(_sequenceRadio);
+	layout->addWidget(_audioRadio);
 	layout->addStretch();
 }
 
-void WindowConditionPage::initializePage()
+int TemplatePage::nextId() const
 {
-	if (_windowEdit->text().isEmpty()) {
-		QString detected = DetectFocusedWindow();
-		if (!detected.isEmpty()) {
-			_windowEdit->setText(detected);
-		}
+	if (_sequenceRadio->isChecked()) {
+		return PAGE_SEQ_TRIGGER;
 	}
-}
-
-bool WindowConditionPage::isComplete() const
-{
-	return !_windowEdit->text().trimmed().isEmpty();
-}
-
-void WindowConditionPage::onAutoDetectClicked()
-{
-	_countdown = 3;
-	_autoDetect->setEnabled(false);
-	_autoDetect->setText(
-		QString(obs_module_text(
-				"FirstRunWizard.window.autoDetectCountdown"))
-			.arg(_countdown));
-	_detectTimer->start(1000);
-}
-
-void WindowConditionPage::onCountdownTick()
-{
-	--_countdown;
-	if (_countdown > 0) {
-		_autoDetect->setText(
-			QString(obs_module_text(
-					"FirstRunWizard.window.autoDetectCountdown"))
-				.arg(_countdown));
-		return;
+	if (_audioRadio->isChecked()) {
+		return PAGE_AUDIO_SOURCE;
 	}
-
-	_detectTimer->stop();
-	QString title = DetectFocusedWindow();
-	if (!title.isEmpty()) {
-		_windowEdit->setText(title);
-	}
-
-	_autoDetect->setEnabled(true);
-	_autoDetect->setText(
-		obs_module_text("FirstRunWizard.window.autoDetect"));
-}
-
-// ===========================================================================
-// ReviewPage
-// ===========================================================================
-
-ReviewPage::ReviewPage(QWidget *parent, std::shared_ptr<Macro> &macro)
-	: QWizardPage(parent),
-	  _macro(macro)
-{
-	setTitle(obs_module_text("FirstRunWizard.review.title"));
-	setSubTitle(obs_module_text("FirstRunWizard.review.subtitle"));
-
-	_summary = new QLabel(this);
-	_summary->setWordWrap(true);
-	_summary->setTextFormat(Qt::RichText);
-	_summary->setFrameShape(QFrame::StyledPanel);
-	_summary->setContentsMargins(12, 12, 12, 12);
-
-	auto layout = new QVBoxLayout(this);
-	layout->addWidget(_summary);
-	layout->addStretch();
-}
-
-void ReviewPage::initializePage()
-{
-	const QString scene = field("targetScene").toString();
-	const QString window = field("windowTitle").toString();
-
-	_summary->setText(
-		QString(obs_module_text("FirstRunWizard.review.summary"))
-			.arg(scene.toHtmlEscaped(), window.toHtmlEscaped()));
-}
-
-static QString escapeForRegex(const QString &input)
-{
-	return QRegularExpression::escape(input);
-}
-
-bool ReviewPage::validatePage()
-{
-	const QString scene = field("targetScene").toString();
-	const QString window = escapeForRegex(field("windowTitle").toString());
-	const std::string name = ("Window -> " + scene).toStdString();
-
-	// Build condition data blob
-	// ---------------------------------------------------------------
-	// Condition blob — mirrors MacroConditionWindow::Save() output:
-	//
-	// {
-	//     "segmentSettings": { "enabled": true, "version": 1 },
-	//     "id": "window",
-	//     "checkTitle": true,
-	//     "window": "<user input>",
-	//     "windowRegexConfig": {
-	//         "enable": true,   // use regex-style partial matching
-	//         "partial": true,  // match anywhere in the title
-	//         "options": 3      // case-insensitive (QRegularExpression flags)
-	//     },
-	//     "focus": true,        // only trigger when window is focused
-	//     "version": 1
-	// }
-	// ---------------------------------------------------------------
-	OBSDataAutoRelease condSegment = obs_data_create();
-	obs_data_set_bool(condSegment, "enabled", true);
-	obs_data_set_int(condSegment, "version", 1);
-
-	OBSDataAutoRelease condRegex = obs_data_create();
-	obs_data_set_bool(condRegex, "enable", true);
-	obs_data_set_bool(condRegex, "partial", true);
-	obs_data_set_int(condRegex, "options", 3); // CaseInsensitiveOption
-
-	OBSDataAutoRelease condData = obs_data_create();
-	obs_data_set_obj(condData, "segmentSettings", condSegment);
-	obs_data_set_string(condData, "id", "window");
-	obs_data_set_bool(condData, "checkTitle", true);
-	obs_data_set_string(condData, "window", window.toUtf8().constData());
-	obs_data_set_obj(condData, "windowRegexConfig", condRegex);
-	obs_data_set_bool(condData, "focus", true);
-	obs_data_set_int(condData, "version", 1);
-
-	// Build action data blob
-	// ---------------------------------------------------------------
-	// Action blob — mirrors MacroActionSwitchScene::Save() output:
-	//
-	// {
-	//     "segmentSettings": { "enabled": true, "version": 1 },
-	//     "id": "scene_switch",
-	//     "action": 0,              // 0 = switch scene
-	//     "sceneSelection": {
-	//         "type": 0,            // 0 = scene by name
-	//         "name": "<scene>",
-	//         "canvasSelection": "Main"
-	//     },
-	//     "transitionType": 1,      // 1 = use scene's default transition
-	//     "blockUntilTransitionDone": false,
-	//     "sceneType": 0
-	// }
-	// ---------------------------------------------------------------
-	OBSDataAutoRelease actionSegment = obs_data_create();
-	obs_data_set_bool(actionSegment, "enabled", true);
-	obs_data_set_int(actionSegment, "version", 1);
-
-	OBSDataAutoRelease sceneSelection = obs_data_create();
-	obs_data_set_int(sceneSelection, "type", 0);
-	obs_data_set_string(sceneSelection, "name", scene.toUtf8().constData());
-	obs_data_set_string(sceneSelection, "canvasSelection", "Main");
-
-	OBSDataAutoRelease actionData = obs_data_create();
-	obs_data_set_obj(actionData, "segmentSettings", actionSegment);
-	obs_data_set_string(actionData, "id", "scene_switch");
-	obs_data_set_int(actionData, "action", 0);
-	obs_data_set_obj(actionData, "sceneSelection", sceneSelection);
-	obs_data_set_int(actionData, "transitionType", 1);
-	obs_data_set_bool(actionData, "blockUntilTransitionDone", false);
-	obs_data_set_int(actionData, "sceneType", 0);
-
-	if (!FirstRunWizard::CreateMacro(_macro, name, kConditionIdWindow,
-					 condData, kActionIdSceneSwitch,
-					 actionData)) {
-		QMessageBox::warning(
-			this,
-			obs_module_text("FirstRunWizard.review.errorTitle"),
-			QString(obs_module_text(
-					"FirstRunWizard.review.errorBody"))
-				.arg(window, scene));
-		_macro.reset();
-		// Still advance so the user is not stuck.
-	}
-	return true;
+	return PAGE_WINDOW_SCENE;
 }
 
 // ===========================================================================
@@ -373,12 +130,19 @@ FirstRunWizard::FirstRunWizard(QWidget *parent) : QWizard(parent)
 {
 	setWindowTitle(obs_module_text("FirstRunWizard.windowTitle"));
 	setWizardStyle(QWizard::ModernStyle);
-	setMinimumSize(540, 420);
+	setMinimumSize(600, 420);
 
 	setPage(PAGE_WELCOME, new WelcomePage(this));
-	setPage(PAGE_SCENE, new SceneSelectionPage(this));
-	setPage(PAGE_WINDOW, new WindowConditionPage(this));
-	setPage(PAGE_REVIEW, new ReviewPage(this, _macro));
+	setPage(PAGE_TEMPLATE, new TemplatePage(this));
+	setPage(PAGE_WINDOW_SCENE, new WindowSceneSelectionPage(this));
+	setPage(PAGE_WINDOW_CONDITION, new WindowConditionPage(this));
+	setPage(PAGE_WINDOW_REVIEW, new WindowReviewPage(this, _macro));
+	setPage(PAGE_SEQ_TRIGGER, new SequenceTriggerPage(this));
+	setPage(PAGE_SEQ_SCENES, new SequenceScenesPage(this));
+	setPage(PAGE_SEQ_REVIEW, new SequenceReviewPage(this, _macro));
+	setPage(PAGE_AUDIO_SOURCE, new AudioSourcePage(this));
+	setPage(PAGE_AUDIO_TARGET, new AudioTargetPage(this));
+	setPage(PAGE_AUDIO_REVIEW, new AudioReviewPage(this, _macro));
 	setPage(PAGE_DONE, new DonePage(this));
 
 	setStartId(PAGE_WELCOME);
@@ -394,70 +158,21 @@ FirstRunWizard::FirstRunWizard(QWidget *parent) : QWizard(parent)
 
 void FirstRunWizard::markFirstRunComplete()
 {
-	WriteFirstRun(false);
+	writeFirstRun(false);
 }
 
 // static
-std::shared_ptr<Macro> FirstRunWizard::ShowWizard(QWidget *parent)
+std::shared_ptr<Macro> FirstRunWizard::ShowWizard(QWidget *parent,
+						  bool *wasSkipped)
 {
 	auto wizard = new FirstRunWizard(parent);
 	wizard->exec();
+	if (wasSkipped) {
+		*wasSkipped = (wizard->result() == QDialog::Rejected);
+	}
 	wizard->deleteLater();
 	return wizard->_macro;
 }
 
-// static
-bool FirstRunWizard::CreateMacro(std::shared_ptr<Macro> &macro,
-				 const std::string &macroName,
-				 const std::string &conditionId,
-				 obs_data_t *conditionData,
-				 const std::string &actionId,
-				 obs_data_t *actionData)
-{
-	// 1. Create and register the Macro
-	macro = std::make_shared<Macro>(macroName, GetGlobalMacroSettings());
-	if (!macro) {
-		blog(LOG_WARNING, "FirstRunWizard: Macro allocation failed");
-		return false;
-	}
-
-	// 2. Instantiate condition via factory, then hydrate via Load()
-	auto condition =
-		MacroConditionFactory::Create(conditionId, macro.get());
-	if (!condition) {
-		blog(LOG_WARNING,
-		     "FirstRunWizard: condition factory returned null "
-		     "for id '%s' — is the base plugin loaded?",
-		     conditionId.c_str());
-		return false;
-	}
-	if (!condition->Load(conditionData)) {
-		blog(LOG_WARNING,
-		     "FirstRunWizard: condition Load() failed for id '%s'",
-		     conditionId.c_str());
-		return false;
-	}
-	macro->Conditions().emplace_back(condition);
-
-	// 3. Instantiate action via factory, then hydrate via Load()
-	auto action = MacroActionFactory::Create(actionId, macro.get());
-	if (!action) {
-		blog(LOG_WARNING,
-		     "FirstRunWizard: action factory returned null "
-		     "for id '%s' — is the base plugin loaded?",
-		     actionId.c_str());
-		return false;
-	}
-	if (!action->Load(actionData)) {
-		blog(LOG_WARNING,
-		     "FirstRunWizard: action Load() failed for id '%s'",
-		     actionId.c_str());
-		return false;
-	}
-	macro->Actions().emplace_back(action);
-
-	blog(LOG_INFO, "FirstRunWizard: created macro '%s'", macroName.c_str());
-	return true;
-}
-
+} // namespace wiz
 } // namespace advss

lib/utils/first-run-wizard.hpp

@@ -1,31 +1,34 @@
 #pragma once
 
-#include <obs-data.h>
-
-#include <QComboBox>
-#include <QLabel>
-#include <QLineEdit>
-#include <QPushButton>
-#include <QTimer>
+#include <QRadioButton>
 #include <QWizard>
 #include <QWizardPage>
 
-#include <string>
+#include <memory>
 
 namespace advss {
 
+bool IsFirstRun();
+
 class Macro;
 
-bool IsFirstRun();
+namespace wiz {
 
 // ---------------------------------------------------------------------------
 // Page IDs
 // ---------------------------------------------------------------------------
 enum WizardPageId {
 	PAGE_WELCOME = 0,
-	PAGE_SCENE,
-	PAGE_WINDOW,
-	PAGE_REVIEW,
+	PAGE_TEMPLATE,
+	PAGE_WINDOW_SCENE,
+	PAGE_WINDOW_CONDITION,
+	PAGE_WINDOW_REVIEW,
+	PAGE_SEQ_TRIGGER,
+	PAGE_SEQ_SCENES,
+	PAGE_SEQ_REVIEW,
+	PAGE_AUDIO_SOURCE,
+	PAGE_AUDIO_TARGET,
+	PAGE_AUDIO_REVIEW,
 	PAGE_DONE,
 };
 
@@ -36,64 +39,23 @@ class WelcomePage : public QWizardPage {
 	Q_OBJECT
 public:
 	explicit WelcomePage(QWidget *parent = nullptr);
-	int nextId() const override { return PAGE_SCENE; }
+	int nextId() const override { return PAGE_TEMPLATE; }
 };
 
 // ---------------------------------------------------------------------------
-// SceneSelectionPage
-//   Registers wizard field "targetScene" (QString).
+// TemplatePage
+//   Lets the user choose which kind of automation to create.
 // ---------------------------------------------------------------------------
-class SceneSelectionPage : public QWizardPage {
+class TemplatePage : public QWizardPage {
 	Q_OBJECT
 public:
-	explicit SceneSelectionPage(QWidget *parent = nullptr);
-	void initializePage() override;
-	bool isComplete() const override;
-	int nextId() const override { return PAGE_WINDOW; }
+	explicit TemplatePage(QWidget *parent = nullptr);
+	int nextId() const override;
 
 private:
-	QComboBox *_sceneCombo;
-};
-
-// ---------------------------------------------------------------------------
-// WindowConditionPage
-//   Registers wizard field "windowTitle" (QString).
-//   Auto-detect button samples the focused window after a countdown.
-// ---------------------------------------------------------------------------
-class WindowConditionPage : public QWizardPage {
-	Q_OBJECT
-public:
-	explicit WindowConditionPage(QWidget *parent = nullptr);
-	void initializePage() override;
-	bool isComplete() const override;
-	int nextId() const override { return PAGE_REVIEW; }
-
-private slots:
-	void onAutoDetectClicked();
-	void onCountdownTick();
-
-private:
-	QLineEdit *_windowEdit;
-	QPushButton *_autoDetect;
-	QTimer *_detectTimer;
-	int _countdown = 3;
-};
-
-// ---------------------------------------------------------------------------
-// ReviewPage
-//   Displays a summary and calls FirstRunWizard::CreateMacro() on Finish.
-// ---------------------------------------------------------------------------
-class ReviewPage : public QWizardPage {
-	Q_OBJECT
-public:
-	explicit ReviewPage(QWidget *parent, std::shared_ptr<Macro> &macro);
-	void initializePage() override;
-	bool validatePage() override;
-	int nextId() const override { return PAGE_DONE; }
-
-private:
-	QLabel *_summary;
-	std::shared_ptr<Macro> &_macro;
+	QRadioButton *_windowRadio;
+	QRadioButton *_sequenceRadio;
+	QRadioButton *_audioRadio;
 };
 
 // ---------------------------------------------------------------------------
@@ -113,16 +75,14 @@ class FirstRunWizard : public QWizard {
 	Q_OBJECT
 public:
 	explicit FirstRunWizard(QWidget *parent = nullptr);
-	static std::shared_ptr<Macro> ShowWizard(QWidget *parent);
-	static bool
-	CreateMacro(std::shared_ptr<Macro> &macro, const std::string &macroName,
-		    const std::string &conditionId, obs_data_t *conditionData,
-		    const std::string &actionId, obs_data_t *actionData);
+	static std::shared_ptr<advss::Macro>
+	ShowWizard(QWidget *parent, bool *wasSkipped = nullptr);
 
 private:
 	void markFirstRunComplete();
 
-	std::shared_ptr<Macro> _macro;
+	std::shared_ptr<advss::Macro> _macro;
 };
 
+} // namespace wiz
 } // namespace advss

lib/utils/json-helpers.cpp

@@ -99,4 +99,23 @@ std::optional<std::string> AccessJsonArrayIndex(const std::string &jsonStr,
 	return {};
 }
 
+std::optional<std::string>
+ExtractSingleJsonArrayElement(const std::string &jsonStr)
+{
+	try {
+		nlohmann::json json = nlohmann::json::parse(jsonStr);
+		if (!json.is_array() || json.size() != 1) {
+			return {};
+		}
+		auto result = json.at(0);
+		if (result.is_string()) {
+			return result.get<std::string>();
+		}
+		return result.dump();
+	} catch (const nlohmann::json::exception &) {
+		return {};
+	}
+	return {};
+}
+
 } // namespace advss

lib/utils/json-helpers.hpp

@@ -17,5 +17,7 @@ EXPORT std::optional<std::string> QueryJson(const std::string &json,
 					    const std::string &query);
 EXPORT std::optional<std::string> AccessJsonArrayIndex(const std::string &json,
 						       const int index);
+EXPORT std::optional<std::string>
+ExtractSingleJsonArrayElement(const std::string &json);
 
 } // namespace advss

lib/utils/plugin-state-helpers.cpp

@@ -75,6 +75,18 @@ static std::vector<std::function<void()>> &getStopSteps()
 	return steps;
 }
 
+static std::vector<std::function<void(obs_data_t *)>> &getEarlySaveSteps()
+{
+	static std::vector<std::function<void(obs_data_t *)>> steps;
+	return steps;
+}
+
+static std::vector<std::function<void(obs_data_t *)>> &getEarlyLoadSteps()
+{
+	static std::vector<std::function<void(obs_data_t *)>> steps;
+	return steps;
+}
+
 static std::vector<std::function<void(obs_data_t *)>> &getSaveSteps()
 {
 	static std::vector<std::function<void(obs_data_t *)>> steps;
@@ -109,6 +121,18 @@ void LoadPluginSettings(obs_data_t *obj)
 	GetSwitcher()->LoadSettings(obj);
 }
 
+void AddEarlySaveStep(std::function<void(obs_data_t *)> step)
+{
+	std::lock_guard<std::mutex> lock(mutex);
+	getEarlySaveSteps().emplace_back(step);
+}
+
+void AddEarlyLoadStep(std::function<void(obs_data_t *)> step)
+{
+	std::lock_guard<std::mutex> lock(mutex);
+	getEarlyLoadSteps().emplace_back(step);
+}
+
 void AddSaveStep(std::function<void(obs_data_t *)> step)
 {
 	std::lock_guard<std::mutex> lock(mutex);
@@ -136,6 +160,9 @@ void AddIntervalResetStep(std::function<void()> step)
 void RunSaveSteps(obs_data_t *obj)
 {
 	std::lock_guard<std::mutex> lock(mutex);
+	for (const auto &func : getEarlySaveSteps()) {
+		func(obj);
+	}
 	for (const auto &func : getSaveSteps()) {
 		func(obj);
 	}
@@ -144,6 +171,9 @@ void RunSaveSteps(obs_data_t *obj)
 void RunLoadSteps(obs_data_t *obj)
 {
 	std::lock_guard<std::mutex> lock(mutex);
+	for (const auto &func : getEarlyLoadSteps()) {
+		func(obj);
+	}
 	for (const auto &func : getLoadSteps()) {
 		func(obj);
 	}

lib/utils/plugin-state-helpers.hpp

@@ -8,6 +8,8 @@ namespace advss {
 void SavePluginSettings(obs_data_t *);
 EXPORT void LoadPluginSettings(obs_data_t *);
 
+void AddEarlySaveStep(std::function<void(obs_data_t *)>);
+void AddEarlyLoadStep(std::function<void(obs_data_t *)>);
 EXPORT void AddSaveStep(std::function<void(obs_data_t *)>);
 EXPORT void AddLoadStep(std::function<void(obs_data_t *)>);
 EXPORT void AddPostLoadStep(std::function<void()>);

lib/utils/selection-helpers.cpp

@@ -173,10 +173,10 @@ void PopulateTransitionSelection(QComboBox *sel, bool addCurrent, bool addAny,
 void PopulateWindowSelection(QComboBox *sel, bool addSelect)
 {
 
-	const auto windows = GetWindowList();
+	const auto windows = GetWindows();
 
-	for (const std::string &window : windows) {
-		sel->addItem(window.c_str());
+	for (const auto &info : windows) {
+		sel->addItem(info.title.c_str());
 	}
 
 	sel->model()->sort(0);

lib/utils/source-helpers.cpp

@@ -162,4 +162,48 @@ bool IsMediaSource(obs_source_t *source)
 	return (flags & OBS_SOURCE_CONTROLLABLE_MEDIA) != 0;
 }
 
+SourceActiveKeeper::~SourceActiveKeeper()
+{
+	ReleaseRef();
+}
+
+void SourceActiveKeeper::SetActive(bool active)
+{
+	if (_active == active) {
+		return;
+	}
+	if (active) {
+		_active = true;
+		AcquireRef();
+	} else {
+		ReleaseRef();
+		_active = false;
+	}
+}
+
+void SourceActiveKeeper::SetSource(obs_source_t *source)
+{
+	if (_source == source) {
+		return;
+	}
+	ReleaseRef();
+	_source = source;
+	AcquireRef();
+}
+
+void SourceActiveKeeper::AcquireRef()
+{
+	if (_active && _source) {
+		obs_source_inc_active(_source);
+	}
+}
+
+void SourceActiveKeeper::ReleaseRef()
+{
+	if (_active && _source) {
+		obs_source_dec_active(_source);
+		_source = nullptr;
+	}
+}
+
 } // namespace advss

lib/utils/source-helpers.hpp

@@ -20,4 +20,25 @@ EXPORT OBSWeakSource GetWeakFilterByQString(OBSWeakSource source,
 EXPORT int GetSceneItemCount(const OBSWeakSource &);
 EXPORT bool IsMediaSource(obs_source_t *source);
 
+// RAII helper that keeps an OBS source active (via obs_source_inc_active /
+// obs_source_dec_active) for as long as the keeper is enabled.
+class EXPORT SourceActiveKeeper {
+public:
+	SourceActiveKeeper() = default;
+	~SourceActiveKeeper();
+
+	SourceActiveKeeper(const SourceActiveKeeper &) = delete;
+	SourceActiveKeeper &operator=(const SourceActiveKeeper &) = delete;
+
+	void SetActive(bool active);
+	void SetSource(obs_source_t *source);
+
+private:
+	void AcquireRef();
+	void ReleaseRef();
+
+	OBSSource _source;
+	bool _active = false;
+};
+
 } // namespace advss

lib/utils/temp-variable.hpp

@@ -74,6 +74,7 @@ public:
 	EXPORT std::optional<const TempVariable> GetTempVariable(Macro *) const;
 	EXPORT bool operator==(const TempVariableRef &other) const;
 	bool HasValidID() const { return !_id.empty(); }
+	std::string GetID() const { return _id; }
 
 private:
 	enum class SegmentType { NONE, CONDITION, ACTION, ELSEACTION };

lib/variables/variable-color-button.cpp

@@ -0,0 +1,106 @@
+#include "variable-color-button.hpp"
+#include "obs-module-helper.hpp"
+#include "ui-helpers.hpp"
+
+#include <QColorDialog>
+#include <QHBoxLayout>
+
+namespace advss {
+
+VariableColorButton::VariableColorButton(QWidget *parent,
+					 const QString &selectText)
+	: QWidget(parent),
+	  _colorSwatch(new QLabel()),
+	  _selectColor(new QPushButton(selectText)),
+	  _variable(new VariableSelection(this)),
+	  _toggleType(new QPushButton())
+{
+	_toggleType->setCheckable(true);
+	_toggleType->setMaximumWidth(11);
+	SetButtonIcon(_toggleType, GetThemeTypeName() == "Light"
+					   ? ":/res/images/dots-vert.svg"
+					   : "theme:Dark/dots-vert.svg");
+
+	QWidget::connect(_selectColor, SIGNAL(clicked()), this,
+			 SLOT(SelectColorClicked()));
+	QWidget::connect(_toggleType, SIGNAL(toggled(bool)), this,
+			 SLOT(ToggleTypeClicked(bool)));
+	QWidget::connect(_variable, SIGNAL(SelectionChanged(const QString &)),
+			 this, SLOT(VariableChanged(const QString &)));
+
+	auto layout = new QHBoxLayout();
+	layout->setContentsMargins(0, 0, 0, 0);
+	layout->addWidget(_colorSwatch);
+	layout->addWidget(_selectColor);
+	layout->addWidget(_variable);
+	layout->addWidget(_toggleType);
+	setLayout(layout);
+	SetVisibility();
+}
+
+void VariableColorButton::SetValue(const ColorVariable &color)
+{
+	_color = color;
+	const QSignalBlocker b1(_toggleType);
+	const QSignalBlocker b2(_variable);
+	_toggleType->setChecked(!color.IsFixedType());
+	SetupColorLabel(color.GetFixedValue());
+	_variable->SetVariable(color.GetVariable());
+	SetVisibility();
+}
+
+void VariableColorButton::SelectColorClicked()
+{
+	const QColor color = QColorDialog::getColor(
+		_color.GetFixedValue(), this, _selectColor->text(),
+		QColorDialog::ColorDialogOption());
+	if (!color.isValid()) {
+		return;
+	}
+	SetupColorLabel(color);
+	_color._value = color;
+	emit ColorVariableChanged(_color);
+}
+
+void VariableColorButton::VariableChanged(const QString &name)
+{
+	_color._variable = GetWeakVariableByQString(name);
+	emit ColorVariableChanged(_color);
+}
+
+void VariableColorButton::ToggleTypeClicked(bool useVariable)
+{
+	_color._type = useVariable ? ColorVariable::Type::VARIABLE
+				   : ColorVariable::Type::FIXED_VALUE;
+	SetVisibility();
+	emit ColorVariableChanged(_color);
+}
+
+void VariableColorButton::SetupColorLabel(const QColor &color)
+{
+	_colorSwatch->setText(color.name());
+	_colorSwatch->setStyleSheet(
+		QString("background-color: %1;").arg(color.name()));
+}
+
+void VariableColorButton::SetVisibility()
+{
+	if (_color.IsFixedType()) {
+		SetupColorLabel(_color.GetFixedValue());
+		_colorSwatch->show();
+		_selectColor->show();
+		_variable->hide();
+		_toggleType->setVisible(!GetVariables().empty());
+	} else {
+		_colorSwatch->hide();
+		_selectColor->hide();
+		_variable->show();
+		_variable->setToolTip(obs_module_text(
+			"AdvSceneSwitcher.condition.video.colorVariableTooltip"));
+		_toggleType->show();
+	}
+	adjustSize();
+	updateGeometry();
+}
+
+} // namespace advss

lib/variables/variable-color-button.hpp

@@ -0,0 +1,37 @@
+#pragma once
+#include "export-symbol-helper.hpp"
+#include "variable-color.hpp"
+
+#include <QLabel>
+#include <QPushButton>
+#include <QWidget>
+
+namespace advss {
+
+class ADVSS_EXPORT VariableColorButton : public QWidget {
+	Q_OBJECT
+public:
+	VariableColorButton(QWidget *parent, const QString &selectText);
+	void SetValue(const ColorVariable &);
+	ColorVariable Value() const { return _color; }
+
+public slots:
+	void SelectColorClicked();
+	void VariableChanged(const QString &);
+	void ToggleTypeClicked(bool useVariable);
+
+signals:
+	void ColorVariableChanged(const ColorVariable &);
+
+private:
+	void SetupColorLabel(const QColor &);
+	void SetVisibility();
+
+	ColorVariable _color;
+	QLabel *_colorSwatch;
+	QPushButton *_selectColor;
+	VariableSelection *_variable;
+	QPushButton *_toggleType;
+};
+
+} // namespace advss

lib/variables/variable-color.cpp

@@ -0,0 +1,53 @@
+#include "variable-color.hpp"
+
+#include <obs.hpp>
+
+namespace advss {
+
+ColorVariable::ColorVariable(const QColor &value) : _value(value) {}
+
+void ColorVariable::Save(obs_data_t *obj, const char *name) const
+{
+	OBSDataAutoRelease data = obs_data_create();
+	obs_data_set_int(data, "version", 1);
+	obs_data_set_int(data, "type", static_cast<int>(_type));
+	auto var = _variable.lock();
+	if (var) {
+		obs_data_set_string(data, "variable", var->Name().c_str());
+	}
+	obs_data_set_int(data, "red", _value.red());
+	obs_data_set_int(data, "green", _value.green());
+	obs_data_set_int(data, "blue", _value.blue());
+	obs_data_set_obj(obj, name, data);
+}
+
+void ColorVariable::Load(obs_data_t *obj, const char *name)
+{
+	OBSDataAutoRelease data = obs_data_get_obj(obj, name);
+	_value.setRed(obs_data_get_int(data, "red"));
+	_value.setGreen(obs_data_get_int(data, "green"));
+	_value.setBlue(obs_data_get_int(data, "blue"));
+	if (!obs_data_has_user_value(data, "version")) {
+		// Old format: no variable support, just R/G/B
+		_type = Type::FIXED_VALUE;
+		return;
+	}
+	auto variableName = obs_data_get_string(data, "variable");
+	_variable = GetWeakVariableByName(variableName);
+	_type = static_cast<Type>(obs_data_get_int(data, "type"));
+}
+
+QColor ColorVariable::GetValue() const
+{
+	if (_type == Type::FIXED_VALUE) {
+		return _value;
+	}
+	auto var = _variable.lock();
+	if (!var) {
+		return Qt::black;
+	}
+	const QColor color(QString::fromStdString(var->Value()));
+	return color.isValid() ? color : Qt::black;
+}
+
+} // namespace advss

lib/variables/variable-color.hpp

@@ -0,0 +1,35 @@
+#pragma once
+#include "variable.hpp"
+
+#include <obs-data.h>
+#include <QColor>
+
+namespace advss {
+
+class VariableColorButton;
+
+class ADVSS_EXPORT ColorVariable {
+public:
+	enum class Type { FIXED_VALUE, VARIABLE };
+
+	ColorVariable() = default;
+	ColorVariable(const QColor &value);
+
+	void Save(obs_data_t *obj, const char *name) const;
+	void Load(obs_data_t *obj, const char *name);
+
+	QColor GetValue() const;
+	QColor GetFixedValue() const { return _value; }
+	bool IsFixedType() const { return _type == Type::FIXED_VALUE; }
+	Type GetType() const { return _type; }
+	std::weak_ptr<Variable> GetVariable() const { return _variable; }
+
+private:
+	Type _type = Type::FIXED_VALUE;
+	QColor _value = Qt::black;
+	std::weak_ptr<Variable> _variable;
+
+	friend class VariableColorButton;
+};
+
+} // namespace advss

lib/variables/variable-tab.cpp

@@ -29,6 +29,7 @@ static void save(obs_data_t *data)
 {
 	tabSettings.Save(data, "tabSettings");
 	dockSettings.Save(data, "dockSettings");
+
 	obs_data_set_bool(data, "addVariablesDock", addDock);
 }
 
@@ -63,7 +64,6 @@ static void load(obs_data_t *data)
 {
 	tabSettings.Load(data, "tabSettings");
 	dockSettings.Load(data, "dockSettings");
-
 	enableDock(obs_data_get_bool(data, "addVariablesDock"));
 }
 

lib/variables/variable.cpp

@@ -20,8 +20,8 @@ static std::chrono::high_resolution_clock::time_point lastVariableChange{};
 
 static bool setup()
 {
-	AddSaveStep(SaveVariables);
-	AddLoadStep(LoadVariables);
+	AddEarlySaveStep(SaveVariables);
+	AddEarlyLoadStep(LoadVariables);
 	AddPluginCleanupStep([]() { variables.clear(); });
 	return true;
 }
@@ -108,16 +108,20 @@ std::optional<int> Variable::IntValue() const
 
 void Variable::SetValue(const std::string &value)
 {
-	std::lock_guard<std::mutex> lock(_mutex);
-	_previousValue = _value;
-	_value = value;
+	{
+		std::lock_guard<std::mutex> lock(_mutex);
+		_previousValue = _value;
+		_value = value;
 
-	UpdateLastUsed();
-	if (_previousValue != _value) {
-		_lastChanged = std::chrono::high_resolution_clock::now();
-		++_valueChangeCount;
+		UpdateLastUsed();
+		if (_previousValue != _value) {
+			_lastChanged =
+				std::chrono::high_resolution_clock::now();
+			++_valueChangeCount;
+		}
+		setLastVariableChangeTime();
 	}
-	setLastVariableChangeTime();
+	_cv.notify_all();
 }
 
 void Variable::SetValue(double value)
@@ -454,7 +458,6 @@ void LoadVariables(obs_data_t *obj)
 		auto var = Variable::Create();
 		variables.emplace_back(var);
 		variables.back()->Load(array_obj);
-		obs_data_release(array_obj);
 	}
 }
 

lib/variables/variable.hpp

@@ -3,6 +3,7 @@
 #include "item-selection-helpers.hpp"
 #include "resizing-text-edit.hpp"
 
+#include <condition_variable>
 #include <mutex>
 #include <obs-data.h>
 #include <optional>
@@ -43,6 +44,11 @@ public:
 	std::optional<uint64_t> GetSecondsSinceLastUse() const;
 	std::optional<uint64_t> GetSecondsSinceLastChange() const;
 	void MarkAsUsed() const;
+	EXPORT std::condition_variable &GetCV() { return _cv; }
+	EXPORT std::unique_lock<std::mutex> GetCVLock()
+	{
+		return std::unique_lock<std::mutex>(_cvMutex);
+	}
 
 private:
 	SaveAction _saveAction = SaveAction::DONT_SAVE;
@@ -53,6 +59,8 @@ private:
 	mutable std::chrono::high_resolution_clock::time_point _lastUsed;
 	mutable std::chrono::high_resolution_clock::time_point _lastChanged;
 	mutable std::mutex _mutex;
+	std::mutex _cvMutex;
+	std::condition_variable _cv;
 
 	void UpdateLastUsed() const;
 

lib/win/advanced-scene-switcher-win.cpp

@@ -1,10 +1,12 @@
 #include "platform-funcs.hpp"
+#include "plugin-state-helpers.hpp"
 
 #include <windows.h>
 #include <UIAutomation.h>
 #include <util/platform.h>
 #include <TlHelp32.h>
 #include <Psapi.h>
+#include <memory>
 #include <locale>
 #include <codecvt>
 #include <string>
@@ -16,6 +18,9 @@
 #include <QWidget>
 #include <mutex>
 
+#define ADVSS_WIDEN_(x) L##x
+#define ADVSS_WIDEN(x) ADVSS_WIDEN_(x)
+
 namespace advss {
 
 #define MAX_SEARCH 1000
@@ -133,7 +138,7 @@ const std::vector<std::string> getOBSWindows()
 	return lastDoneHelper->windows;
 }
 
-std::vector<std::string> GetWindowList()
+static std::vector<std::string> getAllWindowTitles()
 {
 	std::vector<std::string> windows;
 	EnumWindowsWithMetro(GetTitleCB, reinterpret_cast<LPARAM>(&windows));
@@ -150,6 +155,129 @@ std::vector<std::string> GetWindowList()
 	return windows;
 }
 
+static bool isWindowMaximized(HWND hwnd)
+{
+	if (!hwnd || hwnd == GetDesktopWindow() || hwnd == GetShellWindow()) {
+		return false;
+	}
+	if (IsZoomed(hwnd)) {
+		return true;
+	}
+	RECT appBounds;
+	MONITORINFO monitorInfo = {0};
+	monitorInfo.cbSize = sizeof(MONITORINFO);
+	GetMonitorInfo(MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST),
+		       &monitorInfo);
+	GetWindowRect(hwnd, &appBounds);
+	return monitorInfo.rcMonitor.bottom == appBounds.bottom &&
+	       monitorInfo.rcMonitor.top == appBounds.top &&
+	       monitorInfo.rcMonitor.left == appBounds.left &&
+	       monitorInfo.rcMonitor.right == appBounds.right;
+}
+
+static bool isWindowFullscreen(HWND hwnd)
+{
+	if (!hwnd || hwnd == GetDesktopWindow() || hwnd == GetShellWindow()) {
+		return false;
+	}
+	RECT appBounds;
+	MONITORINFO monitorInfo = {0};
+	monitorInfo.cbSize = sizeof(MONITORINFO);
+	GetMonitorInfo(MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST),
+		       &monitorInfo);
+	GetWindowRect(hwnd, &appBounds);
+	return monitorInfo.rcMonitor.bottom == appBounds.bottom &&
+	       monitorInfo.rcMonitor.top == appBounds.top &&
+	       monitorInfo.rcMonitor.left == appBounds.left &&
+	       monitorInfo.rcMonitor.right == appBounds.right;
+}
+
+static std::string getWindowClass(HWND hwnd)
+{
+	std::wstring wClass;
+	wClass.resize(256);
+	int len = GetClassNameW(hwnd, &wClass[0], (int)wClass.size());
+	if (len <= 0) {
+		return "";
+	}
+	wClass.resize(len);
+	size_t utf8len = os_wcs_to_utf8(wClass.c_str(), 0, nullptr, 0);
+	std::string result;
+	result.resize(utf8len);
+	os_wcs_to_utf8(wClass.c_str(), 0, &result[0], utf8len + 1);
+	return result;
+}
+
+static HWND getHWNDfromTitle(const std::string &title);
+static std::optional<std::string> GetTextInWindow(const std::string &window);
+
+std::vector<WindowInfo> GetWindows(const WindowQueryOptions &options)
+{
+	const std::string foregroundTitle = GetCurrentWindowTitle();
+	const auto titles = getAllWindowTitles();
+
+	std::vector<WindowInfo> result;
+	result.reserve(titles.size());
+
+	for (const auto &title : titles) {
+		WindowInfo info;
+		info.title = title;
+
+		const bool needHwnd = options.geometry || options.fullscreen ||
+				      options.maximized ||
+				      options.windowClass || options.text ||
+				      options.focus;
+
+		if (options.focus) {
+			info.focused = (title == foregroundTitle);
+		}
+
+		if (!needHwnd || (!options.geometry && !options.fullscreen &&
+				  !options.maximized && !options.windowClass &&
+				  !options.text)) {
+			result.emplace_back(std::move(info));
+			continue;
+		}
+
+		HWND hwnd = getHWNDfromTitle(title);
+		if (!hwnd) {
+			result.emplace_back(std::move(info));
+			continue;
+		}
+
+		if (options.geometry || options.fullscreen ||
+		    options.maximized) {
+			RECT rect;
+			if (GetWindowRect(hwnd, &rect)) {
+				info.x = rect.left;
+				info.y = rect.top;
+				info.width = rect.right - rect.left;
+				info.height = rect.bottom - rect.top;
+			}
+		}
+
+		if (options.maximized) {
+			info.maximized = isWindowMaximized(hwnd);
+		}
+
+		if (options.fullscreen) {
+			info.fullscreen = isWindowFullscreen(hwnd);
+		}
+
+		if (options.windowClass) {
+			info.windowClass = getWindowClass(hwnd);
+		}
+
+		if (options.text) {
+			info.text = GetTextInWindow(title);
+		}
+
+		result.emplace_back(std::move(info));
+	}
+
+	return result;
+}
+
 std::string GetCurrentWindowTitle()
 {
 	HWND window = GetForegroundWindow();
@@ -188,36 +316,6 @@ static HWND getHWNDfromTitle(const std::string &title)
 	return hwnd;
 }
 
-bool IsMaximized(const std::string &title)
-{
-	RECT appBounds;
-	MONITORINFO monitorInfo = {0};
-	HWND hwnd = NULL;
-
-	hwnd = getHWNDfromTitle(title);
-	if (!hwnd) {
-		return false;
-	}
-
-	monitorInfo.cbSize = sizeof(MONITORINFO);
-	GetMonitorInfo(MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST),
-		       &monitorInfo);
-
-	if (hwnd && hwnd != GetDesktopWindow() && hwnd != GetShellWindow()) {
-		if (IsZoomed(hwnd)) {
-			return true;
-		}
-		GetWindowRect(hwnd, &appBounds);
-		if (monitorInfo.rcMonitor.bottom == appBounds.bottom &&
-		    monitorInfo.rcMonitor.top == appBounds.top &&
-		    monitorInfo.rcMonitor.left == appBounds.left &&
-		    monitorInfo.rcMonitor.right == appBounds.right) {
-			return true;
-		}
-	}
-	return false;
-}
-
 static std::wstring GetControlText(HWND hwnd, IUIAutomationElement *element)
 {
 	VARIANT var;
@@ -244,7 +342,7 @@ static std::wstring GetControlText(HWND hwnd, IUIAutomationElement *element)
 	return text;
 }
 
-std::optional<std::string> GetTextInWindow(const std::string &window)
+static std::optional<std::string> GetTextInWindow(const std::string &window)
 {
 	HWND hwnd = getHWNDfromTitle(window);
 	if (!hwnd) {
@@ -311,35 +409,6 @@ std::optional<std::string> GetTextInWindow(const std::string &window)
 	return tmp;
 }
 
-bool IsFullscreen(const std::string &title)
-{
-	RECT appBounds;
-	MONITORINFO monitorInfo = {0};
-
-	HWND hwnd = NULL;
-	hwnd = getHWNDfromTitle(title);
-
-	if (!hwnd) {
-		return false;
-	}
-
-	monitorInfo.cbSize = sizeof(MONITORINFO);
-	GetMonitorInfo(MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST),
-		       &monitorInfo);
-
-	if (hwnd && hwnd != GetDesktopWindow() && hwnd != GetShellWindow()) {
-		GetWindowRect(hwnd, &appBounds);
-		if (monitorInfo.rcMonitor.bottom == appBounds.bottom &&
-		    monitorInfo.rcMonitor.top == appBounds.top &&
-		    monitorInfo.rcMonitor.left == appBounds.left &&
-		    monitorInfo.rcMonitor.right == appBounds.right) {
-			return true;
-		}
-	}
-
-	return false;
-}
-
 QStringList GetProcessList()
 {
 	QStringList processes;
@@ -500,9 +569,86 @@ int SecondsSinceLastInput()
 	return (getTime() - getLastInputTime()) / 1000;
 }
 
+static void addPluginFolderToSymbolPath()
+{
+	// This runs after OBS_FRONTEND_EVENT_FINISHED_LOADING, which fires after
+	// obs_load_all_modules() completes. By that point OBS has already called
+	// reset_win32_symbol_paths() -> SymInitializeW(), so DbgHelp is
+	// initialized and we can append our plugins subfolder (where the PDB
+	// files live) to the existing search path.
+	HMODULE dbghelp = LoadLibraryW(L"DbgHelp");
+	if (!dbghelp) {
+		return;
+	}
+
+	typedef BOOL(WINAPI * SymGetSearchPathW_t)(HANDLE, PWSTR, DWORD);
+	typedef BOOL(WINAPI * SymSetSearchPathW_t)(HANDLE, PCWSTR);
+	typedef BOOL(WINAPI * SymRefreshModuleList_t)(HANDLE);
+
+	auto symGetSearchPathW = reinterpret_cast<SymGetSearchPathW_t>(
+		GetProcAddress(dbghelp, "SymGetSearchPathW"));
+	auto symSetSearchPathW = reinterpret_cast<SymSetSearchPathW_t>(
+		GetProcAddress(dbghelp, "SymSetSearchPathW"));
+	auto symRefreshModuleList = reinterpret_cast<SymRefreshModuleList_t>(
+		GetProcAddress(dbghelp, "SymRefreshModuleList"));
+
+	if (!symGetSearchPathW || !symSetSearchPathW || !symRefreshModuleList) {
+		FreeLibrary(dbghelp);
+		return;
+	}
+
+	HMODULE hModule = NULL;
+	if (!GetModuleHandleExW(
+		    GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS |
+			    GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
+		    reinterpret_cast<LPCWSTR>(addPluginFolderToSymbolPath),
+		    &hModule)) {
+		FreeLibrary(dbghelp);
+		return;
+	}
+
+	wchar_t dllDir[MAX_PATH];
+	if (!GetModuleFileNameW(hModule, dllDir, MAX_PATH)) {
+		FreeLibrary(dbghelp);
+		return;
+	}
+
+	wchar_t *lastSep = wcsrchr(dllDir, L'\\');
+	if (!lastSep) {
+		FreeLibrary(dbghelp);
+		return;
+	}
+	*lastSep = L'\0';
+
+	wchar_t pluginsPath[MAX_PATH];
+	wcsncpy_s(pluginsPath, MAX_PATH, dllDir, _TRUNCATE);
+	wcsncat_s(pluginsPath, MAX_PATH, L"\\" ADVSS_WIDEN(ADVSS_PLUGIN_FOLDER),
+		  _TRUNCATE);
+
+	constexpr DWORD currentPathLen = 4096;
+	constexpr DWORD newPathLen = 8192;
+	auto currentPath = std::make_unique<wchar_t[]>(currentPathLen);
+	auto newPath = std::make_unique<wchar_t[]>(newPathLen);
+
+	symGetSearchPathW(GetCurrentProcess(), currentPath.get(),
+			  currentPathLen);
+
+	if (currentPath[0] != L'\0') {
+		_snwprintf_s(newPath.get(), newPathLen, _TRUNCATE, L"%s;%s",
+			     currentPath.get(), pluginsPath);
+	} else {
+		wcsncpy_s(newPath.get(), newPathLen, pluginsPath, _TRUNCATE);
+	}
+
+	symSetSearchPathW(GetCurrentProcess(), newPath.get());
+	symRefreshModuleList(GetCurrentProcess());
+	FreeLibrary(dbghelp);
+}
+
 void PlatformInit()
 {
 	CoInitialize(NULL);
+	AddFinishedLoadingStep(addPluginFolderToSymbolPath);
 }
 
 void PlatformCleanup()

module/advanced-scene-switcher-module.c

@@ -1,5 +1,16 @@
 #include <obs-module.h>
 #include <obs-frontend-api.h>
+#include <stdlib.h>
+
+#ifdef _WIN32
+#define ADVSS_SETENV(k, v) _putenv_s(k, v)
+#define ADVSS_UNSETENV(k) _putenv_s(k, "")
+#else
+#define ADVSS_SETENV(k, v) setenv(k, v, 1)
+#define ADVSS_UNSETENV(k) unsetenv(k)
+#endif
+
+#define ADVSS_INSTANCE_ENV "ADVSS_INSTANCE_LOADED"
 
 OBS_DECLARE_MODULE()
 OBS_MODULE_USE_DEFAULT_LOCALE("advanced-scene-switcher", "en-US")
@@ -17,6 +28,12 @@ void obs_module_post_load(void)
 
 bool obs_module_load(void)
 {
+	if (getenv(ADVSS_INSTANCE_ENV)) {
+		blog(LOG_WARNING,
+		     "[adv-ss] Another instance is already loaded - skipping.");
+		return false;
+	}
+	ADVSS_SETENV(ADVSS_INSTANCE_ENV, "1");
 	obs_frontend_push_ui_translation(obs_module_get_string);
 	InitSceneSwitcher(obs_current_module(), obs_module_text);
 	return true;
@@ -25,4 +42,5 @@ bool obs_module_load(void)
 void obs_module_unload(void)
 {
 	FreeSceneSwitcher();
+	ADVSS_UNSETENV(ADVSS_INSTANCE_ENV);
 }