Add MIDI device name check

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,36 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Logs**
+Please provide a log of your issue with verbose logging enabled (See General tab of the plugin).  
+In case of a crash, please also include the corresponding crash log.  
+See [here](https://obsproject.com/forum/threads/please-post-a-log-with-your-issue-heres-how.23074/) for a description where to find the log files and how to share them.  
+Please share the currently used plugin settings by exporting them them to a file (See General tab of the plugin).  
+If applicable, add screenshots to help explain your problem.
+
+**Version information**
+ - OS: [e.g. Windows 10]
+ - OBS Version [e.g. 27.1.3]
+ - Plugin Version [e.g. 1.17.1]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -1,111 +0,0 @@
-# Based on the OBS issue templates
-# https://github.com/obsproject/.github/tree/master/.github/ISSUE_TEMPLATE
-
-name: Bug Report
-description: Report a bug or crash
-body:
-- type: markdown
-  id: md_welcome
-  attributes:
-    value: This form is for reporting bugs for Advanced Scene Switcher!
-- type: dropdown
-  id: os_info
-  attributes:
-    label: Operating System Info
-    description: What Operating System are you running?
-    options:
-    - Windows 11
-    - Windows 10
-    - macOS 14
-    - macOS 13
-    - macOS 12
-    - macOS 11
-    - Ubuntu 23.10
-    - Ubuntu 22.04
-    - Other
-  validations:
-    required: true
-- type: input
-  id: os_info_other
-  attributes:
-    label: Other OS
-    description: "If \"Other\" was selected above, what OS are you using?"
-    placeholder: "e.g., Arch Linux, FreeBSD"
-  validations:
-    required: false
-- type: input
-  id: obs_version
-  attributes:
-    label: OBS Studio Version
-    description: What version of OBS Studio are you using?
-    placeholder: 30.2.2
-  validations:
-    required: true
-- type: input
-  id: advss_version
-  attributes:
-    label: Advanced Scene Switcher Version
-    description: What version of the Advanced Scene Switcher are you using?
-    placeholder: 1.27.2
-  validations:
-    required: true
-- type: input
-  id: settings
-  attributes:
-    label: Plugin settings
-    description: |
-      Please provide the plugin settings used.
-      Either only [export the macros](https://github.com/WarmUpTill/SceneSwitcher/wiki/Exporting-and-importing-individual-macros) relevant to this issue or [export all settings](https://github.com/WarmUpTill/SceneSwitcher/wiki/Saving-and-loading-settings#how-to-create-and-import-a-backup-of-your-settings) on the General tab of the plugin.
-  validations:
-    required: false
-- type: input
-  id: obs_log_url
-  attributes:
-    label: OBS Studio Log URL
-    description: Please provide the obsproject.com URL (from Help menu > Log Files > Upload Current/Previous Log File) to the OBS log file where this issue occurred.
-  validations:
-    required: false
-- type: input
-  id: obs_crash_log_url
-  attributes:
-    label: OBS Studio Crash Log URL
-    description: If this is a crash report, please provide the obsproject.com URL to the OBS crash log file where this issue occurred.
-  validations:
-    required: false
-- type: textarea
-  id: expected_behavior
-  attributes:
-    label: Expected Behavior
-    description: "What did you expect to happen?"
-  validations:
-    required: true
-- type: textarea
-  id: current_behavior
-  attributes:
-    label: Current Behavior
-    description: "What actually happened?"
-  validations:
-    required: true
-- type: textarea
-  id: steps_to_reproduce
-  attributes:
-    label: Steps to Reproduce
-    description: "How do you trigger this bug? Please walk us through it step by step."
-    placeholder: |
-      1.
-      2.
-      3.
-      ...
-    value: |
-      1.
-      2.
-      3.
-      ...
-  validations:
-    required: true
-- type: textarea
-  id: additional_notes
-  attributes:
-    label: Anything else we should know?
-  validations:
-    required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,5 @@
 blank_issues_enabled: true
 contact_links:
-  - name: 📚 Wiki
+  - name: Help/Support
     url: https://github.com/WarmUpTill/SceneSwitcher/wiki
-    about: For explanations on how the plugin works or to see example guides, check out the wiki.
-  - name: 💬 OBS Forum Thread
-    url: https://obsproject.com/forum/threads/advanced-scene-switcher.48264
-    about: To discuss the plugin or get assistance, feel free to use the OBS forum thread or the GitHub discussions page.
+    about: For general questions about how to use and configure the plugin please have a look at the wiki (https://github.com/WarmUpTill/SceneSwitcher/wiki) or ask questions in the OBS forum (https://obsproject.com/forum/threads/advanced-scene-switcher.48264/)

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -1,37 +0,0 @@
-# Based on the OBS issue templates
-# https://github.com/obsproject/.github/tree/master/.github/ISSUE_TEMPLATE
-
-name: Feature request
-description: Suggest an idea for this projectReport a bug or crash
-body:
-- type: markdown
-  id: md_welcome
-  attributes:
-    value: This form is for requesting new features for Advanced Scene Switcher!
-- type: textarea
-  id: background
-  attributes:
-    label: Background
-    description: "Is your feature request related to a problem? Please describe."
-  validations:
-    required: false
-- type: textarea
-  id: solution
-  attributes:
-    label: Solution
-    description: "Describe the solution you'd like."
-  validations:
-    required: true
-- type: textarea
-  id: alternatives
-  attributes:
-    label: Alternatives
-    description: "Describe alternatives you've considered."
-  validations:
-    required: false
-- type: textarea
-  id: additional_notes
-  attributes:
-    label: Anything else we should know?
-  validations:
-    required: false

.github/scripts/.Aptfile

@@ -9,5 +9,4 @@ package 'libxtst-dev'
 package 'libxss-dev'
 package 'libopencv-dev'
 package 'libtesseract-dev'
-package 'libprocps-dev'
-package 'libusb-1.0-0-dev'
+package 'libprocps-dev'

.github/scripts/.Brewfile

@@ -3,5 +3,3 @@ brew "coreutils"
 brew "cmake"
 brew "jq"
 brew "xcbeautify"
-brew "automake"
-brew "libtool"

.github/scripts/.Wingetfile

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

.github/scripts/.build-deps.zsh

@@ -306,7 +306,7 @@ Usage: %B${functrace[1]%:*}%b <option> [<options>]
         log_info "Building OpenCV ..."
         cmake --build ${opencv_build_dir} --config Release
 
-        log_info "Installing OpenCV ..."
+        log_info "Installing OpenCV..."
         cmake --install ${opencv_build_dir} --prefix "${advss_dep_path}" --config Release || true
         popd
 
@@ -335,69 +335,52 @@ Usage: %B${functrace[1]%:*}%b <option> [<options>]
         log_info "Building Leptonica ..."
         cmake --build ${leptonica_build_dir} --config Release
 
-        log_info "Installing Leptonica ..."
+        log_info "Installing Leptonica..."
         # Workaround for "unknown file attribute: H" errors when running install
         cmake --install ${leptonica_build_dir} --prefix "${advss_dep_path}" --config Release || :
         popd
 
         local tesseract_dir="${project_root}/deps/tesseract"
-        local tesseract_build_dir_x86_64="${tesseract_dir}/build_x86_64"
+        local tesseract_build_dir="${tesseract_dir}/build_${target##*-}"
+
+        local -a tesseract_cmake_args=(
+          -DCMAKE_BUILD_TYPE=Release
+          -DCMAKE_OSX_ARCHITECTURES=${${target##*-}//universal/x86_64;arm64}
+          -DCMAKE_OSX_DEPLOYMENT_TARGET=${DEPLOYMENT_TARGET:-10.15}
+          -DSW_BUILD=OFF
+          -DBUILD_TRAINING_TOOLS=OFF
+          -DCMAKE_PREFIX_PATH="${advss_dep_path};${_plugin_deps}"
+          -DCMAKE_INSTALL_PREFIX="${advss_dep_path}"
+        )
+
+        if [ "${target}" != "macos-x86_64" ]; then
+          tesseract_cmake_args+=(
+            -DCMAKE_SYSTEM_PROCESSOR=aarch64
+            -DHAVE_AVX=FALSE
+            -DHAVE_AVX2=FALSE
+            -DHAVE_AVX512F=FALSE
+            -DHAVE_FMA=FALSE
+            -DHAVE_SSE4_1=FALSE
+            -DHAVE_NEON=TRUE
+          )
+          sed -i'.original' 's/HAVE_NEON FALSE/HAVE_NEON TRUE/g' "${tesseract_dir}/CMakeLists.txt"
+        fi
 
         pushd ${tesseract_dir}
-        log_info "Configure Tesseract (x86_64) ..."
+        log_info "Configure Tesseract ..."
+        cmake -S . -B ${tesseract_build_dir} ${tesseract_cmake_args}
 
-        local -a tesseract_cmake_args=(
-          -DCMAKE_BUILD_TYPE=Release
-          -DCMAKE_SYSTEM_NAME="Darwin"
-          -DCMAKE_OSX_ARCHITECTURES=x86_64
-          -DCMAKE_SYSTEM_PROCESSOR=x86_64
-          -DCMAKE_OSX_DEPLOYMENT_TARGET=${DEPLOYMENT_TARGET:-10.15}
-          -DSW_BUILD=OFF
-          -DBUILD_TRAINING_TOOLS=OFF
-          -DCMAKE_PREFIX_PATH="${advss_dep_path};${_plugin_deps}"
-          -DCMAKE_INSTALL_PREFIX="${advss_dep_path}"
-        )
-
-        cmake -S . -B ${tesseract_build_dir_x86_64} ${tesseract_cmake_args}
-
-        log_info "Building Tesseract (x86_64) ..."
-        cmake --build ${tesseract_build_dir_x86_64} --config Release
-
-        log_info "Configure Tesseract (arm64) ..."
-
-        git checkout .
-
-        local tesseract_build_dir_arm64="${tesseract_dir}/build_arm64"
-        local -a tesseract_cmake_args=(
-          -DCMAKE_BUILD_TYPE=Release
-          -DCMAKE_SYSTEM_NAME="Darwin"
-          -DCMAKE_OSX_ARCHITECTURES=arm64
-          -DCMAKE_SYSTEM_PROCESSOR=arm64
-          -DCMAKE_OSX_DEPLOYMENT_TARGET=${DEPLOYMENT_TARGET:-10.15}
-          -DSW_BUILD=OFF
-          -DBUILD_TRAINING_TOOLS=OFF
-          -DCMAKE_PREFIX_PATH="${advss_dep_path};${_plugin_deps}"
-          -DCMAKE_INSTALL_PREFIX="${advss_dep_path}"
-        )
-
-        cmake -S . -B ${tesseract_build_dir_arm64} ${tesseract_cmake_args}
-
-        log_info "Building Tesseract (arm64) ..."
-        cmake --build ${tesseract_build_dir_arm64} --config Release
-
-        log_info "Combine arm and x86 libtesseract binaries ..."
-        mv ${tesseract_build_dir_arm64}/libtesseract.a ${tesseract_build_dir_arm64}/libtesseract_arm.a
-        lipo -create ${tesseract_build_dir_x86_64}/libtesseract.a ${tesseract_build_dir_arm64}/libtesseract_arm.a -output ${tesseract_build_dir_arm64}/libtesseract.a
+        log_info "Building Tesseract ..."
+        cmake --build ${tesseract_build_dir} --config Release
 
         log_info "Installing Tesseract..."
-        cmake --install ${tesseract_build_dir_arm64} --prefix "${advss_dep_path}" --config Release
-
+        cmake --install ${tesseract_build_dir} --prefix "${advss_dep_path}" --config Release
         popd
 
         pushd ${advss_dep_path}
         log_info "Prepare openssl ..."
         rm -rf openssl
-        git clone https://github.com/openssl/openssl.git --branch openssl-3.1.2 --depth 1
+        git clone git://git.openssl.org/openssl.git --branch openssl-3.1.2 --depth 1
         mv openssl openssl_x86
         cp -r openssl_x86 openssl_arm
 
@@ -419,73 +402,12 @@ Usage: %B${functrace[1]%:*}%b <option> [<options>]
         lipo -create openssl_x86/libcrypto.a openssl_arm/libcrypto.a -output openssl-combined/libcrypto.a
         lipo -create openssl_x86/libssl.a openssl_arm/libssl.a -output openssl-combined/libssl.a
 
-        log_info "Clean up openssl dir ..."
+        log_info "Clean up openssl dir..."
         mv openssl_x86 openssl
         rm -rf openssl_arm
-        popd
-
-        pushd ${project_root}/deps/libusb
-
-        log_info "Configure libusb x86 ..."
-        export SDKROOT=$(xcrun --sdk macosx --show-sdk-path)
-        export CC=$(xcrun --sdk macosx --find clang)
-        export CXX=$(xcrun --sdk macosx --find clang++)
-        export CFLAGS="-arch x86_64 -isysroot $SDKROOT"
-        export CXXFLAGS="-arch x86_64 -isysroot $SDKROOT"
-        export LDFLAGS="-arch x86_64 -isysroot $SDKROOT"
-        export MACOSX_DEPLOYMENT_TARGET=10.15
-
-        log_info "Building libusb x86 ..."
-        mkdir ${project_root}/deps/libusb/out_x86
-        ./autogen.sh
-        ./configure --host=x86_64-apple-darwin --prefix=${advss_dep_path}
-        make && make install
-
-        log_info "Configure libusb arm ..."
-        make clean
-        rm -r ${project_root}/deps/libusb/out_x86
-        mkdir ${project_root}/deps/libusb/out_x86
-        ./configure --host=aarch64-apple-darwin --prefix=${project_root}/deps/libusb/out_x86
-        make && make install
-
-        log_info "Building libusb arm ..."
-        make clean
-        export SDKROOT=$(xcrun --sdk macosx --show-sdk-path)
-        export CC=$(xcrun --sdk macosx --find clang)
-        export CXX=$(xcrun --sdk macosx --find clang++)
-        export CFLAGS="-arch arm64 -isysroot $SDKROOT"
-        export CXXFLAGS="-arch arm64 -isysroot $SDKROOT"
-        export LDFLAGS="-arch arm64 -isysroot $SDKROOT"
-        export MACOSX_DEPLOYMENT_TARGET=10.15
-        mkdir ${project_root}/deps/libusb/out_arm
-        ./configure --host=aarch64-apple-darwin --prefix=${project_root}/deps/libusb/out_arm
-        make && make install
-
-        log_info "Combine arm and x86 libusb binaries ..."
-        lipo -create ${project_root}/deps/libusb/out_x86/lib/libusb-1.0.0.dylib \
-          ${project_root}/deps/libusb/out_arm/lib/libusb-1.0.0.dylib \
-          -output ${advss_dep_path}/lib/temp-libusb-1.0.0.dylib
-        mv ${advss_dep_path}/lib/temp-libusb-1.0.0.dylib ${advss_dep_path}/lib/libusb-1.0.0.dylib
-        install_name_tool -id @rpath/libusb-1.0.0.dylib ${advss_dep_path}/lib/libusb-1.0.0.dylib
-        log_info "Clean up libusb ..."
-
-        unset SDKROOT
-        unset CC
-        unset CXX
-        unset CFLAGS
-        unset CXXFLAGS
-        unset LDFLAGS
-        unset MACOSX_DEPLOYMENT_TARGET
-
-        popd
       ;;
     linux)
-      # Hacky workaround to support libproc2 with Ubuntu 22 build environment
-      local lsb_version=$(lsb_release -r | cut -f 2 || true)
-      if [[ "${lsb_version}" == '22.04' ]] {
-        sudo apt install ${project_root}/build-aux/CI/linux/ubuntu22/libproc2-0_4.0.2-3_amd64.deb
-        sudo apt install ${project_root}/build-aux/CI/linux/ubuntu22/libproc2-dev_4.0.2-3_amd64.deb
-      }
+      # Nothing to do for now
       ;;
   }
 }

.github/scripts/Build-Deps-Windows.ps1

@@ -199,26 +199,6 @@ function Build {
 
     Log-Information "Install tesseract..."
     Invoke-External cmake --install "${TesseractBuildPath}" --prefix "${ADVSSDepPath}" @TesseractCmakeArgs
-
-    Push-Location -Stack BuildLibusbTemp
-    Ensure-Location $ProjectRoot
-
-    $LibusbPath = "${ProjectRoot}/deps/libusb"
-
-    Log-Information "Building libusb..."
-    $msbuildExe = vswhere -latest -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe | select-object -first 1
-
-    if ($msbuildExe) {
-        Invoke-External $msbuildExe "${LibusbPath}/msvc/libusb.sln" /property:Configuration=Release /property:Platform=x64
-
-        $libusbBuildResultDirectory = "${LibusbPath}/build/v143/x64/Release"
-        if (-not (Test-Path -Path $libusbBuildResultDirectory)) {
-            $libusbBuildResultDirectory = "${LibusbPath}/x64/Release/dll"
-        }
-        Copy-Item -Path "${libusbBuildResultDirectory}/*" -Destination ${ADVSSDepPath} -Recurse -Force
-    } else {
-        Log-Information "Failed to locate msbuild.exe - skipping libusb build"
-    }
 }
 
 Build

.github/workflows/build-debian.yml

@@ -50,7 +50,7 @@ jobs:
           mv ../*.deb .
       - name: Publish
         if: success()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2.2.1
         with:
           name: "obs-scene-switcher.deb"
           path: ${{ github.workspace }}/*.deb

.github/workflows/build-project.yaml

@@ -75,7 +75,7 @@ jobs:
 
   macos-build:
     name: Build for macOS 🍏
-    runs-on: macos-14
+    runs-on: macos-13
     needs: check-event
     defaults:
       run:
@@ -107,8 +107,8 @@ jobs:
           print "pluginName=${product_name}" >> $GITHUB_OUTPUT
           print "pluginVersion=${git_tag}" >> $GITHUB_OUTPUT
 
-          print '::group::Enable Xcode 15.2'
-          sudo xcode-select --switch /Applications/Xcode_15.2.app/Contents/Developer
+          print '::group::Select Xcode version'
+          sudo xcode-select --switch /Applications/Xcode_14.3.1.app
           print '::endgroup::'
 
       - uses: actions/cache@v4

.gitignore

@@ -7,7 +7,6 @@
 !/cmake
 !/data
 !/deps
-!/scripting
 !/forms
 !/lib
 !/module
@@ -35,7 +34,4 @@
 .DS_Store
 
 # Exclude CMake build number cache
-/cmake/.CMakeBuildNumber
-
-# Exclude python caches
-/**/__pycache__
+/cmake/.CMakeBuildNumber

.gitmodules

@@ -25,6 +25,3 @@
 [submodule "deps/json"]
 	path = deps/json
 	url = https://github.com/nlohmann/json.git
-[submodule "deps/libusb"]
-	path = deps/libusb
-	url = https://github.com/libusb/libusb.git

CMakeLists.txt

@@ -52,6 +52,8 @@ target_sources(
   ${LIB_NAME}
   PRIVATE lib/legacy/scene-group.cpp
           lib/legacy/scene-group.hpp
+          lib/legacy/scene-trigger.cpp
+          lib/legacy/scene-trigger.hpp
           lib/legacy/switch-audio.cpp
           lib/legacy/switch-audio.hpp
           lib/legacy/switch-executable.cpp
@@ -64,6 +66,8 @@ target_sources(
           lib/legacy/switch-idle.hpp
           lib/legacy/switch-media.cpp
           lib/legacy/switch-media.hpp
+          lib/legacy/switch-network.cpp
+          lib/legacy/switch-network.hpp
           lib/legacy/switch-pause.cpp
           lib/legacy/switch-pause.hpp
           lib/legacy/switch-random.cpp
@@ -92,8 +96,6 @@ target_sources(
           lib/macro/macro-action-macro.hpp
           lib/macro/macro-action-queue.cpp
           lib/macro/macro-action-queue.hpp
-          lib/macro/macro-action-script.cpp
-          lib/macro/macro-action-script.hpp
           lib/macro/macro-action-variable.cpp
           lib/macro/macro-action-variable.hpp
           lib/macro/macro-action.cpp
@@ -106,8 +108,6 @@ target_sources(
           lib/macro/macro-condition-macro.hpp
           lib/macro/macro-condition-queue.cpp
           lib/macro/macro-condition-queue.hpp
-          lib/macro/macro-condition-script.cpp
-          lib/macro/macro-condition-script.hpp
           lib/macro/macro-condition-tempvar.cpp
           lib/macro/macro-condition-tempvar.hpp
           lib/macro/macro-condition-variable.cpp
@@ -120,30 +120,22 @@ target_sources(
           lib/macro/macro-export-import-dialog.hpp
           lib/macro/macro-helpers.cpp
           lib/macro/macro-helpers.hpp
-          lib/macro/macro-input.cpp
-          lib/macro/macro-input.hpp
           lib/macro/macro-list.cpp
           lib/macro/macro-list.hpp
+          lib/macro/macro-properties.cpp
+          lib/macro/macro-properties.hpp
           lib/macro/macro-ref.cpp
           lib/macro/macro-ref.hpp
           lib/macro/macro-run-button.cpp
           lib/macro/macro-run-button.hpp
-          lib/macro/macro-script-handler.cpp
-          lib/macro/macro-script-handler.hpp
-          lib/macro/macro-segment-copy-paste.cpp
-          lib/macro/macro-segment-copy-paste.hpp
           lib/macro/macro-segment-list.cpp
           lib/macro/macro-segment-list.hpp
-          lib/macro/macro-segment-script.cpp
-          lib/macro/macro-segment-script.hpp
           lib/macro/macro-segment-selection.cpp
           lib/macro/macro-segment-selection.hpp
           lib/macro/macro-segment.cpp
           lib/macro/macro-segment.hpp
           lib/macro/macro-selection.cpp
           lib/macro/macro-selection.hpp
-          lib/macro/macro-settings.cpp
-          lib/macro/macro-settings.hpp
           lib/macro/macro-tab.cpp
           lib/macro/macro-tree.cpp
           lib/macro/macro-tree.hpp
@@ -159,18 +151,12 @@ target_sources(
           lib/queue/action-queue-tab.hpp
           lib/utils/backup.cpp
           lib/utils/backup.hpp
-          lib/utils/condition-logic.cpp
-          lib/utils/condition-logic.hpp
           lib/utils/curl-helper.cpp
           lib/utils/curl-helper.hpp
-          lib/utils/cursor-shape-changer.cpp
-          lib/utils/cursor-shape-changer.hpp
           lib/utils/double-slider.cpp
           lib/utils/double-slider.hpp
           lib/utils/duration-control.cpp
           lib/utils/duration-control.hpp
-          lib/utils/duration-modifier.cpp
-          lib/utils/duration-modifier.hpp
           lib/utils/duration.cpp
           lib/utils/duration.hpp
           lib/utils/export-symbol-helper.hpp
@@ -178,16 +164,10 @@ target_sources(
           lib/utils/file-selection.hpp
           lib/utils/filter-combo-box.cpp
           lib/utils/filter-combo-box.hpp
-          lib/utils/help-icon.hpp
-          lib/utils/help-icon.cpp
           lib/utils/item-selection-helpers.cpp
           lib/utils/item-selection-helpers.hpp
           lib/utils/layout-helpers.cpp
           lib/utils/layout-helpers.hpp
-          lib/utils/list-controls.cpp
-          lib/utils/list-controls.hpp
-          lib/utils/list-editor.cpp
-          lib/utils/list-editor.hpp
           lib/utils/log-helper.cpp
           lib/utils/log-helper.hpp
           lib/utils/math-helpers.cpp
@@ -200,6 +180,7 @@ target_sources(
           lib/utils/name-dialog.hpp
           lib/utils/non-modal-dialog.cpp
           lib/utils/non-modal-dialog.hpp
+          lib/utils/obs-dock.hpp
           lib/utils/obs-module-helper.cpp
           lib/utils/obs-module-helper.hpp
           lib/utils/path-helpers.cpp
@@ -208,9 +189,6 @@ target_sources(
           lib/utils/plugin-state-helpers.hpp
           lib/utils/priority-helper.cpp
           lib/utils/priority-helper.hpp
-          lib/utils/properties-view.cpp
-          lib/utils/properties-view.hpp
-          lib/utils/properties-view.moc.hpp
           lib/utils/regex-config.cpp
           lib/utils/regex-config.hpp
           lib/utils/resizing-text-edit.cpp
@@ -241,8 +219,6 @@ target_sources(
           lib/utils/splitter-helpers.hpp
           lib/utils/status-control.cpp
           lib/utils/status-control.hpp
-          lib/utils/string-list.cpp
-          lib/utils/string-list.hpp
           lib/utils/switch-button.cpp
           lib/utils/switch-button.hpp
           lib/utils/sync-helpers.cpp
@@ -251,16 +227,12 @@ target_sources(
           lib/utils/tab-helpers.hpp
           lib/utils/temp-variable.cpp
           lib/utils/temp-variable.hpp
-          lib/utils/time-helpers.cpp
-          lib/utils/time-helpers.hpp
           lib/utils/ui-helpers.cpp
           lib/utils/ui-helpers.hpp
           lib/utils/utility.cpp
           lib/utils/utility.hpp
           lib/utils/volume-control.cpp
           lib/utils/volume-control.hpp
-          lib/utils/websocket-api.cpp
-          lib/utils/websocket-api.hpp
           lib/variables/variable-line-edit.cpp
           lib/variables/variable-line-edit.hpp
           lib/variables/variable-number.hpp
@@ -278,11 +250,6 @@ target_sources(
 
 # --- End of section ---
 
-# Subfolder for advanced scene switcher plugins
-set(ADVSS_PLUGIN_FOLDER "advanced-scene-switcher-plugins")
-target_compile_definitions(
-  ${LIB_NAME} PRIVATE ADVSS_PLUGIN_FOLDER=\"${ADVSS_PLUGIN_FOLDER}\")
-
 include(cmake/common/advss_helpers.cmake)
 setup_obs_lib_dependency(${LIB_NAME})
 setup_obs_lib_dependency(${PROJECT_NAME})
@@ -326,9 +293,13 @@ set_target_properties(${LIB_NAME} PROPERTIES CXX_VISIBILITY_PRESET hidden)
 target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_17)
 target_compile_features(${LIB_NAME} PUBLIC cxx_std_17)
 
+add_definitions(-DASIO_STANDALONE)
 target_include_directories(
-  ${LIB_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/deps/obs-websocket/lib"
-                     "${CMAKE_CURRENT_SOURCE_DIR}/deps/exprtk")
+  ${LIB_NAME}
+  PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/deps/asio/asio/include"
+         "${CMAKE_CURRENT_SOURCE_DIR}/deps/websocketpp"
+         "${CMAKE_CURRENT_SOURCE_DIR}/deps/obs-websocket/lib"
+         "${CMAKE_CURRENT_SOURCE_DIR}/deps/exprtk")
 
 if(NOT nlohmann_json_DIR
    AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/deps/json/CMakeLists.txt")
@@ -364,9 +335,6 @@ if(OS_WINDOWS)
   if(MSVC)
     target_compile_options(${LIB_NAME} PUBLIC /MP /d2FH4- /wd4267 /wd4267
                                               /bigobj)
-
-    # Workaround for MSVC incompatibility in CI environment
-    add_compile_definitions(${target_name} _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
   endif()
   target_sources(${LIB_NAME} PRIVATE lib/win/advanced-scene-switcher-win.cpp)
   add_definitions(-D_WEBSOCKETPP_CPP11_STL_)
@@ -424,7 +392,8 @@ if(NOT OS_WINDOWS)
   target_compile_options(
     ${LIB_NAME}
     PUBLIC -Wno-error=unused-parameter -Wno-error=conversion -Wno-error=shadow
-           -Wno-error=float-conversion -Wno-error=enum-conversion)
+           -Wno-error=float-conversion -Wno-error=enum-conversion
+           -Wno-error=deprecated-declarations)
 endif()
 
 # --- End of section ---

README.md

@@ -22,6 +22,5 @@ sudo snap install obs-studio
 ## Contributing
 
 - If you wish to contribute code to the project, have a look at this [section](BUILDING.md) describing how to compile the plugin.
-- You can add custom conditions and actions at runtime using the API described [here](https://github.com/WarmUpTill/SceneSwitcher/wiki/Scripting).
 - You can optionally use [pre-commit](https://pre-commit.com) to automatically handle formatting.
 - If you wish to contribute translations, feel free to submit pull requests for the corresponding files under `data/locale`.

build-aux/CI/check-locale.py

@@ -6,27 +6,17 @@ import re
 import sys
 
 defaultLocaleFile = "en-US.ini"
-commentChars = ";#"
 
 
 class localeEntry:
     locale = ""
     widgetPlaceholders = []
     qStringArgs = []
-    lineNum = -1
 
-    def __init__(self, locale, widgetPlaceholders, qStringArgs, lineNum) -> None:
+    def __init__(self, locale, widgetPlaceholders, qStringArgs) -> None:
         self.locale = locale
         self.widgetPlaceholders = widgetPlaceholders
         self.qStringArgs = qStringArgs
-        self.lineNum = lineNum
-
-
-def isCommentLine(line):
-    for char in commentChars:
-        if line.startswith(char):
-            return True
-    return False
 
 
 def getNonDefaultLocales(dir):
@@ -42,11 +32,11 @@ def getNonDefaultLocales(dir):
 def getAllLocaleEntries(file):
     localeEntries = []
     with open(file, "r", encoding="UTF-8") as f:
-        for lineNum, line in enumerate(f):
+        for line in f.readlines():
             widgetPlaceholders = []
             qStringArgs = []
 
-            if isCommentLine(line):
+            if line.startswith(";"):
                 continue
 
             for word in line.split("{{"):
@@ -59,9 +49,7 @@ def getAllLocaleEntries(file):
                 qStringArgs.append(match.group(0))
 
             localeEntries.append(
-                localeEntry(
-                    line.split("=")[0], widgetPlaceholders, qStringArgs, lineNum + 1
-                )
+                localeEntry(line.split("=")[0], widgetPlaceholders, qStringArgs)
             )
 
     return localeEntries
@@ -85,8 +73,8 @@ def checkLocaleEntries(file, expectedLocaleEntries):
         if expectedLocaleEntry is None:
             result = False
             print(
-                'ERROR: Locale entry "{}" from "{}:{}" not found in "{}"'.format(
-                    localeEntry.locale, file, localeEntry.lineNum, defaultLocaleFile
+                'ERROR: Locale entry "{}" from "{}" not found in "{}"'.format(
+                    localeEntry.locale, file, defaultLocaleFile
                 )
             )
             continue
@@ -95,13 +83,8 @@ def checkLocaleEntries(file, expectedLocaleEntries):
             if placeholder not in expectedLocaleEntry.widgetPlaceholders:
                 result = False
                 print(
-                    'ERROR: Locale entry "{}" from "{}:{}" does contain "{}" widget placeholder while "{}:{}" does not'.format(
-                        localeEntry.locale,
-                        file,
-                        localeEntry.lineNum,
-                        placeholder,
-                        defaultLocaleFile,
-                        expectedLocaleEntry.lineNum,
+                    'ERROR: Locale entry "{}" from "{}" does contain "{}" widget placeholder while "{}" does not'.format(
+                        localeEntry.locale, file, placeholder, defaultLocaleFile
                     )
                 )
 
@@ -109,8 +92,8 @@ def checkLocaleEntries(file, expectedLocaleEntries):
             if placeholder not in localeEntry.widgetPlaceholders:
                 result = False
                 print(
-                    'ERROR: Locale entry "{}" from "{}:{}" does not contain "{}" widget placeholder'.format(
-                        localeEntry.locale, file, localeEntry.lineNum, placeholder
+                    'ERROR: Locale entry "{}" from "{}" does not contain "{}" widget placeholder'.format(
+                        localeEntry.locale, file, placeholder
                     )
                 )
 
@@ -118,13 +101,8 @@ def checkLocaleEntries(file, expectedLocaleEntries):
             if arg not in expectedLocaleEntry.qStringArgs:
                 result = False
                 print(
-                    'ERROR: Locale entry "{}" from "{}:{}" does contain "{}" QString arg while "{}:{}" does not'.format(
-                        localeEntry.locale,
-                        file,
-                        localeEntry.lineNum,
-                        arg,
-                        defaultLocaleFile,
-                        expectedLocaleEntry.lineNum,
+                    'ERROR: Locale entry "{}" from "{}" does contain "{}" QString arg while "{}" does not'.format(
+                        localeEntry.locale, file, arg, defaultLocaleFile
                     )
                 )
 
@@ -132,8 +110,8 @@ def checkLocaleEntries(file, expectedLocaleEntries):
             if arg not in localeEntry.qStringArgs:
                 result = False
                 print(
-                    'ERROR: Locale entry "{}" from "{}:{}" does not contain "{}" QString arg'.format(
-                        localeEntry.locale, file, localeEntry.lineNum, arg
+                    'ERROR: Locale entry "{}" from "{}" does not contain "{}" QString arg'.format(
+                        localeEntry.locale, file, arg
                     )
                 )
 

buildspec.json

@@ -1,33 +1,33 @@
 {
     "dependencies": {
         "obs-studio": {
-            "version": "30.1.2",
+            "version": "29.1.2",
             "baseUrl": "https://github.com/obsproject/obs-studio/archive/refs/tags",
             "label": "OBS sources",
             "hashes": {
-                "macos": "490bae1c392b3b344b0270afd8cb887da4bc50bd92c0c426e96713c1ccb9701a",
-                "windows-x64": "c2dd03fa7fd01fad5beafce8f7156da11f9ed9a588373fd40b44a06f4c03b867"
+                "macos": "215f1fa5772c5dd9f3d6e35b0cb573912b00320149666a77864f9d305525504b",
+                "windows-x64": "46d451f3f42b9d2c59339ec268165849c7b7904cdf1cc2a8d44c015815a9e37d"
             }
         },
         "prebuilt": {
-            "version": "2024-03-19",
+            "version": "2023-04-12",
             "baseUrl": "https://github.com/obsproject/obs-deps/releases/download",
             "label": "Pre-Built obs-deps",
             "hashes": {
-                "macos": "2e9bfb55a5e0e4c1086fa1fda4cf268debfead473089df2aaea80e1c7a3ca7ff",
-                "windows-x64": "6e86068371526a967e805f6f9903f9407adb683c21820db5f07da8f30d11e998"
+                "macos": "9535c6e1ad96f7d49960251e85a245774088d48da1d602bb82f734b10219125a",
+                "windows-x64": "c13a14a1acc4224b21304d97b63da4121de1ed6981297e50496fbc474abc0503"
             }
         },
         "qt6": {
-            "version": "2024-03-19",
+            "version": "2023-04-12",
             "baseUrl": "https://github.com/obsproject/obs-deps/releases/download",
             "label": "Pre-Built Qt6",
             "hashes": {
-                "macos": "694f1e639c017e3b1f456f735330dc5afae287cbea85757101af1368de3142c8",
-                "windows-x64": "72d1df34a0ef7413a681d5fcc88cae81da60adc03dcd23ef17862ab170bcc0dd"
+                "macos": "eb7614544ab4f3d2c6052c797635602280ca5b028a6b987523d8484222ce45d1",
+                "windows-x64": "4d39364b8a8dee5aa24fcebd8440d5c22bb4551c6b440ffeacce7d61f2ed1add"
             },
             "debugSymbols": {
-                "windows-x64": "fbddd1f659c360f2291911ac5709b67b6f8182e6bca519d24712e4f6fd3cc865"
+                "windows-x64": "f34ee5067be19ed370268b15c53684b7b8aaa867dc800b68931df905d679e31f"
             }
         }
     },

cmake/common/advss_helpers.cmake

@@ -8,11 +8,14 @@ if(BUILD_OUT_OF_TREE)
   endif()
 endif()
 
+# Subfolder for advanced scene switcher plugins
+set(_PLUGIN_FOLDER "adv-ss-plugins")
+
 # --- MACOS section ---
 if(OS_MACOS)
   set(ADVSS_BUNDLE_DIR "advanced-scene-switcher.plugin")
   set(ADVSS_BUNDLE_MODULE_DIR "${ADVSS_BUNDLE_DIR}/Contents/MacOS")
-  set(ADVSS_BUNDLE_PLUGIN_DIR ${ADVSS_BUNDLE_MODULE_DIR}/${ADVSS_PLUGIN_FOLDER})
+  set(ADVSS_BUNDLE_PLUGIN_DIR ${ADVSS_BUNDLE_MODULE_DIR}/${_PLUGIN_FOLDER})
 
   function(install_advss_lib_helper target where)
     install(
@@ -57,36 +60,10 @@ if(OS_MACOS)
       ${dep}_Development)
   endfunction()
 
-  function(install_advss_plugin_dependency_file target dep)
-    get_filename_component(_FILENAME ${dep} NAME)
-    string(REGEX REPLACE "\\.[^.]*$" "" _FILENAMENOEXT ${_FILENAME})
-    set(_DEP_NAME "${target}-${_FILENAMENOEXT}")
-
-    install(
-      FILES "${dep}"
-      DESTINATION "${ADVSS_BUNDLE_PLUGIN_DIR}"
-      COMPONENT ${_DEP_NAME}_Runtime
-      DESTINATION "${ADVSS_BUNDLE_PLUGIN_DIR}"
-      COMPONENT ${_DEP_NAME}_Runtime
-      NAMELINK_COMPONENT ${_DEP_NAME}_Development)
-
-    install(
-      FILES "${dep}"
-      DESTINATION "${ADVSS_BUNDLE_PLUGIN_DIR}"
-      COMPONENT obs_${_DEP_NAME}
-      EXCLUDE_FROM_ALL
-      DESTINATION "${ADVSS_BUNDLE_PLUGIN_DIR}"
-      COMPONENT obs_${_DEP_NAME}
-      EXCLUDE_FROM_ALL)
-
-    add_custom_command(
-      TARGET ${target}
-      POST_BUILD
-      COMMAND
-        "${CMAKE_COMMAND}" --install ${CMAKE_CURRENT_BINARY_DIR} --config
-        $<CONFIG> --prefix ${CMAKE_INSTALL_PREFIX} --component obs_${_DEP_NAME}
-      COMMENT "Installing ${_DEP_NAME} to OBS rundir\n"
-      VERBATIM)
+  function(install_advss_plugin_dependency_file ${target} dep)
+    target_sources(advanced-scene-switcher PRIVATE ${dep})
+    set_source_files_properties(${dep} PROPERTIES MACOSX_PACKAGE_LOCATION
+                                                  ${ADVSS_BUNDLE_PLUGIN_DIR})
   endfunction()
 
   # --- End of section ---
@@ -151,8 +128,8 @@ else()
 
   function(install_advss_plugin target)
     plugin_install_helper(
-      "${target}" "${OBS_PLUGIN_DESTINATION}/${ADVSS_PLUGIN_FOLDER}"
-      "${ADVSS_PLUGIN_FOLDER}")
+      "${target}" "${OBS_PLUGIN_DESTINATION}/${_PLUGIN_FOLDER}"
+      "${_PLUGIN_FOLDER}")
     if(NOT OS_WINDOWS)
       set_target_properties(${target} PROPERTIES INSTALL_RPATH
                                                  "$ORIGIN:$ORIGIN/..")
@@ -166,12 +143,12 @@ else()
       ${dep}
       RUNTIME
       DESTINATION
-      "${OBS_PLUGIN_DESTINATION}/${ADVSS_PLUGIN_FOLDER}"
+      "${OBS_PLUGIN_DESTINATION}/${_PLUGIN_FOLDER}"
       COMPONENT
       ${dep}_Runtime
       LIBRARY
       DESTINATION
-      "${OBS_PLUGIN_DESTINATION}/${ADVSS_PLUGIN_FOLDER}"
+      "${OBS_PLUGIN_DESTINATION}/${_PLUGIN_FOLDER}"
       COMPONENT
       ${dep}_Runtime
       NAMELINK_COMPONENT
@@ -182,13 +159,13 @@ else()
       ${dep}
       RUNTIME
       DESTINATION
-      "${OBS_PLUGIN_DESTINATION}/${ADVSS_PLUGIN_FOLDER}"
+      "${OBS_PLUGIN_DESTINATION}/${_PLUGIN_FOLDER}"
       COMPONENT
       obs_${dep}
       EXCLUDE_FROM_ALL
       LIBRARY
       DESTINATION
-      "${OBS_PLUGIN_DESTINATION}/${ADVSS_PLUGIN_FOLDER}"
+      "${OBS_PLUGIN_DESTINATION}/${_PLUGIN_FOLDER}"
       COMPONENT
       obs_${dep}
       EXCLUDE_FROM_ALL)
@@ -211,18 +188,18 @@ else()
 
     install(
       FILES "${dep}"
-      DESTINATION "${OBS_PLUGIN_DESTINATION}/${ADVSS_PLUGIN_FOLDER}"
+      DESTINATION "${OBS_PLUGIN_DESTINATION}/${_PLUGIN_FOLDER}"
       COMPONENT ${_DEP_NAME}_Runtime
-      DESTINATION "${OBS_PLUGIN_DESTINATION}/${ADVSS_PLUGIN_FOLDER}"
+      DESTINATION "${OBS_PLUGIN_DESTINATION}/${_PLUGIN_FOLDER}"
       COMPONENT ${_DEP_NAME}_Runtime
       NAMELINK_COMPONENT ${_DEP_NAME}_Development)
 
     install(
       FILES "${dep}"
-      DESTINATION "${OBS_PLUGIN_DESTINATION}/${ADVSS_PLUGIN_FOLDER}"
+      DESTINATION "${OBS_PLUGIN_DESTINATION}/${_PLUGIN_FOLDER}"
       COMPONENT obs_${_DEP_NAME}
       EXCLUDE_FROM_ALL
-      DESTINATION "${OBS_PLUGIN_DESTINATION}/${ADVSS_PLUGIN_FOLDER}"
+      DESTINATION "${OBS_PLUGIN_DESTINATION}/${_PLUGIN_FOLDER}"
       COMPONENT obs_${_DEP_NAME}
       EXCLUDE_FROM_ALL)
 
@@ -332,6 +309,7 @@ function(install_advss_plugin_dependency)
   if(NOT PARSED_ARGS_TARGET)
     message(FATAL_ERROR "You must provide a target")
   endif()
+  set(_PLUGIN_FOLDER "adv-ss-plugins")
   foreach(_DEPENDENCY ${PARSED_ARGS_DEPENDENCIES})
     if(EXISTS ${_DEPENDENCY})
       install_advss_plugin_dependency_file(${PARSED_ARGS_TARGET} ${_DEPENDENCY})

data/locale/de-DE.ini

@@ -19,11 +19,11 @@ AdvSceneSwitcher.generalTab.status.autoStart.streaming="Streamen"
 AdvSceneSwitcher.generalTab.status.autoStart.recordingAndStreaming="Aufnehmen oder Streamen"
 AdvSceneSwitcher.generalTab.status.checkInterval="Teste Bedingungen alle"
 AdvSceneSwitcher.generalTab.generalBehavior="Allgemeines Verhalten"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch="Wenn keine Bedingung erfüllt ist für "
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatchDelay.tooltip="Kann nur so genau sein wie das eingestellte Interval zum Testen der Bedingungen."
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.dontSwitch="Nicht wechseln"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchToRandom="Wechsle zu einer Szene auf dem Zufall-Tab"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchTo="Wechsle zu:"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet="Wenn keine Bedingung erfüllt ist für "
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMetDelayTooltip="Kann nur so genau sein wie das eingestellte Interval zum Testen der Bedingungen."
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.dontSwitch="Nicht wechseln"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.switchToRandom="Wechsle zu einer Szene auf dem Zufall-Tab"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.switchTo="Wechsle zu:"
 AdvSceneSwitcher.generalTab.generalBehavior.cooldown="Nach Ausführen von Aktionen überspringe das Ausführen von Aktionen für"
 AdvSceneSwitcher.generalTab.generalBehavior.cooldownHint="In diesem Zeitraum werden potentielle erfüllte Bedingungen ignoriert!"
 AdvSceneSwitcher.generalTab.generalBehavior.verboseLogging="Ausführliches Logging"
@@ -94,7 +94,7 @@ AdvSceneSwitcher.macroTab.highlightExecutedMacros="Kürzlich ausgeführte Makros
 AdvSceneSwitcher.macroTab.highlightTrueConditions="Bedingungen des aktuell ausgewählten Makros hervorheben, die kürzlich als wahr bewertet wurden"
 AdvSceneSwitcher.macroTab.highlightPerformedActions="Zuletzt ausgeführte Aktionen des aktuell ausgewählten Makros hervorheben"
 AdvSceneSwitcher.macroTab.newMacroRegisterHotkey="Hotkeys zur Steuerung des Pausen-Status neuer Makros registrieren"
-AdvSceneSwitcher.macroTab.currentRegisterHotkeys="Hotkeys zur Steuerung des Pausen-Status ausgewählter Makros registrieren"
+AdvSceneSwitcher.macroTab.currentDisableHotkeys="Hotkeys zur Steuerung des Pausen-Status ausgewählter Makros registrieren"
 
 ; Macro List
 AdvSceneSwitcher.macroList.deleted="gelöscht"
@@ -142,6 +142,8 @@ AdvSceneSwitcher.condition.scene.type.currentPattern="Aktuelle Szene entspricht"
 AdvSceneSwitcher.condition.scene.type.previousPattern="Vorherige Szene entspricht"
 AdvSceneSwitcher.condition.scene.currentSceneTransitionBehaviour="Während des Übergangs die Ziel-Szene überprüfen"
 AdvSceneSwitcher.condition.scene.previousSceneTransitionBehaviour="Während des Übergangs die Quell-Szene überprüfen"
+AdvSceneSwitcher.condition.scene.entry.line1="{{sceneType}}{{scenes}}{{pattern}}"
+AdvSceneSwitcher.condition.scene.entry.line2="{{useTransitionTargetScene}}"
 AdvSceneSwitcher.condition.window="Fenster"
 AdvSceneSwitcher.condition.file="Datei"
 AdvSceneSwitcher.condition.file.type.match="entspricht"
@@ -157,7 +159,7 @@ AdvSceneSwitcher.condition.media.source="Quelle"
 AdvSceneSwitcher.condition.media.anyOnScene="Beliebige Medienquelle in"
 AdvSceneSwitcher.condition.media.allOnScene="Alle Medienquellen in"
 AdvSceneSwitcher.condition.media.inconsistencyInfo="Leider verhalten sich nicht alle Medien-Quell-Typen gleich (z.B. Medien-Quelle vs. VLC-Video-Quelle \"Gestoppt\"-Status).\nBitte experimentieren, was in eurem Setup funktioniert!"
-AdvSceneSwitcher.condition.media.layout.legacy="{{sourceTypes}}{{mediaSources}}{{scenes}}{{checkTypes}}Status ist{{states}}und{{timeRestrictions}}{{time}}"
+AdvSceneSwitcher.condition.media.entry="{{sourceTypes}}{{mediaSources}}{{scenes}}Status ist{{states}}und{{timeRestrictions}}{{time}}"
 AdvSceneSwitcher.condition.video="Video"
 AdvSceneSwitcher.condition.video.condition.match="entspricht genau"
 AdvSceneSwitcher.condition.video.condition.differ="stimmt nicht überein"
@@ -319,8 +321,11 @@ AdvSceneSwitcher.condition.date.entry.nextMatchDate="Nächster Treffer bei: %1"
 AdvSceneSwitcher.condition.date.entry.updateOnRepeat="{{updateOnRepeat}} Bei Wiederholung ausgewähltes Datum auf Wiederholungsdatum aktualisieren"
 AdvSceneSwitcher.condition.sceneTransform="Szenenelement transformieren"
 AdvSceneSwitcher.condition.sceneTransform.getTransform="Transformation erhalten"
-AdvSceneSwitcher.condition.sceneTransform.condition.match="entspricht Transformation"
-AdvSceneSwitcher.condition.sceneTransform.condition.changed="hat sich geändert"
+AdvSceneSwitcher.condition.sceneTransform.entry.line1="Auf{{scenes}}{{sources}}{{types}}"
+AdvSceneSwitcher.condition.sceneTransform.entry.type.matches="entspricht Transformation"
+AdvSceneSwitcher.condition.sceneTransform.entry.type.changed="hat sich geändert"
+AdvSceneSwitcher.condition.sceneTransform.entry.line2="{{settings}}"
+AdvSceneSwitcher.condition.sceneTransform.entry.line3="{{regex}} {{getSettings}}"
 AdvSceneSwitcher.condition.transition="Übergang"
 AdvSceneSwitcher.condition.transition.type.current="Aktueller Übergangstyp ist"
 AdvSceneSwitcher.condition.transition.type.duration="Aktuelle Übergangsdauer beträgt"
@@ -422,6 +427,7 @@ AdvSceneSwitcher.action.replay.saveWarn="Warnung: Ein zu häufiges Speichern kan
 AdvSceneSwitcher.action.replay.type.stop="Replay Buffer stoppen"
 AdvSceneSwitcher.action.replay.type.start="Replay Buffer starten"
 AdvSceneSwitcher.action.replay.type.save="Replay Buffer speichern"
+AdvSceneSwitcher.action.replay.entry="{{actions}}"
 AdvSceneSwitcher.action.streaming="Stream"
 AdvSceneSwitcher.action.streaming.type.stop="Stream stoppen"
 AdvSceneSwitcher.action.streaming.type.start="Stream starten"
@@ -463,6 +469,7 @@ AdvSceneSwitcher.action.macro.type.unpause="Nicht mehr pausieren"
 AdvSceneSwitcher.action.macro.type.resetCounter="Zähler zurücksetzen"
 AdvSceneSwitcher.action.macro.type.run="Aktionen ausführen"
 AdvSceneSwitcher.action.macro.type.stop="Aktionen stoppen"
+AdvSceneSwitcher.action.macro.entry="{{actions}}{{actionIndex}}{{macros}}"
 AdvSceneSwitcher.action.pluginState="Plugin-Status"
 AdvSceneSwitcher.action.pluginState.type.stop="Erweiterten Automatischen Szenenwechsler stoppen"
 AdvSceneSwitcher.action.pluginState.type.noMatch="Ändern des Nichtübereinstimmungsverhaltens:"
@@ -493,7 +500,7 @@ AdvSceneSwitcher.action.sceneOrder.type.movePosition="An Position verschieben"
 AdvSceneSwitcher.action.sceneOrder.entry="Auf{{scenes}}{{actions}}{{sources}}{{position}}"
 AdvSceneSwitcher.action.sceneTransform="Szenenelement transformieren"
 AdvSceneSwitcher.action.sceneTransform.getTransform="Transformation erhalten"
-AdvSceneSwitcher.action.sceneTransform.entry="Auf{{scenes}}{{action}}{{rotation}}{{sources}}{{settingSelection}}{{singleSettingValue}}"
+AdvSceneSwitcher.action.sceneTransform.entry="Auf{{scenes}}{{action}}{{rotation}}{{sources}}"
 AdvSceneSwitcher.action.file="Datei"
 AdvSceneSwitcher.action.file.type.write="Schreiben"
 AdvSceneSwitcher.action.file.type.append="Anhängen"
@@ -529,7 +536,7 @@ AdvSceneSwitcher.action.screenshot.type.source="Quelle"
 AdvSceneSwitcher.action.screenshot.type.scene="Szene"
 AdvSceneSwitcher.action.screenshot.mainOutput="OBS's Haupt-Ausgabe"
 AdvSceneSwitcher.action.screenshot.blackscreenNote="Quellen oder Szenen, die nicht immer gerendert werden, können dazu führen, dass einige Teile der Screenshots leer bleiben."
-AdvSceneSwitcher.action.screenshot.entry="Screenshot{{targetType}}{{sources}}{{scenes}}und speichere in{{saveType}}{{variables}}Pfad"
+AdvSceneSwitcher.action.screenshot.entry="Screenshot{{targetType}}{{sources}}{{scenes}}und speichere in{{saveType}}Pfad"
 AdvSceneSwitcher.action.profile="Profil"
 AdvSceneSwitcher.action.profile.entry="Aktives Profil umschalten auf {{profiles}}"
 AdvSceneSwitcher.action.sceneCollection="Szenensammlung"
@@ -728,6 +735,31 @@ AdvSceneSwitcher.videoTab.ignoreInactiveSource="außer Video Quelle ist inaktiv"
 AdvSceneSwitcher.videoTab.entry="Wenn {{videoSources}} {{condition}} {{filePath}} {{browseButton}} für {{duration}} wechsle zu {{scenes}} mit {{transitions}} {{ignoreInactiveSource}}"
 AdvSceneSwitcher.videoTab.help="<html><head/><body><p>Dieser Tab ermöglicht es basierend auf der Videoausgabe von Quellen scenen zu wechseln.<br/>Für eine noch bessere Implementierung dieser Funktionalität siehe <a href=\"https://obsproject.com/forum/resources/pixel-match-switcher.1202/\"><span style=\" text-decoration: underline; color:#268bd2;\">Pixel Match Switcher</span></a>.<br/><br/>Klicke auf das markierte Plus Symbol, um einen neuen Eintrag hinzuzufügen..</p></body></html>"
 
+; Network Tab
+AdvSceneSwitcher.networkTab.title="Netzwerk"
+AdvSceneSwitcher.networkTab.description="Über diesen Tab kann die aktive Szene einer anderen OBS-Instanz ferngesteuert werden.\nBitte beachten, dass die Szenennamen auf allen OBS-Instanzen exakt übereinstimmen müssen."
+AdvSceneSwitcher.networkTab.warning="Die Verwendung des Servers außerhalb eines lokalen Netzwerks kann dazu führen, dass die aktive Szene von dritten Personen ausgelesen werden kann."
+AdvSceneSwitcher.networkTab.server="Server starten (Sendet Szenenwechselnachrichten  zu allen verbundenen Clients)"
+AdvSceneSwitcher.networkTab.server.port="Port"
+AdvSceneSwitcher.networkTab.server.lockToIPv4="Nur IPv4 verwenden (deaktiviert IPv6)"
+AdvSceneSwitcher.networkTab.server.sendSceneChange="Sende Nachrichten für Szenenwechsel"
+AdvSceneSwitcher.networkTab.server.restrictSendToAutomatedSwitches="Sende nur Szenenwechselnachrichten für automatisierte Szenenwechsel"
+AdvSceneSwitcher.networkTab.server.sendPreview="Sende Nachrichten für Vorschau Szenenwechsel im Studio-Modus"
+AdvSceneSwitcher.networkTab.startFailed.message="Der WebSocket-Server konnte nicht gestartet werden, mögliche Gründe:\n - Der TCP-Port %1 wird möglicherweise gerade von einem anderen Programm verwendet. Versuchen Sie einen anderen Port in den Websocket-Servereinstellungen zu setzen oder alle Programme zu beenden, die den Port möglicherweise verwenden.\n - Fehler: %2"
+AdvSceneSwitcher.networkTab.server.status.currentStatus="Aktueller Status"
+AdvSceneSwitcher.networkTab.server.status.notRunning="Nicht gestartet"
+AdvSceneSwitcher.networkTab.server.status.starting="Startet"
+AdvSceneSwitcher.networkTab.server.status.running="Server läuft"
+AdvSceneSwitcher.networkTab.server.restart="Server neu starten"
+AdvSceneSwitcher.networkTab.client="Client starten (Empfängt Szenenwechselnachrichten )"
+AdvSceneSwitcher.networkTab.client.address="Hostname oder IP-Adresse"
+AdvSceneSwitcher.networkTab.client.port="Port"
+AdvSceneSwitcher.networkTab.client.status.currentStatus="Aktueller status"
+AdvSceneSwitcher.networkTab.client.status.disconnected="Verbindung getrennt"
+AdvSceneSwitcher.networkTab.client.status.connecting="Verbinde"
+AdvSceneSwitcher.networkTab.client.status.connected="Verbunden"
+AdvSceneSwitcher.networkTab.client.reconnect="Erneutes Verbinden erzwingen"
+
 ; Scene Group Tab
 AdvSceneSwitcher.sceneGroupTab.title="Szenengruppe"
 AdvSceneSwitcher.sceneGroupTab.list="Szenengruppen"
@@ -748,6 +780,30 @@ AdvSceneSwitcher.sceneGroupTab.exists="Szenengruppen- oder Szenenname existiert
 AdvSceneSwitcher.sceneGroupTab.help="Szenengruppen können, genau wie reguläre Szenen, als Ziel eines Szenenwechsler Eintrags ausgewählt werden.\n\nSzenengruppen bestehen aus einer Liste von Szenen.\nDie aktive Szene der Szenengruppe schreitet abhängig von den konfigurierten Einstellungen durch die Liste der zugewiesenen Szenen fort.\n\nMögliche Einstellungen zum Fortschreiten der aktiven Szene sind:\nAnzahl der Szenenwechsel.\nZeit seit dem letzten Szenenwechsel in der Szenengruppe.\nOder zufällig.\n\nSo kann zum Beispiel eine Szenengruppe welche die folgenden Szenen enthält ...\nSzene 1\nSzene 2\nSzene 3 \n... beim erstem Mal zu \"Szene 1\" wechseln.\nBeim zweiten Mal zu \"Szene 2\".\nDie restlichem Male wechselt die Szenengruppe zu \"Szene 3\".\n\nKlicke auf das markierte Plus Symbol, um eine neuen Szenengruppe hinzuzufügen."
 AdvSceneSwitcher.sceneGroupTab.scenes.help="Wähle die Szenengruppe, die du bearbeiten möchtest, auf der linken Seite aus.\n\nWähle oben eine Szene aus, die du zur Szenengruppe hinzufügen möchtest, und klicke das Plus Symbol.\n\nDie gleiche Szene kann mehrfach in derselben Szenengruppe auftauchen."
 
+; Scene Trigger Tab
+AdvSceneSwitcher.sceneTriggerTab.title="Szenen Trigger"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.none="--Trigger auswählen--"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneActive="aktiv ist"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneInactive="nicht aktiv ist"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneLeave="verlassen wird"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.none="--Aktion auswählen--"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startRecording="Aufnahme starten"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.pauseRecording="Aufnahme pausieren"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.unpauseRecording="Aufnahme fortsetzen"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopRecording="Aufnahme stoppen"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopStreaming="Streamen stoppen"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startStreaming="Streamen starten"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startReplayBuffer="Replay Buffer starten"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopReplayBuffer="Replay Buffer stoppen"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.muteSource="Audio Quelle stumm schalten"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.unmuteSource="Audio Quelle aktiv schalten"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startSwitcher="Szenenwechsler starten"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopSwitcher="Szenenwechsler stoppen"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startVirtualCamera="Virtuelle Kamera starten"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopVirtualCamera="Virtuelle Kamera stoppen"
+AdvSceneSwitcher.sceneTriggerTab.entry="Wenn {{scenes}} {{triggers}} {{actions}} {{audioSources}} nach {{duration}} "
+AdvSceneSwitcher.sceneTriggerTab.help="Dieser Tab ermöglicht es automatisiert Handlungen, wie etwa das Stoppen von einer Aufnahme oder des Streamens, bei einem Szenenwechsel auszuführen."
+
 ; Hotkey
 AdvSceneSwitcher.hotkey.startSwitcherHotkey="Starte den Erweiterten Szenenwechsler"
 AdvSceneSwitcher.hotkey.stopSwitcherHotkey="Stoppe den Erweiterten Szenenwechsler"
@@ -844,7 +900,7 @@ AdvSceneSwitcher.firstBootMessage="<html><head/><body><p>Dies scheint das erste
 AdvSceneSwitcher.deprecatedTabWarning="Die Entwicklung für dieses Tab wurde gestoppt!\nBitte stattdessen zur Verwendung des Makros-Tab übergehen.\nDieser Hinweis kann im Allgemein-Tab deaktiviert werden."
 
 AdvSceneSwitcher.unit.milliseconds="Millisekunden"
-AdvSceneSwitcher.unit.seconds="Sekunden"
+AdvSceneSwitcher.unit.secends="Sekunden"
 AdvSceneSwitcher.unit.minutes="Minuten"
 AdvSceneSwitcher.unit.hours="Stunden"
 AdvSceneSwitcher.duration.condition.none="Kein Dauer-Modifikator"

data/locale/es-ES.ini

@@ -19,11 +19,11 @@ AdvSceneSwitcher.generalTab.status.autoStart.streaming="Emitiendo"
 AdvSceneSwitcher.generalTab.status.autoStart.recordingAndStreaming="Grabando o emitiendo"
 AdvSceneSwitcher.generalTab.status.checkInterval="Comprobar las condiciones de cambio cada"
 AdvSceneSwitcher.generalTab.generalBehavior="Comportamiento general"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch="Si no se cumple ninguna condición por"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatchDelay.tooltip="Solo será tan preciso como el intervalo de comprobación configurado."
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.dontSwitch="No cambiar"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchToRandom="Cambiar a una escena aleatoria"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchTo="Cambiar a:"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet="Si no se cumple ninguna condición por"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMetDelayTooltip="Solo será tan preciso como el intervalo de comprobación configurado."
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.dontSwitch="No cambiar"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.switchToRandom="Cambiar a una escena aleatoria"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.switchTo="Cambiar a:"
 AdvSceneSwitcher.generalTab.generalBehavior.cooldownHint="¡Durante este tiempo, se ignorarán las posibles coincidencias!"
 AdvSceneSwitcher.generalTab.generalBehavior.verboseLogging="Habilitar el registro detallado"
 AdvSceneSwitcher.generalTab.generalBehavior.saveWindowGeo="Guardar la posición y el tamaño de la ventana"
@@ -117,6 +117,8 @@ AdvSceneSwitcher.condition.scene.type.changed="Escena cambiada"
 AdvSceneSwitcher.condition.scene.type.notChanged="La escena no ha cambiado"
 AdvSceneSwitcher.condition.scene.currentSceneTransitionBehaviour="Durante la transición, verifique la escena de destino de la transición"
 AdvSceneSwitcher.condition.scene.previousSceneTransitionBehaviour="Durante la transición, verifique la escena de origen de la transición"
+AdvSceneSwitcher.condition.scene.entry.line1="{{sceneType}}{{scenes}}{{pattern}}"
+AdvSceneSwitcher.condition.scene.entry.line2="{{useTransitionTargetScene}}"
 AdvSceneSwitcher.condition.window="Ventana"
 AdvSceneSwitcher.condition.file="Archivo"
 AdvSceneSwitcher.condition.file.entry.line1="Contenido de{{fileType}}{{filePath}}{{conditions}}{{useRegex}}"
@@ -126,7 +128,7 @@ AdvSceneSwitcher.condition.media="Medios"
 AdvSceneSwitcher.condition.media.anyOnScene="Cualquier fuente multimedia activada"
 AdvSceneSwitcher.condition.media.allOnScene="Todas las fuentes de medios activadas"
 AdvSceneSwitcher.condition.media.inconsistencyInfo="Desafortunadamente, no todos los tipos de fuentes de medios se comportan de la misma manera (p. ej., fuente de medios frente a estado \"Detenido\" de fuente de video VLC).\n¡Así que experimente lo que funciona para su configuración!"
-AdvSceneSwitcher.condition.media.layout.legacy="El estado de{{sourceTypes}}{{mediaSources}}{{scenes}}{{checkTypes}}es{{states}}y{{timeRestrictions}}{{time}}"
+AdvSceneSwitcher.condition.media.entry="El estado de{{sourceTypes}}{{mediaSources}}{{scenes}}es{{states}}y{{timeRestrictions}}{{time}}"
 AdvSceneSwitcher.condition.video="Video"
 AdvSceneSwitcher.condition.video.condition.match="coincide exactamente"
 AdvSceneSwitcher.condition.video.condition.differ="no coincide"
@@ -267,7 +269,10 @@ AdvSceneSwitcher.condition.date.entry.nextMatchDate="Próxima coincidencia en: %
 AdvSceneSwitcher.condition.date.entry.updateOnRepeat="{{updateOnRepeat}} Al repetir actualizar la fecha seleccionada para repetir la fecha"
 AdvSceneSwitcher.condition.sceneTransform="Transformar elemento de escena"
 AdvSceneSwitcher.condition.sceneTransform.getTransform="Obtener transformación"
-AdvSceneSwitcher.condition.sceneTransform.condition.match="coincide con la transformación"
+AdvSceneSwitcher.condition.sceneTransform.entry.line1="En{{scenes}}{{sources}}{{types}}"
+AdvSceneSwitcher.condition.sceneTransform.entry.type.matches="coincide con la transformación"
+AdvSceneSwitcher.condition.sceneTransform.entry.line2="{{settings}}"
+AdvSceneSwitcher.condition.sceneTransform.entry.line3="{{regex}} {{getSettings}}"
 AdvSceneSwitcher.condition.transition="Transición"
 AdvSceneSwitcher.condition.transition.type.current="El tipo de transición actual es"
 AdvSceneSwitcher.condition.transition.type.duration="La duración de la transición actual es"
@@ -343,6 +348,7 @@ AdvSceneSwitcher.action.replay.saveWarn="Advertencia: ¡Guardar con demasiada fr
 AdvSceneSwitcher.action.replay.type.stop="Detener el búfer de reproducción"
 AdvSceneSwitcher.action.replay.type.start="Iniciar búfer de reproducción"
 AdvSceneSwitcher.action.replay.type.save="Guardar búfer de reproducción"
+AdvSceneSwitcher.action.replay.entry="{{actions}}"
 AdvSceneSwitcher.action.streaming="Transmisión"
 AdvSceneSwitcher.action.streaming.type.stop="Detener transmisión"
 AdvSceneSwitcher.action.streaming.type.start="Iniciar transmisión"
@@ -380,6 +386,7 @@ AdvSceneSwitcher.action.macro.type.unpause="Reanudar"
 AdvSceneSwitcher.action.macro.type.resetCounter="Reiniciar contador"
 AdvSceneSwitcher.action.macro.type.run="Ejecutar"
 AdvSceneSwitcher.action.macro.type.stop="Detener"
+AdvSceneSwitcher.action.macro.entry="{{actions}}{{actionIndex}}{{macros}}"
 AdvSceneSwitcher.action.pluginState="Estado del complemento"
 AdvSceneSwitcher.action.pluginState.type.stop="Detener el complemento Advanced Scene Switcher"
 AdvSceneSwitcher.action.pluginState.type.noMatch="Cambiar el comportamiento de no coincidencia:"
@@ -410,7 +417,7 @@ AdvSceneSwitcher.action.sceneOrder.type.movePosition="Mover a la posición"
 AdvSceneSwitcher.action.sceneOrder.entry="En{{scenes}}{{actions}}{{sources}}{{position}}"
 AdvSceneSwitcher.action.sceneTransform="Transformar elemento de escena"
 AdvSceneSwitcher.action.sceneTransform.getTransform="Obtener transformación"
-AdvSceneSwitcher.action.sceneTransform.entry="En{{scenes}}{{action}}{{rotation}}{{sources}}{{settingSelection}}{{singleSettingValue}}"
+AdvSceneSwitcher.action.sceneTransform.entry="En{{scenes}}{{action}}{{rotation}}{{sources}}"
 AdvSceneSwitcher.action.file="Archivo"
 AdvSceneSwitcher.action.file.type.write="Escribir"
 AdvSceneSwitcher.action.file.type.append="Agregar"
@@ -616,6 +623,31 @@ AdvSceneSwitcher.videoTab.ignoreInactiveSource="a menos que la fuente esté inac
 AdvSceneSwitcher.videoTab.entry="Cuando {{videoSources}} {{condition}} {{filePath}} {{browseButton}} durante {{duration}} cambiar a {{scenes}} usando {{transitions}} {{ignoreInactiveSource}}"
 AdvSceneSwitcher.videoTab.help="<html><head/><body><p>Esta pestaña te permitirá cambiar escenas según la salida de vídeo actual de las fuentes seleccionadas.<br/>Asegúrate de revisar <a href=\"https://obsproject.com/forum/resources/pixel-match-switcher.1202\"><span style=\" text-decoration: underline; color:#268bd2;\">Pixel Match Switcher</span></a> para una implementación aún mejor de esta funcionalidad.<br/><br/> Haz clic en el símbolo más resaltado para continuar.</p></body></html>"
 
+; Network Tab
+AdvSceneSwitcher.networkTab.title="Red"
+AdvSceneSwitcher.networkTab.description="Esta pestaña le permitirá controlar de forma remota la escena activa de otra instancia de OBS.\nTenga en cuenta que los nombres de las escenas deben coincidir exactamente en todas las instancias de OBS".
+AdvSceneSwitcher.networkTab.warning="Ejecutar el servidor fuera de una red local permitirá que terceros lean la escena activa".
+AdvSceneSwitcher.networkTab.server="Iniciar servidor (envía mensajes de cambio de escena a todos los clientes conectados)"
+AdvSceneSwitcher.networkTab.server.port="Puerto"
+AdvSceneSwitcher.networkTab.server.lockToIPv4="Bloquear servidor para usar solo IPv4"
+AdvSceneSwitcher.networkTab.server.sendSceneChange="Enviar mensajes para cambios de escena"
+AdvSceneSwitcher.networkTab.server.restrictSendToAutomatedSwitches="Solo enviar mensajes para cambios de escena automatizados"
+AdvSceneSwitcher.networkTab.server.sendPreview="Enviar mensajes para obtener una vista previa del cambio de escena cuando se ejecuta en Modo Estudio"
+AdvSceneSwitcher.networkTab.startFailed.message="El servidor WebSockets no pudo iniciarse, tal vez porque:\n - El puerto TCP %1 puede estar actualmente en uso en otro lugar de este sistema, posiblemente por otra aplicación. Intente configurar un puerto TCP diferente en el WebSocket configuración del servidor o detenga cualquier aplicación que pueda estar usando este puerto.\n - Mensaje de error: %2"
+AdvSceneSwitcher.networkTab.server.status.currentStatus="Estado actual"
+AdvSceneSwitcher.networkTab.server.status.notRunning="Desconectado"
+AdvSceneSwitcher.networkTab.server.status.starting="Iniciando"
+AdvSceneSwitcher.networkTab.server.status.running="En ejecución"
+AdvSceneSwitcher.networkTab.server.restart="Reiniciar servidor"
+AdvSceneSwitcher.networkTab.client="Iniciar cliente (Recibe mensajes de cambios de escena)"
+AdvSceneSwitcher.networkTab.client.address="Nombre de host o dirección IP"
+AdvSceneSwitcher.networkTab.client.port="Puerto"
+AdvSceneSwitcher.networkTab.client.status.currentStatus="Estado actual"
+AdvSceneSwitcher.networkTab.client.status.disconnected="Desconectado"
+AdvSceneSwitcher.networkTab.client.status.connecting="Conectando"
+AdvSceneSwitcher.networkTab.client.status.connected="Conectado"
+AdvSceneSwitcher.networkTab.client.reconnect="Forzar reconexión"
+
 ; Scene Group Tab
 AdvSceneSwitcher.sceneGroupTab.title="Grupo de escenas"
 AdvSceneSwitcher.sceneGroupTab.list="Grupos de escenas"
@@ -636,6 +668,30 @@ AdvSceneSwitcher.sceneGroupTab.exists="El grupo de escenas o el nombre de la esc
 AdvSceneSwitcher.sceneGroupTab.help="Los grupos de escenas se pueden seleccionar como un objetivo al igual que una escena normal.\n\nComo sugiere el nombre, un grupo de escenas es una colección de varias escenas.\nEl grupo de escenas avanzará a través de la lista de sus escenas asignadas según los ajustes configurados, que se puede encontrar en el lado derecho.\n\nPuedes configurar el grupo de escenas para avanzar a la siguiente escena en la lista:\nDespués de varias veces, el grupo de escenas se selecciona como objetivo.\nDespués de que un cierto período de tiempo haya pasado.\nO al azar.\n\nPor ejemplo, un grupo de escenas que contiene las escenas ... \nEscena 1 \nEscena 2 \nEscena 3 \n ... activará la \"Escena 1 \" la primera vez que se seleccione como objetivo. \nLa segunda vez se activará \"Escena 2 \". \nLas veces restantes \"Escena 3 \" se activarán. \n\nHaz clic en el símbolo más resaltado a continuación para agregar un nuevo grupo de escenas."
 AdvSceneSwitcher.sceneGroupTab.scenes.help="Selecciona el grupo de escenas que deseas modificar a la izquierda. \n\nSelecciona una escena para agregar a este grupo de escenas seleccionando la escena de arriba y haciendo clic en el símbolo más a continuación. \n\nSe puede agregar una escena varias veces al mismo grupo de escenas."
 
+; Scene Trigger Tab
+AdvSceneSwitcher.sceneTriggerTab.title="Activadores de escena"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.none="--selecciona el activador--"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneActive="esté activo"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneInactive="no esté activo"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneLeave="cambie a otra escena"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.none="--Selecciona la acción--"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startRecording="empezar a grabar"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.pauseRecording="pausar la grabación"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.unpauseRecording="reanudar grabación"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopRecording="detener grabación"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopStreaming="detener transmisión"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startStreaming="iniciar transmisión"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startReplayBuffer="iniciar búfer de repetición"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopReplayBuffer="detener búfer de repetición"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.muteSource="silenciar fuente"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.unmuteSource="dejar de silenciar fuente"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startSwitcher="iniciar el selector de escenas"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopSwitcher="detener el selector de escenas"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startVirtualCamera="Iniciar Camara Virtual"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopVirtualCamera="Detener Camara Virtual"
+AdvSceneSwitcher.sceneTriggerTab.entry="Cuando {{scenes}} {{triggers}} {{actions}} {{audioSources}} después de {{duration}}"
+AdvSceneSwitcher.sceneTriggerTab.help="Esta pestaña te permite activar acciones sobre cambios de escena, como detener la grabación o la transmisión."
+
 ; Hotkey
 AdvSceneSwitcher.hotkey.startSwitcherHotkey="Iniciar Advanced Scene Switcher"
 AdvSceneSwitcher.hotkey.stopSwitcherHotkey="Detener Advanced Scene Switcher"
@@ -689,7 +745,7 @@ AdvSceneSwitcher.firstBootMessage="<html><head/><body><p>Esta parece ser la prim
 AdvSceneSwitcher.deprecatedTabWarning="¡Se detuvo el desarrollo de esta pestaña!\nConsidere cambiar a macros en su lugar.\nEsta sugerencia se puede desactivar en la pestaña General".
 
 AdvSceneSwitcher.unit.milliseconds="milisegundos"
-AdvSceneSwitcher.unit.seconds="segundos"
+AdvSceneSwitcher.unit.secends="segundos"
 AdvSceneSwitcher.unit.minutes="minutos"
 AdvSceneSwitcher.unit.hours="horas"
 AdvSceneSwitcher.duration.condition.none="Sin límite de tiempo"

data/locale/fr-FR.ini

@@ -19,11 +19,11 @@ AdvSceneSwitcher.generalTab.status.autoStart.streaming="Diffusion en continu"
 AdvSceneSwitcher.generalTab.status.autoStart.recordingAndStreaming="Enregistrement ou Diffusion en continu"
 AdvSceneSwitcher.generalTab.status.checkInterval="Vérifier les conditions toutes les"
 AdvSceneSwitcher.generalTab.generalBehavior="Comportement général"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch="Si aucune action n'est effectuée pendant"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatchDelay.tooltip="Sera aussi précis que l'intervalle de vérification configuré."
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.dontSwitch="Ne pas basculer"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchToRandom="Basculer vers n'importe quelle scène dans l'onglet Aléatoire"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchTo="Basculer vers :"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet="Si aucune action n'est effectuée pendant"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMetDelayTooltip="Sera aussi précis que l'intervalle de vérification configuré."
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.dontSwitch="Ne pas basculer"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.switchToRandom="Basculer vers n'importe quelle scène dans l'onglet Aléatoire"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.switchTo="Basculer vers :"
 AdvSceneSwitcher.generalTab.generalBehavior.cooldown="Après avoir effectué des actions, sauter l'exécution d'actions pendant"
 AdvSceneSwitcher.generalTab.generalBehavior.cooldownHint="Pendant cette période, les correspondances potentielles seront ignorées !"
 AdvSceneSwitcher.generalTab.generalBehavior.verboseLogging="Activer les journaux détaillés"
@@ -109,7 +109,7 @@ AdvSceneSwitcher.macroTab.highlightExecutedMacros="Mettre en surbrillance les ma
 AdvSceneSwitcher.macroTab.highlightTrueConditions="Mettre en surbrillance les conditions de la macro actuellement sélectionnée qui ont évalué à vrai récemment"
 AdvSceneSwitcher.macroTab.highlightPerformedActions="Mettre en surbrillance les actions récemment effectuées de la macro actuellement sélectionnée"
 AdvSceneSwitcher.macroTab.newMacroRegisterHotkey="Enregistrer des raccourcis clavier pour contrôler l'état de pause des nouvelles macros"
-AdvSceneSwitcher.macroTab.currentRegisterHotkeys="Enregistrer des raccourcis clavier pour contrôler l'état de pause de la macro sélectionnée"
+AdvSceneSwitcher.macroTab.currentDisableHotkeys="Enregistrer des raccourcis clavier pour contrôler l'état de pause de la macro sélectionnée"
 AdvSceneSwitcher.macroTab.currentSkipExecutionOnStartup="Ignorer l'exécution des actions de la macro actuelle au démarrage"
 AdvSceneSwitcher.macroTab.currentRegisterDock="Enregistrer le widget du dock pour contrôler l'état de pause de la macro sélectionnée ou l'exécuter manuellement"
 AdvSceneSwitcher.macroTab.currentDockAddRunButton="Ajouter un bouton pour exécuter la macro"
@@ -196,7 +196,7 @@ AdvSceneSwitcher.condition.media.source="Source"
 AdvSceneSwitcher.condition.media.anyOnScene="Toute source média sur la scène"
 AdvSceneSwitcher.condition.media.allOnScene="Toutes les sources média sur la scène"
 AdvSceneSwitcher.condition.media.inconsistencyInfo="Malheureusement, toutes les sources média ne se comportent pas de la même manière (par exemple, l'état \"Arrêté\" de la source Media par rapport à la source Vidéo VLC).\nPar conséquent, veuillez expérimenter ce qui fonctionne le mieux pour votre configuration !"
-AdvSceneSwitcher.condition.media.layout.legacy="{{sourceTypes}}{{mediaSources}}{{scenes}}{{checkTypes}}l'état est{{states}}et{{timeRestrictions}}{{time}}"
+AdvSceneSwitcher.condition.media.entry="{{sourceTypes}}{{mediaSources}}{{scenes}}l'état est{{states}}et{{timeRestrictions}}{{time}}"
 AdvSceneSwitcher.condition.video="Vidéo"
 AdvSceneSwitcher.condition.video.condition.match="correspond exactement à"
 AdvSceneSwitcher.condition.video.condition.differ="ne correspond pas à"
@@ -382,7 +382,8 @@ AdvSceneSwitcher.condition.date.entry.nextMatchDate="Prochaine correspondance à
 AdvSceneSwitcher.condition.date.entry.updateOnRepeat="{{updateOnRepeat}}À la répétition, mettre à jour la date sélectionnée pour la date de répétition"
 AdvSceneSwitcher.condition.sceneTransform="Transformation de l'élément de la scène"
 AdvSceneSwitcher.condition.sceneTransform.getTransform="Obtenir la transformation"
-AdvSceneSwitcher.condition.sceneTransform.condition.match="correspond à la transformation"
+AdvSceneSwitcher.condition.sceneTransform.entry.line1="Sur{{scenes}}{{sources}}{{types}}"
+AdvSceneSwitcher.condition.sceneTransform.entry.type.matches="correspond à la transformation"
 AdvSceneSwitcher.condition.transition="Transition"
 AdvSceneSwitcher.condition.transition.type.current="Le type de transition actuel est"
 AdvSceneSwitcher.condition.transition.type.duration="La durée de la transition actuelle est"
@@ -445,7 +446,6 @@ AdvSceneSwitcher.condition.run="Exécution"
 AdvSceneSwitcher.condition.run.entry="Le processus se termine avant le délai de{{timeout}}secondes"
 AdvSceneSwitcher.condition.run.entry.exit="{{checkExitCode}}Vérifier le code de sortie{{exitCode}}
 AdvSceneSwitcher.condition.midi="MIDI"
-AdvSceneSwitcher.condition.midi.entry="Message reçu depuis{{device}}qui correspond à :"
 AdvSceneSwitcher.condition.midi.entry.listen="Définir la sélection des messages MIDI pour les messages entrants sur l'appareil sélectionné :{{listenButton}}"
 AdvSceneSwitcher.condition.display="Affichage"
 AdvSceneSwitcher.condition.display.type.displayName="Le nom des écrans connectés correspond à"
@@ -454,7 +454,7 @@ AdvSceneSwitcher.condition.slideshow="Diaporama"
 AdvSceneSwitcher.condition.slideshow.condition.slideChanged="Diapositive changée"
 AdvSceneSwitcher.condition.slideshow.condition.slideIndex="Le numéro de la diapositive actuelle est"
 AdvSceneSwitcher.condition.slideshow.condition.slidePath="Le chemin de la diapositive actuelle est"
-AdvSceneSwitcher.condition.slideshow.updateInterval.tooltip="Les informations sur l'état du diaporama ne seront mises à jour qu'en fonction du temps configuré entre les diapositives"
+AdvSceneSwitcher.condition.slideshow.updateIntervalTooltip="Les informations sur l'état du diaporama ne seront mises à jour qu'en fonction du temps configuré entre les diapositives"
 
 ; Macro Actions
 AdvSceneSwitcher.action.scene="Changer de scène"
@@ -610,7 +610,7 @@ AdvSceneSwitcher.action.sceneTransform.type.centerToScreen="Centrer à l'écran"
 AdvSceneSwitcher.action.sceneTransform.type.centerVertically="Centrer verticalement"
 AdvSceneSwitcher.action.sceneTransform.type.centerHorizontally="Centrer horizontalement"
 AdvSceneSwitcher.action.sceneTransform.getTransform="Obtenir la transformation"
-AdvSceneSwitcher.action.sceneTransform.entry="Sur{{scenes}}{{action}}{{rotation}}{{sources}}{{settingSelection}}{{singleSettingValue}}"
+AdvSceneSwitcher.action.sceneTransform.entry="Sur{{scenes}}{{action}}{{rotation}}{{sources}}"
 AdvSceneSwitcher.action.file="Fichier"
 AdvSceneSwitcher.action.file.type.write="Écrire"
 AdvSceneSwitcher.action.file.type.append="Ajouter"
@@ -649,7 +649,7 @@ AdvSceneSwitcher.action.screenshot.type.source="Source"
 AdvSceneSwitcher.action.screenshot.type.scene="Scène"
 AdvSceneSwitcher.action.screenshot.mainOutput="Sortie principale d'OBS"
 AdvSceneSwitcher.action.screenshot.blackscreenNote="Les sources ou les scènes qui ne sont pas toujours rendues peuvent entraîner des parties de captures d'écran vides."
-AdvSceneSwitcher.action.screenshot.entry="Capturer{{targetType}}{{sources}}{{scenes}}et enregistrer à l'emplacement{{saveType}}{{variables}}"
+AdvSceneSwitcher.action.screenshot.entry="Capturer{{targetType}}{{sources}}{{scenes}}et enregistrer à l'emplacement{{saveType}}"
 AdvSceneSwitcher.action.profile="Profil"
 AdvSceneSwitcher.action.profile.entry="Changer le profil actif vers{{profiles}}"
 AdvSceneSwitcher.action.sceneCollection="Collection de scènes"
@@ -897,6 +897,31 @@ AdvSceneSwitcher.videoTab.ignoreInactiveSource="sauf si la source est inactive"
 AdvSceneSwitcher.videoTab.entry="Lorsque{{videoSources}}{{condition}}{{filePath}}{{browseButton}}pendant{{duration}}, passez à{{scenes}}en utilisant{{transitions}}{{ignoreInactiveSource}}"
 AdvSceneSwitcher.videoTab.help="<html><head/><body><p>Cet onglet vous permettra de basculer entre les scènes en fonction de la sortie vidéo actuelle des sources sélectionnées.<br/>Assurez-vous de consulter <a href=\"https://obsproject.com/forum/resources/pixel-match-switcher.1202/\"><span style=\" text-decoration: underline; color:#268bd2;\">Pixel Match Switcher</span></a> pour une implémentation encore meilleure de cette fonctionnalité.<br/><br/> Cliquez sur le symbole plus en surbrillance pour continuer.</p></body></html>"
 
+; Network Tab
+AdvSceneSwitcher.networkTab.title="Réseau"
+AdvSceneSwitcher.networkTab.description="Cet onglet vous permettra de contrôler à distance la scène active d'une autre instance OBS.\nVeuillez noter que les noms de scènes doivent correspondre exactement sur toutes les instances OBS."
+AdvSceneSwitcher.networkTab.warning="Exécuter le serveur en dehors d'un réseau local permettra à des tiers de lire la scène active."
+AdvSceneSwitcher.networkTab.server="Démarrer le serveur (Envoie des messages de changement de scène à tous les clients connectés)"
+AdvSceneSwitcher.networkTab.server.port="Port"
+AdvSceneSwitcher.networkTab.server.lockToIPv4="Verrouiller le serveur pour n'utiliser que IPv4"
+AdvSceneSwitcher.networkTab.server.sendSceneChange="Envoyer des messages pour les changements de scène"
+AdvSceneSwitcher.networkTab.server.restrictSendToAutomatedSwitches="Envoyer uniquement des messages pour les changements de scène automatisés"
+AdvSceneSwitcher.networkTab.server.sendPreview="Envoyer des messages pour le changement de prévisualisation de scène lors de l'exécution en mode Studio"
+AdvSceneSwitcher.networkTab.startFailed.message="Le serveur WebSocket n'a pas pu démarrer, peut-être parce que :\n - Le port TCP %1 est peut-être déjà utilisé ailleurs sur ce système, éventuellement par une autre application. Essayez de définir un port TCP différent dans les paramètres du serveur WebSocket, ou arrêtez toute application qui pourrait utiliser ce port.\n - Message d'erreur : %2"
+AdvSceneSwitcher.networkTab.server.status.currentStatus="État actuel"
+AdvSceneSwitcher.networkTab.server.status.notRunning="Non démarré"
+AdvSceneSwitcher.networkTab.server.status.starting="Démarrage"
+AdvSceneSwitcher.networkTab.server.status.running="En cours d'exécution"
+AdvSceneSwitcher.networkTab.server.restart="Redémarrer le serveur"
+AdvSceneSwitcher.networkTab.client="Démarrer le client (Reçoit des messages de changement de scène)"
+AdvSceneSwitcher.networkTab.client.address="Nom d'hôte ou adresse IP"
+AdvSceneSwitcher.networkTab.client.port="Port"
+AdvSceneSwitcher.networkTab.client.status.currentStatus="État actuel"
+AdvSceneSwitcher.networkTab.client.status.disconnected="Déconnecté"
+AdvSceneSwitcher.networkTab.client.status.connecting="Connexion"
+AdvSceneSwitcher.networkTab.client.status.connected="Connecté"
+AdvSceneSwitcher.networkTab.client.reconnect="Forcer la reconnexion"
+
 ; Scene Group Tab
 AdvSceneSwitcher.sceneGroupTab.title="Groupe de Scènes"
 AdvSceneSwitcher.sceneGroupTab.list="Groupes de Scènes"
@@ -917,6 +942,30 @@ AdvSceneSwitcher.sceneGroupTab.exists="Le nom du Groupe de Scènes ou de la Scè
 AdvSceneSwitcher.sceneGroupTab.help="Les Groupes de Scènes peuvent être sélectionnés comme une cible, tout comme une scène régulière.\n\nComme son nom l'indique, un Groupe de Scènes est une collection de plusieurs scènes.\nLe Groupe de Scènes avancera dans la liste de ses scènes attribuées en fonction des paramètres configurés, que vous pouvez trouver à droite.\n\nVous pouvez configurer le Groupe de Scènes pour passer à la scène suivante dans la liste :\nAprès un certain nombre de fois où le Groupe de Scènes est sélectionné comme cible.\nAprès qu'un certain laps de temps se soit écoulé.\nOu au hasard.\n\nPar exemple, un Groupe de Scènes contenant les scènes...\nScène 1\nScène 2\nScène 3\n... activera "Scène 1" la première fois qu'il est sélectionné comme cible.\nLa deuxième fois, il activera "Scène 2".\nLes fois suivantes, "Scène 3" sera activée.\n\nCliquez sur le symbole plus en surbrillance ci-dessous pour ajouter un nouveau Groupe de Scènes."
 AdvSceneSwitcher.sceneGroupTab.scenes.help="Sélectionnez le groupe de scènes que vous souhaitez modifier à gauche.\n\nSélectionnez une scène à ajouter à ce groupe de scènes en sélectionnant la scène ci-dessus et en cliquant sur le symbole plus ci-dessous.\n\nUne scène peut être ajoutée plusieurs fois au même groupe de scènes."
 
+; Scene Trigger Tab
+AdvSceneSwitcher.sceneTriggerTab.title="Déclencheurs de Scène"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.none="--sélectionnez un déclencheur--"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneActive="est active"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneInactive="n'est pas active"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneLeave="passé à autre chose"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.none="--sélectionnez une action--"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startRecording="démarrer l'enregistrement"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.pauseRecording="mettre en pause l'enregistrement"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.unpauseRecording="reprendre l'enregistrement"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopRecording="arrêter l'enregistrement"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopStreaming="arrêter la diffusion"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startStreaming="démarrer la diffusion"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startReplayBuffer="démarrer le tampon de répétition"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopReplayBuffer="arrêter le tampon de répétition"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.muteSource="mettre la source en sourdine"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.unmuteSource="annuler la mise en sourdine de la source"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startSwitcher="démarrer le commutateur de scènes avancé"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopSwitcher="arrêter le commutateur de scènes avancé"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startVirtualCamera="démarrer la caméra virtuelle"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopVirtualCamera="arrêter la caméra virtuelle"
+AdvSceneSwitcher.sceneTriggerTab.entry="Lorsque{{scenes}}{{triggers}}{{actions}}{{audioSources}}après{{duration}}"
+AdvSceneSwitcher.sceneTriggerTab.help="Cet onglet vous permet de déclencher des actions lors des changements de scènes, comme l'arrêt de l'enregistrement ou de la diffusion."
+
 ; Hotkey
 AdvSceneSwitcher.hotkey.startSwitcherHotkey="Démarrer le commutateur de scènes avancé"
 AdvSceneSwitcher.hotkey.stopSwitcherHotkey="Arrêter le commutateur de scènes avancé"
@@ -1112,8 +1161,8 @@ AdvSceneSwitcher.sceneItemSelection.type.sourceName="Nom de la source"
 AdvSceneSwitcher.sceneItemSelection.type.sourceVariable="Nom de la variable"
 AdvSceneSwitcher.sceneItemSelection.type.sourceNamePattern="Le nom de la source correspond au motif"
 AdvSceneSwitcher.sceneItemSelection.type.sourceNamePattern.entry="{{nameConflictIndex}}correspondant à{{pattern}}{{regex}}"
-AdvSceneSwitcher.sceneItemSelection.type.sourceType="Sources de type"
-AdvSceneSwitcher.sceneItemSelection.type.sourceType.entry="{{nameConflictIndex}}Type de source{{sourceTypes}}"
+AdvSceneSwitcher.sceneItemSelection.type.sourceGroup="Sources de type"
+AdvSceneSwitcher.sceneItemSelection.type.sourceGroup.entry="{{nameConflictIndex}}Type de source{{sourceGroups}}"
 AdvSceneSwitcher.sceneItemSelection.type.index="Source avec index"
 AdvSceneSwitcher.sceneItemSelection.type.index.entry="{{index}}source"
 AdvSceneSwitcher.sceneItemSelection.type.indexRange="Sources dans la plage d'index"
@@ -1133,7 +1182,7 @@ AdvSceneSwitcher.firstBootMessage="<html><head/><body><p>Il semble que ce soit l
 AdvSceneSwitcher.deprecatedTabWarning="Le développement de cet onglet est terminé !\nVeuillez envisager de passer à l'utilisation des Macros à la place.\nCette astuce peut être désactivée dans l'onglet Général."
 
 AdvSceneSwitcher.unit.milliseconds="millisecondes"
-AdvSceneSwitcher.unit.seconds="secondes"
+AdvSceneSwitcher.unit.secends="secondes"
 AdvSceneSwitcher.unit.minutes="minutes"
 AdvSceneSwitcher.unit.hours="heures"
 AdvSceneSwitcher.duration.condition.none="Aucun modificateur de durée"

data/locale/ru-RU.ini

@@ -19,11 +19,11 @@ AdvSceneSwitcher.generalTab.status.autoStart.streaming="Вещание"
 AdvSceneSwitcher.generalTab.status.autoStart.recordingAndStreaming="Запись или потоковое вещание"
 AdvSceneSwitcher.generalTab.status.checkInterval="Проверять условия переключения каждый раз"
 AdvSceneSwitcher.generalTab.generalBehavior="Общее поведение"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch="Если не выполняется условие переключения для"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatchDelay.tooltip="Будет только настолько точным, насколько настроен интервал проверки."
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.dontSwitch="Не переключаться"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchToRandom="Переключиться на любую сцену на вкладке Random"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchTo="Переключиться на:"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet="Если не выполняется условие переключения для"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMetDelayTooltip="Будет только настолько точным, насколько настроен интервал проверки."
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.dontSwitch="Не переключаться"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.switchToRandom="Переключиться на любую сцену на вкладке Random"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.switchTo="Переключиться на:"
 AdvSceneSwitcher.generalTab.generalBehavior.cooldownHint="В течение этого времени потенциальные совпадения будут игнорироваться!"
 AdvSceneSwitcher.generalTab.generalBehavior.verboseLogging="Включить ведение подробного журнала"
 AdvSceneSwitcher.generalTab.generalBehavior.saveWindowGeo="Сохранять положение и размер окна"
@@ -137,6 +137,7 @@ AdvSceneSwitcher.action.replay="Буфер воспроизведения"
 AdvSceneSwitcher.action.replay.type.stop="Остановить буфер воспроизведения"
 AdvSceneSwitcher.action.replay.type.start="Начать воспроизведение буфера"
 AdvSceneSwitcher.action.replay.type.save="Сохранить буфер воспроизведения"
+AdvSceneSwitcher.action.replay.entry="{{actions}}"
 AdvSceneSwitcher.action.streaming="Потоковое вещание"
 AdvSceneSwitcher.action.streaming.type.stop="Остановить потоковое вещание"
 AdvSceneSwitcher.action.streaming.type.start="Начать потоковое вещание"
@@ -307,6 +308,28 @@ AdvSceneSwitcher.videoTab.ignoreInactiveSource="если источник неа
 AdvSceneSwitcher.videoTab.entry="Когда {{videoSources}} {{condition}} {{filePath}} {{browseButton}} для {{duration}} переключиться на {{scenes}} используя {{transitions}} {{ignoreInactiveSource}}"
 AdvSceneSwitcher.videoTab.help="<html><head/><body><p>Эта вкладка позволит вам переключать сцены на основе текущего видеовыхода выбранных источников.<br/>Обязательно проверьте <a href=\"https://obsproject.com/forum/resources/pixel-match-switcher.1202/\"><span style=\" text-decoration: underline; color:#268bd2;\">Pixel Match Switcher</span></a> для еще лучшей реализации этой функциональности.<br/><br/> Нажмите на выделенный символ плюса, чтобы продолжить.</p></body></html>"
 
+; Network Tab
+AdvSceneSwitcher.networkTab.title="Сеть"
+AdvSceneSwitcher.networkTab.warning="Запуск сервера вне локальной сети позволит третьим лицам читать активную сцену."
+AdvSceneSwitcher.networkTab.server="Запустить сервер (отправляет сообщения о переключении сцены всем подключенным клиентам)"
+AdvSceneSwitcher.networkTab.server.port="Порт"
+AdvSceneSwitcher.networkTab.server.lockToIPv4="Заблокировать сервер на использование только IPv4"
+AdvSceneSwitcher.networkTab.server.restrictSendToAutomatedSwitches="Отправлять сообщения только для автоматических переключателей сцен"
+AdvSceneSwitcher.networkTab.startFailed.message="Сервер WebSockets не удалось запустить, возможно потому, что:\n - TCP порт %1 может в настоящее время использоваться в другом месте в этой системе, возможно, другим приложением. Попробуйте установить другой TCP порт в настройках сервера WebSocket, или остановите любое приложение, которое может использовать этот порт.\n - Сообщение об ошибке: %2"
+AdvSceneSwitcher.networkTab.server.status.currentStatus="Текущий статус"
+AdvSceneSwitcher.networkTab.server.status.notRunning="Не запущен"
+AdvSceneSwitcher.networkTab.server.status.starting="Запуск"
+AdvSceneSwitcher.networkTab.server.status.running="Работает"
+AdvSceneSwitcher.networkTab.server.restart="Перезапустить сервер"
+AdvSceneSwitcher.networkTab.client="Запустить клиент (Получает сообщения о переключении сцен)"
+AdvSceneSwitcher.networkTab.client.address="Имя хоста или IP-адрес"
+AdvSceneSwitcher.networkTab.client.port="Порт"
+AdvSceneSwitcher.networkTab.client.status.currentStatus="Текущий статус"
+AdvSceneSwitcher.networkTab.client.status.disconnected="Отключено"
+AdvSceneSwitcher.networkTab.client.status.connecting="Подключение"
+AdvSceneSwitcher.networkTab.client.status.connected="Подключено"
+AdvSceneSwitcher.networkTab.client.reconnect="Принудительное переподключение"
+
 ; Scene Group Tab
 AdvSceneSwitcher.sceneGroupTab.title="Группа сцен"
 AdvSceneSwitcher.sceneGroupTab.list="Группы сцен"
@@ -327,6 +350,28 @@ AdvSceneSwitcher.sceneGroupTab.exists="Группа сцен или назван
 AdvSceneSwitcher.sceneGroupTab.help="Группы сцен могут быть выбраны в качестве цели так же, как и обычные сцены.\n\nКак следует из названия, группа сцен представляет собой набор из нескольких сцен.\nГруппа сцен будет продвигаться по списку назначенных ей сцен в зависимости от настроенных параметров, которые можно найти справа.\n\nВы можете настроить группу сцен на переход к следующей сцене в списке:\nПосле определенного количества раз, когда группа сцен выбрана в качестве цели.\nПо истечении определенного времени.\nИли случайным образом.\n\nНапример, группа сцен, содержащая сцены ...\nScene 1\nScene 2\nScene 3 \n... активирует \"Scene 1\" в первый раз, когда он выбран в качестве цели.\nВо второй раз он активируется \"Scene 2\".\nОставшееся время \"Scene 3\" будет активирован.\n\nНажмите на выделенный символ плюса ниже, чтобы добавить новую группу сцен."
 AdvSceneSwitcher.sceneGroupTab.scenes.help="Выберите группу сцен, которую вы хотите изменить слева.\n\nВыберите сцену для добавления в эту группу сцен, выбрав сцену выше и нажав на символ плюса ниже.\n\nСцена может быть добавлена несколько раз в одну и ту же группу сцен."
 
+; Scene Trigger Tab
+AdvSceneSwitcher.sceneTriggerTab.title="Триггеры сцены"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.none="--выбрать триггер--"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneActive="активен"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneInactive="не активен"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneLeave="переключился с"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.none="--выбрать действие--"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startRecording="начать запись"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.pauseRecording="приостановить запись"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.unpauseRecording="отменить паузу записи"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopRecording="остановить запись"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopStreaming="остановить потоковое вещание"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startStreaming="начать потоковое вещание"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startReplayBuffer="запустить буфер воспроизведения"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopReplayBuffer="остановить буфер воспроизведения"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.muteSource="отключить источник"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.unmuteSource="включить источник"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startSwitcher="запустить переключатель сцены"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopSwitcher="остановить переключатель сцены"
+AdvSceneSwitcher.sceneTriggerTab.entry="Когда {{scenes}} {{triggers}} {{actions}} {{audioSources}} после {{duration}}"
+AdvSceneSwitcher.sceneTriggerTab.help="Эта вкладка позволяет запускать действия при изменении сцены, например, остановку записи или потоковой передачи."
+
 ; Hotkey
 AdvSceneSwitcher.hotkey.startSwitcherHotkey="Запустить Advanced Scene Switcher"
 AdvSceneSwitcher.hotkey.stopSwitcherHotkey="становить Advanced Scene Switcher"
@@ -355,6 +400,6 @@ AdvSceneSwitcher.status.active="Активный"
 AdvSceneSwitcher.status.inactive="Неактивен"
 
 AdvSceneSwitcher.unit.milliseconds="миллисекунды"
-AdvSceneSwitcher.unit.seconds="секунды"
+AdvSceneSwitcher.unit.secends="секунды"
 AdvSceneSwitcher.unit.minutes="минуты"
 AdvSceneSwitcher.unit.hours="часы"

data/locale/tr-TR.ini

@@ -19,11 +19,11 @@ AdvSceneSwitcher.generalTab.status.autoStart.streaming="Yayın"
 AdvSceneSwitcher.generalTab.status.autoStart.recordingAndStreaming="Kayıt veya Yayın"
 AdvSceneSwitcher.generalTab.status.checkInterval="Anahtar koşullarını her seferinde kontrol edin"
 AdvSceneSwitcher.generalTab.generalBehavior="Genel davranış"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch="...için herhangi bir işlem yapılmazsa"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatchDelay.tooltip="Yalnızca yapılandırılmış kontrol aralığı kadar doğru olacaktır."
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.dontSwitch="Geçiş Yapma"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchToRandom="Rastgele sekmesinde herhangi bir sahneye geçin"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchTo="Değiştirmek:"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet="...için herhangi bir işlem yapılmazsa"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMetDelayTooltip="Yalnızca yapılandırılmış kontrol aralığı kadar doğru olacaktır."
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.dontSwitch="Geçiş Yapma"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.switchToRandom="Rastgele sekmesinde herhangi bir sahneye geçin"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.switchTo="Değiştirmek:"
 AdvSceneSwitcher.generalTab.generalBehavior.cooldown="Bir eşleşmeden sonra aşağıdakiler için işlem yapmayın:"
 AdvSceneSwitcher.generalTab.generalBehavior.cooldownHint="Bu süre zarfında olası eşleşmeler göz ardı edilecektir!"
 AdvSceneSwitcher.generalTab.generalBehavior.verboseLogging="Ayrıntılı günlük kaydını etkinleştir"
@@ -107,6 +107,8 @@ AdvSceneSwitcher.condition.scene.type.previous="Önceki Sahne"
 AdvSceneSwitcher.condition.scene.type.changed="Sahne değişti"
 AdvSceneSwitcher.condition.scene.type.notChanged="Sahne değişmedi"
 AdvSceneSwitcher.condition.scene.currentSceneTransitionBehaviour="Geçiş hedefi sahnesi için geçiş kontrolü sırasında"
+AdvSceneSwitcher.condition.scene.entry.line1="{{sceneType}}{{scenes}}{{pattern}}"
+AdvSceneSwitcher.condition.scene.entry.line2="{{useTransitionTargetScene}}"
 AdvSceneSwitcher.condition.window="Pencere"
 AdvSceneSwitcher.condition.file="Dosya"
 AdvSceneSwitcher.condition.file.entry.line1="İçerik{{fileType}}{{filePath}}{{conditions}}{{useRegex}}"
@@ -115,7 +117,7 @@ AdvSceneSwitcher.condition.file.entry.line3="{{checkModificationDate}}{{checkFil
 AdvSceneSwitcher.condition.media="Medya"
 AdvSceneSwitcher.condition.media.anyOnScene="Herhangi bir medya kaynağı"
 AdvSceneSwitcher.condition.media.allOnScene="Tüm medya kaynakları "
-AdvSceneSwitcher.condition.media.layout.legacy="{{sourceTypes}}{{mediaSources}}{{scenes}}{{checkTypes}}durumu{{states}}ve{{timeRestrictions}}{{time}}"
+AdvSceneSwitcher.condition.media.entry="{{sourceTypes}}{{mediaSources}}{{scenes}}durumu{{states}}ve{{timeRestrictions}}{{time}}"
 AdvSceneSwitcher.condition.video="Video"
 AdvSceneSwitcher.condition.video.condition.match="Tam olarak eşleşir"
 AdvSceneSwitcher.condition.video.condition.differ="Eşleştirme"
@@ -224,7 +226,10 @@ AdvSceneSwitcher.condition.date.state.before="Önce"
 AdvSceneSwitcher.condition.date.state.between="Arasında"
 AdvSceneSwitcher.condition.sceneTransform="Sahne öğesi dönüşümü"
 AdvSceneSwitcher.condition.sceneTransform.getTransform="Dönüşümü al"
-AdvSceneSwitcher.condition.sceneTransform.condition.match="dönüşümle eşleşir"
+AdvSceneSwitcher.condition.sceneTransform.entry.line1="Açık{{scenes}}{{sources}}{{types}}"
+AdvSceneSwitcher.condition.sceneTransform.entry.type.matches="dönüşümle eşleşir"
+AdvSceneSwitcher.condition.sceneTransform.entry.line2="{{settings}}"
+AdvSceneSwitcher.condition.sceneTransform.entry.line3="{{regex}} {{getSettings}}"
 AdvSceneSwitcher.condition.transition="Geçiş"
 AdvSceneSwitcher.condition.transition.type.current="Geçerli geçiş türü"
 AdvSceneSwitcher.condition.transition.type.duration="Mevcut geçiş süresi"
@@ -274,6 +279,7 @@ AdvSceneSwitcher.action.replay="Tekrar arabelleği"
 AdvSceneSwitcher.action.replay.type.stop="Tekrar arabelleğini durdur"
 AdvSceneSwitcher.action.replay.type.start="Tekrar arabelleğini başlat"
 AdvSceneSwitcher.action.replay.type.save="Tekrar arabelleğini kaydet"
+AdvSceneSwitcher.action.replay.entry="{{actions}}"
 AdvSceneSwitcher.action.streaming="Yayın"
 AdvSceneSwitcher.action.streaming.type.stop="Yayın durdur"
 AdvSceneSwitcher.action.streaming.type.start="Yayın başlat"
@@ -309,6 +315,7 @@ AdvSceneSwitcher.action.macro.type.pause="Duraklat"
 AdvSceneSwitcher.action.macro.type.unpause="Duraklatma"
 AdvSceneSwitcher.action.macro.type.resetCounter="Sayacı sıfırla"
 AdvSceneSwitcher.action.macro.type.run="Çalıştır"
+AdvSceneSwitcher.action.macro.entry="{{actions}}{{actionIndex}}{{macros}}"
 AdvSceneSwitcher.action.pluginState="Eklenti durumu"
 AdvSceneSwitcher.action.pluginState.type.stop="Advanced Scene Switcher eklentisini durdurun"
 AdvSceneSwitcher.action.pluginState.type.noMatch="Eşleşmeme davranışını değiştirin:"
@@ -339,7 +346,7 @@ AdvSceneSwitcher.action.sceneOrder.type.movePosition="Konuma taşı"
 AdvSceneSwitcher.action.sceneOrder.entry="Açık{{scenes}}{{actions}}{{sources}}{{position}}"
 AdvSceneSwitcher.action.sceneTransform="Sahne öğesi dönüşümü"
 AdvSceneSwitcher.action.sceneTransform.getTransform="Dönüşümü al"
-AdvSceneSwitcher.action.sceneTransform.entry="Açık{{scenes}}{{action}}{{rotation}}{{sources}}{{settingSelection}}{{singleSettingValue}}"
+AdvSceneSwitcher.action.sceneTransform.entry="Açık{{scenes}}{{action}}{{rotation}}{{sources}}"
 AdvSceneSwitcher.action.file="Dosya"
 AdvSceneSwitcher.action.file.type.write="Yaz"
 AdvSceneSwitcher.action.file.type.append="Ekle"
@@ -527,6 +534,31 @@ AdvSceneSwitcher.videoTab.ignoreInactiveSource="Kaynak etkin olmadığı sürece
 AdvSceneSwitcher.videoTab.entry="Zaman {{videoSources}} {{condition}} {{filePath}} {{browseButton}} için {{duration}} şuna dönüştür {{scenes}} kullan {{transitions}} {{ignoreInactiveSource}}"
 AdvSceneSwitcher.videoTab.help="<html><head/><body><p>Bu sekme, seçilen kaynakların mevcut video çıkışına göre sahneler arasında geçiş yapmanızı sağlar.<br/><a href=\"https:// adresini kontrol ettiğinizden emin olun. obsproject.com/forum/resources/pixel-match-switcher.1202/\"><span style=\" text-decoration: underline; color:#268bd2;\">Pixel Match Switcher</span></a> bu işlevin daha da iyi bir şekilde uygulanması için.<br/><br/> Devam etmek için vurgulanan artı simgesini tıklayın.</p></body></html>"
 
+; Network Tab
+AdvSceneSwitcher.networkTab.title="Ağ"
+AdvSceneSwitcher.networkTab.description="Bu sekme, başka bir OBS örneğinin etkin sahnesini uzaktan kontrol etmenizi sağlar.\nSahne adlarının tüm OBS örneklerinde tam olarak eşleşmesi gerektiğini lütfen unutmayın."
+AdvSceneSwitcher.networkTab.warning="Sunucuyu yerel bir ağın dışında çalıştırmak, üçüncü tarafların aktif sahneyi okumasına izin verecektir."
+AdvSceneSwitcher.networkTab.server="Sunucuyu başlat (Bağlı tüm istemcilere sahne değiştirme mesajları gönderir)"
+AdvSceneSwitcher.networkTab.server.port="Port"
+AdvSceneSwitcher.networkTab.server.lockToIPv4="Sunucuyu yalnızca IPv4 kullanacak şekilde kilitleyin"
+AdvSceneSwitcher.networkTab.server.sendSceneChange="Sahne değişiklikleri için mesaj gönder"
+AdvSceneSwitcher.networkTab.server.restrictSendToAutomatedSwitches="Yalnızca otomatik sahne anahtarları için mesaj gönder"
+AdvSceneSwitcher.networkTab.server.sendPreview="Stüdyo modunda çalışırken önizleme sahnesi değişikliği için mesajlar gönderin"
+AdvSceneSwitcher.networkTab.startFailed.message="WebSockets sunucusu başlatılamadı, bunun nedeni şunlar olabilir:\n - %1 TCP bağlantı noktası şu anda bu sistemde başka bir yerde, muhtemelen başka bir uygulama tarafından kullanılıyor olabilir. WebSocket sunucu ayarlarında farklı bir TCP bağlantı noktası ayarlamayı deneyin veya bu bağlantı noktasını kullanabilecek herhangi bir uygulamayı durdurun.\n - Hata mesajı: %2"
+AdvSceneSwitcher.networkTab.server.status.currentStatus="Şu anki durum"
+AdvSceneSwitcher.networkTab.server.status.notRunning="Çalışmıyor"
+AdvSceneSwitcher.networkTab.server.status.starting="Başlangıç"
+AdvSceneSwitcher.networkTab.server.status.running="Çalışıyor"
+AdvSceneSwitcher.networkTab.server.restart="Sunucuyu yeniden başlat"
+AdvSceneSwitcher.networkTab.client="İstemciyi başlat (Sahne değiştirme mesajlarını alır)"
+AdvSceneSwitcher.networkTab.client.address="Ana makine adı veya IP adresi"
+AdvSceneSwitcher.networkTab.client.port="Port"
+AdvSceneSwitcher.networkTab.client.status.currentStatus="Şu anki durum"
+AdvSceneSwitcher.networkTab.client.status.disconnected="Bağlantı kesildi"
+AdvSceneSwitcher.networkTab.client.status.connecting="Bağlanıyor"
+AdvSceneSwitcher.networkTab.client.status.connected="Bağlandı"
+AdvSceneSwitcher.networkTab.client.reconnect="Yeniden bağlanmaya zorla"
+
 ; Scene Group Tab
 AdvSceneSwitcher.sceneGroupTab.title="Sahne Grubu"
 AdvSceneSwitcher.sceneGroupTab.list="Sahne Grupları"
@@ -547,6 +579,30 @@ AdvSceneSwitcher.sceneGroupTab.exists="Sahne Grubu veya Sahne adı zaten var"
 AdvSceneSwitcher.sceneGroupTab.help="Sahne Grupları, normal bir sahne gibi bir hedef olarak seçilebilir.\n\nAdından da anlaşılacağı gibi, bir sahne grubu birden fazla sahneden oluşan bir koleksiyondur.\nSahne grubu, yapılandırılmış ayarlara bağlı olarak kendisine atanan sahneler listesinde ilerleyecektir. sağ tarafta bulunabilir.\n\nSahne grubunu listedeki bir sonraki sahneye geçecek şekilde yapılandırabilirsiniz:\nSahne grubu birkaç kez hedef olarak seçildikten sonra.\nBelirli bir süre sonra geçti.\nVeya rastgele.\n\nÖrneğin, sahneleri içeren bir sahne grubu ...\nSahne 1\nSahne 2\nSahne 3 \n... ilk seçildiğinde \"Sahne 1\"i etkinleştirecek bir hedef olarak.\nİkinci kez \"Sahne 2\"yi etkinleştirecek.\nKalan zamanlar \"Scene 3\" etkinleştirilecek.\n\nYeni bir sahne grubu eklemek için aşağıdaki vurgulanan artı sembolüne tıklayın."
 AdvSceneSwitcher.sceneGroupTab.scenes.help="Soldan değiştirmek istediğiniz sahne grubunu seçin.\n\nYukarıdaki sahneyi seçip aşağıdaki artı simgesini tıklayarak bu sahne grubuna eklemek için bir sahne seçin.\n\nAynı sahneye birden fazla sahne eklenebilir grup."
 
+; Scene Trigger Tab
+AdvSceneSwitcher.sceneTriggerTab.title="Sahne Tetikleyicileri"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.none="--tetikleyiciyi seçin--"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneActive="aktif"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneInactive="aktif değil"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneLeave="uzaklaştı"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.none="--eylemi seç--"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startRecording="Kayda başla"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.pauseRecording="Kaydı duraklat"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.unpauseRecording="kaydı duraklatma"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopRecording="Kaydetmeyi bırak"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopStreaming="Akışı durdur"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startStreaming="Akışı başlat"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startReplayBuffer="Yeniden oynatma arabelleğini başlat"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopReplayBuffer="Tekrar arabelleğini durdur"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.muteSource="Kaynağı sessize al"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.unmuteSource="Kaynağı sesi aç"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startSwitcher="Sahne değiştiriciyi başlat"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopSwitcher="Sahne değiştiriciyi durdur"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startVirtualCamera="Sanal kamerayı başlat"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopVirtualCamera="Sanal kamerayı durdur"
+AdvSceneSwitcher.sceneTriggerTab.entry="Şundan {{scenes}} {{triggers}} {{actions}} {{audioSources}} sonra {{duration}}"
+AdvSceneSwitcher.sceneTriggerTab.help="Bu sekme, kaydı veya akışı durdurma gibi sahne değişikliklerinde eylemleri tetiklemenize olanak tanır."
+
 ; Hotkey
 AdvSceneSwitcher.hotkey.startSwitcherHotkey="Advanced Scene Switcher'ı başlatın"
 AdvSceneSwitcher.hotkey.stopSwitcherHotkey="Gelişmiş Sahne Değiştiriciyi Durdurun"
@@ -594,7 +650,7 @@ AdvSceneSwitcher.stopped="Eklenti durdu"
 AdvSceneSwitcher.firstBootMessage="<html><head/><body><p>Gelişmiş Sahne Değiştirici ilk kez başlatılıyor gibi görünüyor.<br>Lütfen <a href=\"https://github.com/ adresine bir göz atın. WarmUpTill/SceneSwitcher/wiki\"><span style=\" text-decoration: underline; color:#268bd2;\">Wiki</span></a> için kılavuzlar ve örnekler listesi.<br>Yapmayın. eklentinin <a href=\"https://obsproject.com/forum/threads/advanced-scene-switcher.48264\"><span style=\" text-decoration: underline; color:# sayfasında soru sormaktan çekinmeyin OBS forumlarında 268bd2;\">konu</span></a>!</p></body></html>"
 
 AdvSceneSwitcher.unit.milliseconds="millisaniye"
-AdvSceneSwitcher.unit.seconds="saniye"
+AdvSceneSwitcher.unit.secends="saniye"
 AdvSceneSwitcher.unit.minutes="dakika"
 AdvSceneSwitcher.unit.hours="saat"
 AdvSceneSwitcher.duration.condition.none="Zaman kısıtlaması yok"

data/locale/zh-CN.ini

@@ -19,11 +19,11 @@ AdvSceneSwitcher.generalTab.status.autoStart.streaming="推流"
 AdvSceneSwitcher.generalTab.status.autoStart.recordingAndStreaming="录制和推流"
 AdvSceneSwitcher.generalTab.status.checkInterval="检查切换条件时间间隔"
 AdvSceneSwitcher.generalTab.generalBehavior="全局行为"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch="如果不符合任何切换条件"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatchDelay.tooltip="时间精度最高只能达到配置的轮询间隔"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.dontSwitch="不切换"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchToRandom="切换到随机场景列表中任意随机场景"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchTo="切换到"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet="如果不符合任何切换条件"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMetDelayTooltip="时间精度最高只能达到配置的轮询间隔"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.dontSwitch="不切换"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.switchToRandom="切换到随机场景列表中任意随机场景"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.switchTo="切换到"
 AdvSceneSwitcher.generalTab.generalBehavior.cooldown="执行完操作后，跳过执行操作，为"
 AdvSceneSwitcher.generalTab.generalBehavior.cooldownHint="在此期间，可能的匹配项将被忽略!"
 AdvSceneSwitcher.generalTab.generalBehavior.verboseLogging="详细日志输出"
@@ -101,7 +101,7 @@ AdvSceneSwitcher.macroTab.highlightExecutedMacros="突出显示最近执行的
 AdvSceneSwitcher.macroTab.highlightTrueConditions="突出显示最近运算为 真 的当前选定宏的条件"
 AdvSceneSwitcher.macroTab.highlightPerformedActions="突出显示当前选定宏的最近执行的操作"
 AdvSceneSwitcher.macroTab.newMacroRegisterHotkey="使用快捷键控制新增宏的暂停状态"
-AdvSceneSwitcher.macroTab.currentRegisterHotkeys="使用快捷键控制所选宏的暂停状态"
+AdvSceneSwitcher.macroTab.currentDisableHotkeys="使用快捷键控制所选宏的暂停状态"
 AdvSceneSwitcher.macroTab.currentRegisterDock="注册停靠小部件以控制所选宏的暂停状态或手动运行它"
 AdvSceneSwitcher.macroTab.currentDockAddRunButton="添加按钮以运行宏"
 AdvSceneSwitcher.macroTab.currentDockAddPauseButton="添加按钮以暂停或取消暂停宏"
@@ -159,6 +159,8 @@ AdvSceneSwitcher.condition.scene.type.currentPattern="当前场景匹配"
 AdvSceneSwitcher.condition.scene.type.previousPattern="上一个场景匹配"
 AdvSceneSwitcher.condition.scene.currentSceneTransitionBehaviour="在转场过程中检查转场源场景"
 AdvSceneSwitcher.condition.scene.previousSceneTransitionBehaviour="在转场过程中检查转场源场景"
+AdvSceneSwitcher.condition.scene.entry.line1="{{sceneType}}{{scenes}}{{pattern}}"
+AdvSceneSwitcher.condition.scene.entry.line2="{{useTransitionTargetScene}}"
 AdvSceneSwitcher.condition.window="窗口"
 AdvSceneSwitcher.condition.window.entry.window="{{checkTitle}}窗口标题匹配{{windowRegex}}{{windows}}"
 AdvSceneSwitcher.condition.window.entry.fullscreen="{{fullscreen}}窗口为全屏"
@@ -182,7 +184,7 @@ AdvSceneSwitcher.condition.media.source="源"
 AdvSceneSwitcher.condition.media.anyOnScene="任何媒体源"
 AdvSceneSwitcher.condition.media.allOnScene="所有媒体源"
 AdvSceneSwitcher.condition.media.inconsistencyInfo="不幸的是，并非所有媒体源类型的行为都相同（例如，媒体源与VLC视频源“停止”状态）。\n所以，请尝试适合您的设置！"
-AdvSceneSwitcher.condition.media.layout.legacy="{{sourceTypes}}{{mediaSources}}{{scenes}}{{checkTypes}}的状态是{{states}}和{{timeRestrictions}}{{time}}"
+AdvSceneSwitcher.condition.media.entry="{{sourceTypes}}{{mediaSources}}{{scenes}} 的状态是 {{states}} 和 {{timeRestrictions}}{{time}}"
 AdvSceneSwitcher.condition.video="视频"
 AdvSceneSwitcher.condition.video.condition.match="完全匹配"
 AdvSceneSwitcher.condition.video.condition.differ="不匹配"
@@ -363,7 +365,10 @@ AdvSceneSwitcher.condition.date.entry.nextMatchDate="下一次匹配 在: %1"
 AdvSceneSwitcher.condition.date.entry.updateOnRepeat="{{updateOnRepeat}} 重复时,将选定的日期更新为重复日期"
 AdvSceneSwitcher.condition.sceneTransform="场景项目被改变"
 AdvSceneSwitcher.condition.sceneTransform.getTransform="内容或者设置被改变了"
-AdvSceneSwitcher.condition.sceneTransform.condition.match="匹配变换"
+AdvSceneSwitcher.condition.sceneTransform.entry.line1="在 {{scenes}} {{sources}} {{types}}"
+AdvSceneSwitcher.condition.sceneTransform.entry.type.matches="匹配变换"
+AdvSceneSwitcher.condition.sceneTransform.entry.line2="{{settings}}"
+AdvSceneSwitcher.condition.sceneTransform.entry.line3="{{regex}} {{getSettings}}"
 AdvSceneSwitcher.condition.transition="转场"
 AdvSceneSwitcher.condition.transition.type.current="当前转场特效类型为"
 AdvSceneSwitcher.condition.transition.type.duration="当前转场特效持续时间为"
@@ -429,7 +434,6 @@ AdvSceneSwitcher.condition.run="运行"
 AdvSceneSwitcher.condition.run.entry="进程在超时 {{timeout}} 秒之前退出"
 AdvSceneSwitcher.condition.run.entry.exit="{{checkExitCode}}检查退出代码{{exitCode}}"
 AdvSceneSwitcher.condition.midi="MIDI"
-AdvSceneSwitcher.condition.midi.entry="从{{device}} 收到的信息,符合:(从不咕咕的阿坤:这个好像是声卡工作是录音相关的功能,英文太抽象了,我就硬译过来了,如有相关设备,音乐好的,可以根据英文翻译好发给我!)"
 AdvSceneSwitcher.condition.midi.entry.listen="将MIDI信息选择设置为从选定设备上接收的信息: {{listenButton}}"
 AdvSceneSwitcher.condition.display="显示器"
 AdvSceneSwitcher.condition.display.type.displayName="连接的显示器的名称匹配"
@@ -476,6 +480,7 @@ AdvSceneSwitcher.action.replay.saveWarn="警告：保存过于频繁可能会导
 AdvSceneSwitcher.action.replay.type.stop="停止回放缓存"
 AdvSceneSwitcher.action.replay.type.start="启动回放缓存"
 AdvSceneSwitcher.action.replay.type.save="保存回放缓存"
+AdvSceneSwitcher.action.replay.entry="{{actions}}"
 AdvSceneSwitcher.action.streaming="推流"
 AdvSceneSwitcher.action.streaming.type.stop="停止推流"
 AdvSceneSwitcher.action.streaming.type.start="开始推流"
@@ -518,6 +523,7 @@ AdvSceneSwitcher.action.macro.type.unpause="取消暂停"
 AdvSceneSwitcher.action.macro.type.resetCounter="复位计数器"
 AdvSceneSwitcher.action.macro.type.run="运行操作"
 AdvSceneSwitcher.action.macro.type.stop="停止操作"
+AdvSceneSwitcher.action.macro.entry="{{actions}}{{actionIndex}}{{macros}}"
 AdvSceneSwitcher.action.pluginState="插件状态"
 AdvSceneSwitcher.action.pluginState.type.stop="停止高级场景切换插件"
 AdvSceneSwitcher.action.pluginState.type.noMatch="没有匹配项时:"
@@ -550,7 +556,7 @@ AdvSceneSwitcher.action.sceneOrder.type.movePosition="移动到数值位置"
 AdvSceneSwitcher.action.sceneOrder.entry="在 {{scenes}} {{actions}} {{sources}} {{position}}"
 AdvSceneSwitcher.action.sceneTransform="场景项目转换"
 AdvSceneSwitcher.action.sceneTransform.getTransform="获得转换"
-AdvSceneSwitcher.action.sceneTransform.entry="在{{scenes}}{{action}}{{rotation}}{{sources}}{{settingSelection}}{{singleSettingValue}}"
+AdvSceneSwitcher.action.sceneTransform.entry="在 {{scenes}}{{action}}{{rotation}}{{sources}}"
 AdvSceneSwitcher.action.file="文件"
 AdvSceneSwitcher.action.file.type.write="写入"
 AdvSceneSwitcher.action.file.type.append="追加写入"
@@ -590,7 +596,7 @@ AdvSceneSwitcher.action.screenshot.type.source="来源"
 AdvSceneSwitcher.action.screenshot.type.scene="场景"
 AdvSceneSwitcher.action.screenshot.mainOutput="OBS 预览画面"
 AdvSceneSwitcher.action.screenshot.blackscreenNote="源和场景并不总是呈现，可能会导致屏幕截图的某些部分保持空白。"
-AdvSceneSwitcher.action.screenshot.entry="截图{{targetType}}{{sources}}{{scenes}}保存在{{saveType}}{{variables}}位置"
+AdvSceneSwitcher.action.screenshot.entry="截图{{targetType}}{{sources}}{{scenes}}保存在{{saveType}}位置"
 AdvSceneSwitcher.action.profile="配置文件"
 AdvSceneSwitcher.action.profile.entry="将活动配置文件切换到 {{profiles}}"
 AdvSceneSwitcher.action.sceneCollection="场景集合"
@@ -818,6 +824,31 @@ AdvSceneSwitcher.videoTab.entry="当 {{videoSources}} {{condition}} {{filePath}}
 AdvSceneSwitcher.videoTab.ignoreInactiveSource="除非源处于非活动状态"
 AdvSceneSwitcher.videoTab.help="<html><head/><body><p>此选项卡将允许您根据选定源的当前视频输出切换场景。<br/>请确保退出 <a href=\"https://obsproject.com/forum/resources/pixel-match-switcher.1202/\"><span style=\" text-decoration: underline; color:#268bd2;\">Pixel Match Switcher</span></a> 以便更好地实现此功能.<br/><br/> 单击高亮显示的加号继续.</p></body></html>"
 
+; Network Tab
+AdvSceneSwitcher.networkTab.title="网络"
+AdvSceneSwitcher.networkTab.description="此选项卡将允许您远程控制另一个OBS实例的活动场景。\n请注意，所有OBS实例上的场景名称必须完全匹配."
+AdvSceneSwitcher.networkTab.warning="在本地网络之外运行服务器将允许第三方读取活动场景."
+AdvSceneSwitcher.networkTab.server="启动服务器（向所有连接的客户端发送场景切换消息）"
+AdvSceneSwitcher.networkTab.server.port="端口"
+AdvSceneSwitcher.networkTab.server.lockToIPv4="锁定为仅使用IPv4将服务器"
+AdvSceneSwitcher.networkTab.server.sendSceneChange="发送更改场景的消息"
+AdvSceneSwitcher.networkTab.server.restrictSendToAutomatedSwitches="仅为自动场景切换发送消息"
+AdvSceneSwitcher.networkTab.server.sendPreview="在Studio模式下运行时发送预览场景更改消息"
+AdvSceneSwitcher.networkTab.startFailed.message="WebSockets服务器无法启动，可能是因为：\n-TCP端口%1当前可能正在该系统的其他位置使用，可能是由其他应用程序使用。请尝试在WebSocket服务器设置中设置其他TCP端口，或停止可能正在使用此端口的任何应用程序。\n-错误消息: %2"
+AdvSceneSwitcher.networkTab.server.status.currentStatus="状态"
+AdvSceneSwitcher.networkTab.server.status.notRunning="未运行"
+AdvSceneSwitcher.networkTab.server.status.starting="启动中"
+AdvSceneSwitcher.networkTab.server.status.running="运行中"
+AdvSceneSwitcher.networkTab.server.restart="重新启动服务"
+AdvSceneSwitcher.networkTab.client="启动客户端（接收场景切换消息）"
+AdvSceneSwitcher.networkTab.client.address="主机名或IP地址"
+AdvSceneSwitcher.networkTab.client.port="端口"
+AdvSceneSwitcher.networkTab.client.status.currentStatus="状态"
+AdvSceneSwitcher.networkTab.client.status.disconnected="未连接"
+AdvSceneSwitcher.networkTab.client.status.connecting="连接中"
+AdvSceneSwitcher.networkTab.client.status.connected="已连接"
+AdvSceneSwitcher.networkTab.client.reconnect="强制重新连接"
+
 ; Scene Group Tab
 AdvSceneSwitcher.sceneGroupTab.title="场景组"
 AdvSceneSwitcher.sceneGroupTab.list="场景组"
@@ -838,6 +869,30 @@ AdvSceneSwitcher.sceneGroupTab.exists="场景组或场景名称已存在"
 AdvSceneSwitcher.sceneGroupTab.help="可以选择场景组作为目标，就像选择常规场景一样。\n\n名称表明场景组是多个场景的集合。\n场景组将根据配置的设置在其指定场景的列表中前进，可以在右侧找到。\n\n您可以将场景组配置为前进到列表中的下一个场景：\n在多次选择场景组作为目标后。\n在经过一定时间后。\n也可以是随机的。\n\n例如，包含场景的场景组…\n场景1\n场景2\n场景3\n。。。将在第一次选择“场景1”作为目标时激活它。\n第二次将激活“场景2”\n剩余时间将激活“场景3”。\n\n单击下面突出显示的加号以添加新的场景组."
 AdvSceneSwitcher.sceneGroupTab.scenes.help="在左侧选择要修改的场景组。\n\n通过选择上面的场景并单击下面的加号，选择要添加到此场景组的场景。\n\n可以多次将场景添加到同一场景组."
 
+; Scene Trigger Tab
+AdvSceneSwitcher.sceneTriggerTab.title="场景触发器"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.none="--选择触发器--"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneActive="已激活"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneInactive="未激活"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneLeave="离开"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.none="--选择动作--"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startRecording="开始录制"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.pauseRecording="暂停录制"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.unpauseRecording="取消暂停录制"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopRecording="停止录制"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopStreaming="停止推流"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startStreaming="开始推流"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startReplayBuffer="启动重播缓冲区"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopReplayBuffer="停止重放缓冲区"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.muteSource="静音源"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.unmuteSource="取消静音源"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startSwitcher="启动场景切换程序"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopSwitcher="停止场景切换"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startVirtualCamera="启动虚拟摄像机"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopVirtualCamera="停止虚拟摄像机"
+AdvSceneSwitcher.sceneTriggerTab.entry="当 {{scenes}} {{triggers}} {{actions}} {{audioSources}} 在 {{duration}} 后"
+AdvSceneSwitcher.sceneTriggerTab.help="此选项卡允许您在场景更改时触发操作，如停止录制或流式处理."
+
 ; Hotkey
 AdvSceneSwitcher.hotkey.startSwitcherHotkey="启动高级场景切换器"
 AdvSceneSwitcher.hotkey.stopSwitcherHotkey="停止高级场景切换器"
@@ -997,7 +1052,7 @@ AdvSceneSwitcher.firstBootMessage="<html><head/><body><p>这似乎是第一次
 AdvSceneSwitcher.deprecatedTabWarning="此选项卡的开发已停止！请考虑转换为使用宏来代替。\n可以在“常规”选项卡上禁用此提示."
 
 AdvSceneSwitcher.unit.milliseconds="毫秒"
-AdvSceneSwitcher.unit.seconds="秒"
+AdvSceneSwitcher.unit.secends="秒"
 AdvSceneSwitcher.unit.minutes="分钟"
 AdvSceneSwitcher.unit.hours="小时"
 AdvSceneSwitcher.duration.condition.none="没有时间限制"

deps/obs-websocket/lib/obs-websocket-api.h

@@ -29,8 +29,7 @@ extern "C" {
 #endif
 
 typedef void *obs_websocket_vendor;
-typedef void (*obs_websocket_request_callback_function)(obs_data_t *,
-							obs_data_t *, void *);
+typedef void (*obs_websocket_request_callback_function)(obs_data_t *, obs_data_t *, void *);
 
 struct obs_websocket_request_response {
 	unsigned int status_code;
@@ -45,7 +44,7 @@ struct obs_websocket_request_callback {
 	void *priv_data;
 };
 
-static proc_handler_t *_ph;
+inline proc_handler_t *_ph;
 
 /* ==================== INTERNAL API FUNCTIONS ==================== */
 
@@ -54,10 +53,9 @@ static inline proc_handler_t *obs_websocket_get_ph(void)
 	proc_handler_t *global_ph = obs_get_proc_handler();
 	assert(global_ph != NULL);
 
-	calldata_t cd = {0, 0, 0, 0};
+	calldata_t cd = {0};
 	if (!proc_handler_call(global_ph, "obs_websocket_api_get_ph", &cd))
-		blog(LOG_DEBUG,
-		     "Unable to fetch obs-websocket proc handler object. obs-websocket not installed?");
+		blog(LOG_DEBUG, "Unable to fetch obs-websocket proc handler object. obs-websocket not installed?");
 	proc_handler_t *ret = (proc_handler_t *)calldata_ptr(&cd, "ph");
 	calldata_free(&cd);
 
@@ -71,9 +69,7 @@ static inline bool obs_websocket_ensure_ph(void)
 	return _ph != NULL;
 }
 
-static inline bool
-obs_websocket_vendor_run_simple_proc(obs_websocket_vendor vendor,
-				     const char *proc_name, calldata_t *cd)
+static inline bool obs_websocket_vendor_run_simple_proc(obs_websocket_vendor vendor, const char *proc_name, calldata_t *cd)
 {
 	if (!obs_websocket_ensure_ph())
 		return false;
@@ -95,12 +91,12 @@ static inline unsigned int obs_websocket_get_api_version(void)
 	if (!obs_websocket_ensure_ph())
 		return 0;
 
-	calldata_t cd = {0, 0, 0, 0};
+	calldata_t cd = {0};
 
 	if (!proc_handler_call(_ph, "get_api_version", &cd))
 		return 1; // API v1 does not include get_api_version
 
-	unsigned int ret = (unsigned int)calldata_int(&cd, "version");
+	unsigned int ret = calldata_int(&cd, "version");
 
 	calldata_free(&cd);
 
@@ -108,12 +104,7 @@ static inline unsigned int obs_websocket_get_api_version(void)
 }
 
 // Calls an obs-websocket request. Free response with `obs_websocket_request_response_free()`
-static inline struct obs_websocket_request_response *
-obs_websocket_call_request(const char *request_type, obs_data_t *request_data
-#ifdef __cplusplus
-						     = NULL
-#endif
-)
+static inline obs_websocket_request_response *obs_websocket_call_request(const char *request_type, obs_data_t *request_data = NULL)
 {
 	if (!obs_websocket_ensure_ph())
 		return NULL;
@@ -122,16 +113,14 @@ obs_websocket_call_request(const char *request_type, obs_data_t *request_data
 	if (request_data)
 		request_data_string = obs_data_get_json(request_data);
 
-	calldata_t cd = {0, 0, 0, 0};
+	calldata_t cd = {0};
 
 	calldata_set_string(&cd, "request_type", request_type);
 	calldata_set_string(&cd, "request_data", request_data_string);
 
 	proc_handler_call(_ph, "call_request", &cd);
 
-	struct obs_websocket_request_response *ret =
-		(struct obs_websocket_request_response *)calldata_ptr(
-			&cd, "response");
+	auto ret = (struct obs_websocket_request_response *)calldata_ptr(&cd, "response");
 
 	calldata_free(&cd);
 
@@ -139,8 +128,7 @@ obs_websocket_call_request(const char *request_type, obs_data_t *request_data
 }
 
 // Free a request response object returned by `obs_websocket_call_request()`
-static inline void obs_websocket_request_response_free(
-	struct obs_websocket_request_response *response)
+static inline void obs_websocket_request_response_free(struct obs_websocket_request_response *response)
 {
 	if (!response)
 		return;
@@ -156,13 +144,12 @@ static inline void obs_websocket_request_response_free(
 
 // ALWAYS CALL ONLY VIA `obs_module_post_load()` CALLBACK!
 // Registers a new "vendor" (Example: obs-ndi)
-static inline obs_websocket_vendor
-obs_websocket_register_vendor(const char *vendor_name)
+static inline obs_websocket_vendor obs_websocket_register_vendor(const char *vendor_name)
 {
 	if (!obs_websocket_ensure_ph())
 		return NULL;
 
-	calldata_t cd = {0, 0, 0, 0};
+	calldata_t cd = {0};
 
 	calldata_set_string(&cd, "name", vendor_name);
 
@@ -174,37 +161,32 @@ obs_websocket_register_vendor(const char *vendor_name)
 }
 
 // Registers a new request for a vendor
-static inline bool obs_websocket_vendor_register_request(
-	obs_websocket_vendor vendor, const char *request_type,
-	obs_websocket_request_callback_function request_callback,
-	void *priv_data)
+static inline bool obs_websocket_vendor_register_request(obs_websocket_vendor vendor, const char *request_type,
+							 obs_websocket_request_callback_function request_callback, void *priv_data)
 {
-	calldata_t cd = {0, 0, 0, 0};
+	calldata_t cd = {0};
 
-	struct obs_websocket_request_callback cb = {request_callback,
-						    priv_data};
+	struct obs_websocket_request_callback cb = {};
+	cb.callback = request_callback;
+	cb.priv_data = priv_data;
 
 	calldata_set_string(&cd, "type", request_type);
 	calldata_set_ptr(&cd, "callback", &cb);
 
-	bool success = obs_websocket_vendor_run_simple_proc(
-		vendor, "vendor_request_register", &cd);
+	bool success = obs_websocket_vendor_run_simple_proc(vendor, "vendor_request_register", &cd);
 	calldata_free(&cd);
 
 	return success;
 }
 
 // Unregisters an existing vendor request
-static inline bool
-obs_websocket_vendor_unregister_request(obs_websocket_vendor vendor,
-					const char *request_type)
+static inline bool obs_websocket_vendor_unregister_request(obs_websocket_vendor vendor, const char *request_type)
 {
-	calldata_t cd = {0, 0, 0, 0};
+	calldata_t cd = {0};
 
 	calldata_set_string(&cd, "type", request_type);
 
-	bool success = obs_websocket_vendor_run_simple_proc(
-		vendor, "vendor_request_unregister", &cd);
+	bool success = obs_websocket_vendor_run_simple_proc(vendor, "vendor_request_unregister", &cd);
 	calldata_free(&cd);
 
 	return success;
@@ -212,17 +194,14 @@ obs_websocket_vendor_unregister_request(obs_websocket_vendor vendor,
 
 // Does not affect event_data refcount.
 // Emits an event under the vendor's name
-static inline bool obs_websocket_vendor_emit_event(obs_websocket_vendor vendor,
-						   const char *event_name,
-						   obs_data_t *event_data)
+static inline bool obs_websocket_vendor_emit_event(obs_websocket_vendor vendor, const char *event_name, obs_data_t *event_data)
 {
-	calldata_t cd = {0, 0, 0, 0};
+	calldata_t cd = {0};
 
 	calldata_set_string(&cd, "type", event_name);
 	calldata_set_ptr(&cd, "data", (void *)event_data);
 
-	bool success = obs_websocket_vendor_run_simple_proc(
-		vendor, "vendor_event_emit", &cd);
+	bool success = obs_websocket_vendor_run_simple_proc(vendor, "vendor_event_emit", &cd);
 	calldata_free(&cd);
 
 	return success;

lib/advanced-scene-switcher.cpp

@@ -14,8 +14,8 @@
 #include "tab-helpers.hpp"
 #include "utility.hpp"
 #include "version.h"
-#include "websocket-api.hpp"
 
+#include <filesystem>
 #include <obs-frontend-api.h>
 #include <QAction>
 #include <QDirIterator>
@@ -70,9 +70,6 @@ static void DisplayMissingDependencyWarning()
 	QString warning(obs_module_text(
 		"AdvSceneSwitcher.generalTab.generalBehavior.warnPluginLoadFailureMessage"));
 	DisplayMessage(warning.arg(failedLibsString));
-
-	// Only display the warning once per plugin load
-	switcher->loadFailureLibs.clear();
 }
 
 static void DisplayMissingDataDirWarning()
@@ -85,32 +82,18 @@ static void DisplayMissingDataDirWarning()
 		      "Please check installation instructions!\n\n"
 		      "Data most likely expected at:\n\n";
 #ifdef _WIN32
-
-	msg += QDir::currentPath();
+	msg += QString::fromStdString(
+		(std::filesystem::current_path().string()));
 	msg += "/";
 #endif
 	msg += obs_get_module_data_path(obs_current_module());
 	DisplayMessage(msg);
 }
 
-bool CanCreateDefaultAction();
-bool CanCreateDefaultCondition();
-
-static void DisplayCorruptedInstallWarning()
-{
-	if (CanCreateDefaultAction() && CanCreateDefaultCondition()) {
-		return;
-	}
-
-	DisplayMessage(obs_module_text(
-		"AdvSceneSwitcher.generalTab.generalBehavior.warnCorruptedInstallMessage"));
-}
-
 void AdvSceneSwitcher::LoadUI()
 {
 	DisplayMissingDataDirWarning();
 	DisplayMissingDependencyWarning();
-	DisplayCorruptedInstallWarning();
 
 	SetupGeneralTab();
 	SetupTitleTab();
@@ -126,7 +109,9 @@ void AdvSceneSwitcher::LoadUI()
 	SetupTimeTab();
 	SetupAudioTab();
 	SetupVideoTab();
+	SetupNetworkTab();
 	SetupSceneGroupTab();
+	SetupTriggerTab();
 	SetupMacroTab();
 	SetupOtherTabs(ui->tabWidget);
 
@@ -253,9 +238,9 @@ void SwitcherData::Thread()
 			duration = std::chrono::milliseconds(interval) +
 				   std::chrono::milliseconds(linger) - runTime;
 			if (duration.count() < 1) {
-				vblog(LOG_INFO,
-				      "detected busy loop - refusing to sleep less than 1ms");
-				duration = std::chrono::milliseconds(10);
+				blog(LOG_INFO,
+				     "detected busy loop - refusing to sleep less than 1ms");
+				duration = std::chrono::milliseconds(50);
 			}
 		}
 
@@ -455,8 +440,15 @@ void SwitcherData::Start()
 
 		// Will be overwritten quickly but might be useful
 		writeToStatusFile("Advanced Scene Switcher running");
-		SendWebsocketVendorEvent("AdvancedSceneSwitcherStarted",
-					 nullptr);
+	}
+
+	if (networkConfig.ServerEnabled) {
+		server.start(networkConfig.ServerPort,
+			     networkConfig.LockToIPv4);
+	}
+
+	if (networkConfig.ClientEnabled) {
+		client.connect(networkConfig.GetClientUri());
 	}
 
 	if (showSystemTrayNotifications) {
@@ -484,12 +476,11 @@ void SwitcherData::Stop()
 		delete th;
 		th = nullptr;
 		writeToStatusFile("Advanced Scene Switcher stopped");
-		if (!obsIsShuttingDown) {
-			SendWebsocketVendorEvent("AdvancedSceneSwitcherStopped",
-						 nullptr);
-		}
 	}
 
+	server.stop();
+	client.disconnect();
+
 	if (showSystemTrayNotifications) {
 		DisplayTrayMessage(
 			obs_module_text("AdvSceneSwitcher.pluginName"),
@@ -557,7 +548,12 @@ static void handleSceneChange()
 		      GetWeakSourceName(switcher->previousScene).c_str());
 	}
 
+	switcher->checkTriggers();
 	switcher->checkDefaultSceneTransitions();
+
+	if (switcher->networkConfig.ShouldSendFrontendSceneChange()) {
+		switcher->server.sendMessage({ws.Get(), nullptr, 0});
+	}
 }
 
 static void setLiveTime()
@@ -586,6 +582,17 @@ static void checkAutoStartStreaming()
 		switcher->Start();
 }
 
+static void handlePeviewSceneChange()
+{
+	if (switcher->networkConfig.ShouldSendPrviewSceneChange()) {
+		OBSSourceAutoRelease source =
+			obs_frontend_get_current_preview_scene();
+		OBSWeakSourceAutoRelease weak =
+			obs_source_get_weak_source(source);
+		switcher->server.sendMessage({weak.Get(), nullptr, 0}, true);
+	}
+}
+
 static void handleTransitionEnd()
 {
 	GetMacroTransitionCV().notify_all();
@@ -663,6 +670,9 @@ static void OBSEvent(enum obs_frontend_event event, void *switcher)
 	case OBS_FRONTEND_EVENT_SCENE_CHANGED:
 		handleSceneChange();
 		break;
+	case OBS_FRONTEND_EVENT_PREVIEW_SCENE_CHANGED:
+		handlePeviewSceneChange();
+		break;
 	case OBS_FRONTEND_EVENT_RECORDING_STARTED:
 		setLiveTime();
 		checkAutoStartRecording();
@@ -695,7 +705,7 @@ static void LoadPlugins()
 {
 	QFileInfo libPath(
 		QString(obs_get_module_binary_path(obs_current_module())));
-	QString pluginDir(libPath.absolutePath() + "/" ADVSS_PLUGIN_FOLDER);
+	QString pluginDir(libPath.absolutePath() + "/adv-ss-plugins");
 #ifdef _WIN32
 	QString libPattern = "*.dll";
 	SetDllDirectory(pluginDir.toStdWString().c_str());
@@ -735,34 +745,9 @@ void OpenSettingsWindow()
 	}
 }
 
-void AdvSceneSwitcher::HighligthMacroSettingsButton(bool enable)
+QWidget *GetSettingsWindow()
 {
-	static QObject *highlight = nullptr;
-	if ((highlight && enable) || (!highlight && !enable)) {
-		return;
-	}
-
-	if (highlight && !enable) {
-		highlight->deleteLater();
-		highlight = nullptr;
-		return;
-	}
-
-	if (!HighlightUIElementsEnabled()) {
-		return;
-	}
-
-	highlight = HighlightWidget(ui->macroSettings, Qt::green);
-}
-
-void HighligthMacroSettingsButton(bool enable)
-{
-	auto window = GetSettingsWindow();
-	if (!window) {
-		return;
-	}
-	static_cast<AdvSceneSwitcher *>(window)->HighligthMacroSettingsButton(
-		enable);
+	return SettingsWindowIsOpened() ? AdvSceneSwitcher::window : nullptr;
 }
 
 void SetupActionQueues();

lib/advanced-scene-switcher.hpp

@@ -1,6 +1,5 @@
 #pragma once
 #include "macro-segment-list.hpp"
-#include "condition-logic.hpp"
 #include "log-helper.hpp"
 
 #include <ui_advanced-scene-switcher.h>
@@ -53,7 +52,6 @@ public slots:
 	void on_noMatchRandomSwitch_clicked();
 	void NoMatchDelayDurationChanged(const Duration &);
 	void CooldownDurationChanged(const Duration &);
-	void on_enableCooldown_stateChanged(int state);
 	void on_startupBehavior_currentIndexChanged(int index);
 	void on_logLevel_currentIndexChanged(int index);
 	void on_autoStartEvent_currentIndexChanged(int index);
@@ -97,7 +95,6 @@ public:
 	void SetConditionData(Macro &m);
 	void SwapActions(Macro *m, int pos1, int pos2);
 	void SwapConditions(Macro *m, int pos1, int pos2);
-	void HighligthMacroSettingsButton(bool enable = true);
 
 public slots:
 	void on_macroAdd_clicked();
@@ -155,16 +152,12 @@ public slots:
 	void SetElseActionsStateToVisible();
 	void MacroActionSelectionChanged(int idx);
 	void MacroActionReorder(int to, int target);
-	void AddMacroAction(Macro *macro, int idx, const std::string &id,
-			    obs_data_t *data);
 	void AddMacroAction(int idx);
 	void RemoveMacroAction(int idx);
 	void MoveMacroActionUp(int idx);
 	void MoveMacroActionDown(int idx);
 	void MacroElseActionSelectionChanged(int idx);
 	void MacroElseActionReorder(int to, int target);
-	void AddMacroElseAction(Macro *macro, int idx, const std::string &id,
-				obs_data_t *data);
 	void AddMacroElseAction(int idx);
 	void RemoveMacroElseAction(int idx);
 	void SwapElseActions(Macro *m, int pos1, int pos2);
@@ -173,16 +166,16 @@ public slots:
 	void MacroConditionSelectionChanged(int idx);
 	void MacroConditionReorder(int to, int target);
 	void AddMacroCondition(int idx);
-	void AddMacroCondition(Macro *macro, int idx, const std::string &id,
-			       obs_data_t *data, Logic::Type logic);
 	void RemoveMacroCondition(int idx);
 	void MoveMacroConditionUp(int idx);
 	void MoveMacroConditionDown(int idx);
+	void FadeOutActionControls();
+	void FadeOutConditionControls();
+	void ResetOpacityActionControls();
+	void ResetOpacityConditionControls();
 	void HighlightControls();
 	void HighlightOnChange();
-	void on_macroSettings_clicked();
-	void CopyMacroSegment();
-	void PasteMacroSegment();
+	void on_macroProperties_clicked();
 
 signals:
 	void MacroAdded(const QString &name);
@@ -191,6 +184,9 @@ signals:
 	void MacroSegmentOrderChanged();
 	void SegmentTempVarsChanged();
 	void HighlightMacrosChanged(bool value);
+	void HighlightActionsChanged(bool value);
+	void HighlightElseActionsChanged(bool value);
+	void HighlightConditionsChanged(bool value);
 
 	void ConnectionAdded(const QString &);
 	void ConnectionRenamed(const QString &oldName, const QString &newName);
@@ -359,6 +355,24 @@ public slots:
 	void on_videoDown_clicked();
 	void on_getScreenshot_clicked();
 
+	// Scene group tab
+public:
+	void SetupNetworkTab();
+public slots:
+	void on_serverSettings_toggled(bool on);
+	void on_serverPort_valueChanged(int value);
+	void on_lockToIPv4_stateChanged(int state);
+	void on_serverRestart_clicked();
+	void UpdateServerStatus();
+	void on_clientSettings_toggled(bool on);
+	void on_clientHostname_textChanged(const QString &text);
+	void on_clientPort_valueChanged(int value);
+	void on_sendSceneChange_stateChanged(int state);
+	void on_restrictSend_stateChanged(int state);
+	void on_sendPreview_stateChanged(int state);
+	void on_clientReconnect_clicked();
+	void UpdateClientStatus();
+
 	// Scene group tab
 public:
 	void SetupSceneGroupTab();
@@ -380,12 +394,19 @@ signals:
 	void SceneGroupRemoved(const QString &name);
 	void SceneGroupRenamed(const QString &oldName, const QString newName);
 
+	// Trigger tab
+public:
+	void SetupTriggerTab();
+public slots:
+	void on_triggerAdd_clicked();
+	void on_triggerRemove_clicked();
+	void on_triggerUp_clicked();
+	void on_triggerDown_clicked();
+
 	/* --- End of legacy tab section --- */
-private:
-	void SetCheckIntervalTooLowVisibility() const;
 };
 
 void OpenSettingsWindow();
-void HighligthMacroSettingsButton(bool enable);
+QWidget *GetSettingsWindow();
 
 } // namespace advss

lib/general.cpp

@@ -91,17 +91,6 @@ void AdvSceneSwitcher::CooldownDurationChanged(const Duration &dur)
 	switcher->cooldown = dur;
 }
 
-void AdvSceneSwitcher::on_enableCooldown_stateChanged(int state)
-{
-	if (loading) {
-		return;
-	}
-
-	std::lock_guard<std::mutex> lock(switcher->m);
-	switcher->enableCooldown = state;
-	ui->cooldownTime->setEnabled(state);
-}
-
 void AdvSceneSwitcher::on_startupBehavior_currentIndexChanged(int index)
 {
 	if (loading) {
@@ -150,8 +139,6 @@ void AdvSceneSwitcher::on_checkInterval_valueChanged(int value)
 
 	std::lock_guard<std::mutex> lock(switcher->m);
 	switcher->interval = value;
-
-	SetCheckIntervalTooLowVisibility();
 }
 
 void AdvSceneSwitcher::closeEvent(QCloseEvent *)
@@ -218,6 +205,7 @@ static bool isLegacyTab(const QString &name)
 {
 	return name == obs_module_text(
 			       "AdvSceneSwitcher.sceneGroupTab.title") ||
+	       name == obs_module_text("AdvSceneSwitcher.networkTab.title") ||
 	       name == obs_module_text(
 			       "AdvSceneSwitcher.transitionTab.title") ||
 	       name == obs_module_text(
@@ -235,7 +223,9 @@ static bool isLegacyTab(const QString &name)
 			       "AdvSceneSwitcher.sceneSequenceTab.title") ||
 	       name == obs_module_text("AdvSceneSwitcher.audioTab.title") ||
 	       name == obs_module_text("AdvSceneSwitcher.videoTab.title") ||
-	       name == obs_module_text("AdvSceneSwitcher.pauseTab.title");
+	       name == obs_module_text("AdvSceneSwitcher.pauseTab.title") ||
+	       name == obs_module_text(
+			       "AdvSceneSwitcher.sceneTriggerTab.title");
 }
 
 void AdvSceneSwitcher::on_hideLegacyTabs_stateChanged(int state)
@@ -247,10 +237,6 @@ void AdvSceneSwitcher::on_hideLegacyTabs_stateChanged(int state)
 			ui->tabWidget->setTabVisible(idx, !state);
 		}
 	}
-
-	// Changing priority of legacy tabs will very likely not be necessary if
-	// the legacy tabs are hidden
-	ui->priorityBox->setVisible(!switcher->hideLegacyTabs);
 }
 
 void AdvSceneSwitcher::SetDeprecationWarnings()
@@ -445,7 +431,7 @@ void SwitcherData::LoadSettings(obs_data_t *obj)
 	}
 
 	LoadMacros(obj);
-	LoadGlobalMacroSettings(obj);
+	LoadGlobalMacroProperties(obj);
 	loadWindowTitleSwitches(obj);
 	loadScreenRegionSwitches(obj);
 	loadPauseSwitches(obj);
@@ -459,6 +445,8 @@ void SwitcherData::LoadSettings(obs_data_t *obj)
 	loadTimeSwitches(obj);
 	loadAudioSwitches(obj);
 	loadVideoSwitches(obj);
+	loadNetworkSettings(obj);
+	loadSceneTriggers(obj);
 	LoadGeneralSettings(obj);
 	LoadHotkeys(obj);
 	LoadUISettings(obj);
@@ -478,7 +466,7 @@ void SwitcherData::SaveSettings(obs_data_t *obj)
 
 	saveSceneGroups(obj);
 	SaveMacros(obj);
-	SaveGlobalMacroSettings(obj);
+	SaveGlobalMacroProperties(obj);
 	SaveVariables(obj);
 	saveWindowTitleSwitches(obj);
 	saveScreenRegionSwitches(obj);
@@ -493,6 +481,8 @@ void SwitcherData::SaveSettings(obs_data_t *obj)
 	saveTimeSwitches(obj);
 	saveAudioSwitches(obj);
 	saveVideoSwitches(obj);
+	saveNetworkSwitches(obj);
+	saveSceneTriggers(obj);
 	SaveGeneralSettings(obj);
 	SaveHotkeys(obj);
 	SaveUISettings(obj);
@@ -515,7 +505,6 @@ void SwitcherData::SaveGeneralSettings(obs_data_t *obj)
 	noMatchDelay.Save(obj, "noMatchDelay");
 
 	cooldown.Save(obj, "cooldown");
-	obs_data_set_bool(obj, "enableCooldown", enableCooldown);
 
 	obs_data_set_bool(obj, "active", sceneColletionStop ? true : !stop);
 	sceneColletionStop = false;
@@ -526,7 +515,6 @@ void SwitcherData::SaveGeneralSettings(obs_data_t *obj)
 			 static_cast<int>(autoStartEvent));
 
 	obs_data_set_int(obj, "logLevel", static_cast<int>(logLevel));
-	obs_data_set_int(obj, "logLevelVersion", 1);
 	obs_data_set_bool(obj, "showSystemTrayNotifications",
 			  showSystemTrayNotifications);
 	obs_data_set_bool(obj, "disableHints", disableHints);
@@ -562,11 +550,6 @@ void SwitcherData::LoadGeneralSettings(obs_data_t *obj)
 	noMatchDelay.Load(obj, "noMatchDelay");
 
 	cooldown.Load(obj, "cooldown");
-	if (!obs_data_has_user_value(obj, "enableCooldown")) {
-		enableCooldown = cooldown.Seconds() != 0;
-	} else {
-		enableCooldown = obs_data_get_bool(obj, "enableCooldown");
-	}
 
 	obs_data_set_default_bool(obj, "active", true);
 	stop = !obs_data_get_bool(obj, "active");
@@ -583,25 +566,6 @@ void SwitcherData::LoadGeneralSettings(obs_data_t *obj)
 		static_cast<AutoStart>(obs_data_get_int(obj, "autoStartEvent"));
 
 	logLevel = static_cast<LogLevel>(obs_data_get_int(obj, "logLevel"));
-	if (obs_data_get_int(obj, "logLevelVersion") < 1) {
-		enum OldLogLevel { DEFAULT, LOG_ACTION, VERBOSE };
-		OldLogLevel oldLogLevel = static_cast<OldLogLevel>(
-			obs_data_get_int(obj, "logLevel"));
-		switch (oldLogLevel) {
-		case DEFAULT:
-			logLevel = LogLevel::DEFAULT;
-			break;
-		case LOG_ACTION:
-			logLevel = LogLevel::LOG_ACTION;
-			break;
-		case VERBOSE:
-			logLevel = LogLevel::VERBOSE;
-			break;
-		default:
-			break;
-		}
-	}
-
 	showSystemTrayNotifications =
 		obs_data_get_bool(obj, "showSystemTrayNotifications");
 	disableHints = obs_data_get_bool(obj, "disableHints");
@@ -689,7 +653,7 @@ void SwitcherData::CheckNoMatchSwitch(bool &match, OBSWeakSource &scene,
 
 void SwitcherData::checkSwitchCooldown(bool &match)
 {
-	if (!match || !enableCooldown) {
+	if (!match) {
 		return;
 	}
 
@@ -829,28 +793,6 @@ static void setupGeneralTabInactiveWarning(QTabWidget *tabs)
 	inactiveTimer->start();
 }
 
-void advss::AdvSceneSwitcher::SetCheckIntervalTooLowVisibility() const
-{
-	auto macro = GetMacroWithInvalidConditionInterval();
-	if (!macro) {
-		ui->checkIntervalTooLowWarning->hide();
-		return;
-	}
-
-	const QString labelTextFormat(obs_module_text(
-		"AdvSceneSwitcher.generalTab.status.checkIntervalTooLow"));
-	const QString labelTooltipFormat(obs_module_text(
-		"AdvSceneSwitcher.generalTab.status.checkIntervalTooLow.tooltip"));
-	const QString name = QString::fromStdString(macro->Name());
-	const QString duration = QString::fromStdString(
-		macro->GetCustomConditionCheckInterval().ToString());
-
-	ui->checkIntervalTooLowWarning->setText(labelTextFormat.arg(name));
-	ui->checkIntervalTooLowWarning->setToolTip(
-		labelTooltipFormat.arg(name).arg(duration).arg(name));
-	ui->checkIntervalTooLowWarning->show();
-}
-
 void AdvSceneSwitcher::SetupGeneralTab()
 {
 	PopulateSceneSelection(ui->noMatchSwitchScene, false);
@@ -872,17 +814,14 @@ void AdvSceneSwitcher::SetupGeneralTab()
 	DurationSelection *noMatchDelay = new DurationSelection();
 	noMatchDelay->SetDuration(switcher->noMatchDelay);
 	noMatchDelay->setToolTip(obs_module_text(
-		"AdvSceneSwitcher.generalTab.generalBehavior.onNoMatchDelay.tooltip"));
+		"AdvSceneSwitcher.generalTab.generalBehavior.onNoMetDelayTooltip"));
 	ui->noMatchLayout->addWidget(noMatchDelay);
 	QWidget::connect(noMatchDelay,
 			 SIGNAL(DurationChanged(const Duration &)), this,
 			 SLOT(NoMatchDelayDurationChanged(const Duration &)));
 
 	ui->checkInterval->setValue(switcher->interval);
-	SetCheckIntervalTooLowVisibility();
 
-	ui->enableCooldown->setChecked(switcher->enableCooldown);
-	ui->cooldownTime->setEnabled(switcher->enableCooldown);
 	ui->cooldownTime->SetDuration(switcher->cooldown);
 	ui->cooldownTime->setToolTip(obs_module_text(
 		"AdvSceneSwitcher.generalTab.generalBehavior.cooldownHint"));

lib/legacy/scene-group.cpp

@@ -12,7 +12,7 @@
 
 namespace advss {
 
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;
 SceneGroupEditWidget *typeEdit = nullptr;
 
 std::deque<SceneGroup> &GetSceneGroups()
@@ -170,10 +170,7 @@ void AdvSceneSwitcher::on_sceneGroupAdd_clicked()
 	item->setData(Qt::UserRole, text);
 	ui->sceneGroups->setCurrentItem(item);
 
-	if (addPulse) {
-		addPulse->deleteLater();
-		addPulse = nullptr;
-	}
+	ui->sceneGroupAdd->disconnect(addPulse);
 	ui->sceneGroupHelp->setVisible(false);
 
 	emit SceneGroupAdded(QString::fromStdString(name));
@@ -515,8 +512,8 @@ void AdvSceneSwitcher::SetupSceneGroupTab()
 
 	if (switcher->sceneGroups.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse = HighlightWidget(ui->sceneGroupAdd,
-						   QColor(Qt::green));
+			addPulse = PulseWidget(ui->sceneGroupAdd,
+					       QColor(Qt::green));
 		}
 		ui->sceneGroupHelp->setVisible(true);
 	} else {

lib/legacy/scene-trigger.cpp

@@ -0,0 +1,581 @@
+#include "advanced-scene-switcher.hpp"
+#include "layout-helpers.hpp"
+#include "selection-helpers.hpp"
+#include "source-helpers.hpp"
+#include "switcher-data.hpp"
+#include "ui-helpers.hpp"
+#include "utility.hpp"
+
+#include <obs-frontend-api.h>
+#include <thread>
+
+namespace advss {
+
+bool SceneTrigger::pause = false;
+static QMetaObject::Connection addPulse;
+
+void AdvSceneSwitcher::on_triggerAdd_clicked()
+{
+	std::lock_guard<std::mutex> lock(switcher->m);
+	switcher->sceneTriggers.emplace_back();
+
+	listAddClicked(ui->sceneTriggers,
+		       new SceneTriggerWidget(this,
+					      &switcher->sceneTriggers.back()),
+		       ui->triggerAdd, &addPulse);
+
+	ui->triggerHelp->setVisible(false);
+}
+
+void AdvSceneSwitcher::on_triggerRemove_clicked()
+{
+	QListWidgetItem *item = ui->sceneTriggers->currentItem();
+	if (!item) {
+		return;
+	}
+
+	{
+		std::lock_guard<std::mutex> lock(switcher->m);
+		int idx = ui->sceneTriggers->currentRow();
+		auto &switches = switcher->sceneTriggers;
+		switches.erase(switches.begin() + idx);
+	}
+
+	delete item;
+}
+
+void AdvSceneSwitcher::on_triggerUp_clicked()
+{
+	int index = ui->sceneTriggers->currentRow();
+	if (!listMoveUp(ui->sceneTriggers)) {
+		return;
+	}
+
+	SceneTriggerWidget *s1 =
+		(SceneTriggerWidget *)ui->sceneTriggers->itemWidget(
+			ui->sceneTriggers->item(index));
+	SceneTriggerWidget *s2 =
+		(SceneTriggerWidget *)ui->sceneTriggers->itemWidget(
+			ui->sceneTriggers->item(index - 1));
+	SceneTriggerWidget::swapSwitchData(s1, s2);
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+
+	std::swap(switcher->sceneTriggers[index],
+		  switcher->sceneTriggers[index - 1]);
+}
+
+void AdvSceneSwitcher::on_triggerDown_clicked()
+{
+	int index = ui->sceneTriggers->currentRow();
+
+	if (!listMoveDown(ui->sceneTriggers)) {
+		return;
+	}
+
+	SceneTriggerWidget *s1 =
+		(SceneTriggerWidget *)ui->sceneTriggers->itemWidget(
+			ui->sceneTriggers->item(index));
+	SceneTriggerWidget *s2 =
+		(SceneTriggerWidget *)ui->sceneTriggers->itemWidget(
+			ui->sceneTriggers->item(index + 1));
+	SceneTriggerWidget::swapSwitchData(s1, s2);
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+
+	std::swap(switcher->sceneTriggers[index],
+		  switcher->sceneTriggers[index + 1]);
+}
+
+void SceneTrigger::logMatch()
+{
+	std::string sceneName = "";
+	std::string statusName = "";
+	std::string actionName = "";
+
+	switch (triggerType) {
+	case sceneTriggerType::NONE:
+		statusName = "NONE";
+		break;
+	case sceneTriggerType::SCENE_ACTIVE:
+		statusName = "SCENE ACTIVE";
+		break;
+	case sceneTriggerType::SCENE_INACTIVE:
+		statusName = "SCENE INACTIVE";
+		break;
+	case sceneTriggerType::SCENE_LEAVE:
+		statusName = "SCENE LEAVE";
+		break;
+	default:
+		break;
+	}
+
+	switch (triggerAction) {
+	case sceneTriggerAction::NONE:
+		actionName = "NONE";
+		break;
+	case sceneTriggerAction::START_RECORDING:
+		actionName = "START RECORDING";
+		break;
+	case sceneTriggerAction::PAUSE_RECORDING:
+		actionName = "PAUSE RECORDING";
+		break;
+	case sceneTriggerAction::UNPAUSE_RECORDING:
+		actionName = "UNPAUSE RECORDING";
+		break;
+	case sceneTriggerAction::STOP_RECORDING:
+		actionName = "STOP RECORDING";
+		break;
+	case sceneTriggerAction::START_STREAMING:
+		actionName = "START STREAMING";
+		break;
+	case sceneTriggerAction::STOP_STREAMING:
+		actionName = "STOP STREAMING";
+		break;
+	case sceneTriggerAction::START_REPLAY_BUFFER:
+		actionName = "START REPLAY BUFFER";
+		break;
+	case sceneTriggerAction::STOP_REPLAY_BUFFER:
+		actionName = "STOP REPLAY BUFFER";
+		break;
+	case sceneTriggerAction::MUTE_SOURCE:
+		actionName = "MUTE (" + GetWeakSourceName(audioSource) + ")";
+		break;
+	case sceneTriggerAction::UNMUTE_SOURCE:
+		actionName = "UNMUTE (" + GetWeakSourceName(audioSource) + ")";
+		break;
+	case sceneTriggerAction::START_SWITCHER:
+		actionName = "START SCENE SWITCHER";
+		break;
+	case sceneTriggerAction::STOP_SWITCHER:
+		actionName = "STOP SCENE SWITCHER";
+		break;
+	case sceneTriggerAction::START_VCAM:
+		actionName = "START VIRTUAL CAMERA";
+		break;
+	case sceneTriggerAction::STOP_VCAM:
+		actionName = "STOP VIRTUAL CAMERA";
+		break;
+	default:
+		actionName = "UNKNOWN";
+		break;
+	}
+
+	blog(LOG_INFO,
+	     "scene '%s' in status '%s' triggering action '%s' after %f seconds",
+	     GetWeakSourceName(scene).c_str(), statusName.c_str(),
+	     actionName.c_str(), duration.Seconds());
+}
+
+void frontEndActionThread(sceneTriggerAction action, double delay)
+{
+	long long mil = delay * 1000;
+	std::this_thread::sleep_for(std::chrono::milliseconds(mil));
+
+	switch (action) {
+	case sceneTriggerAction::NONE:
+		break;
+	case sceneTriggerAction::START_RECORDING:
+		obs_frontend_recording_start();
+		break;
+	case sceneTriggerAction::PAUSE_RECORDING:
+		obs_frontend_recording_pause(true);
+		break;
+	case sceneTriggerAction::UNPAUSE_RECORDING:
+		obs_frontend_recording_pause(false);
+		break;
+	case sceneTriggerAction::STOP_RECORDING:
+		obs_frontend_recording_stop();
+		break;
+	case sceneTriggerAction::START_STREAMING:
+		obs_frontend_streaming_start();
+		break;
+	case sceneTriggerAction::STOP_STREAMING:
+		obs_frontend_streaming_stop();
+		break;
+#if LIBOBS_API_VER >= MAKE_SEMANTIC_VERSION(26, 0, 0)
+	case sceneTriggerAction::START_REPLAY_BUFFER:
+		obs_frontend_replay_buffer_start();
+		break;
+	case sceneTriggerAction::STOP_REPLAY_BUFFER:
+		obs_frontend_replay_buffer_stop();
+		break;
+#endif
+#if LIBOBS_API_VER >= MAKE_SEMANTIC_VERSION(27, 0, 0)
+	case sceneTriggerAction::START_VCAM:
+		obs_frontend_start_virtualcam();
+		break;
+	case sceneTriggerAction::STOP_VCAM:
+		obs_frontend_stop_virtualcam();
+		break;
+#endif
+	default:
+		blog(LOG_WARNING, "ignoring unexpected frontend action '%d'",
+		     static_cast<int>(action));
+		break;
+	}
+}
+
+void muteThread(OBSWeakSource source, double delay, bool mute)
+{
+	long long mil = delay * 1000;
+	std::this_thread::sleep_for(std::chrono::milliseconds(mil));
+
+	auto s = obs_weak_source_get_source(source);
+	obs_source_set_muted(s, mute);
+	obs_source_release(s);
+}
+
+void statusThread(double delay, bool stop)
+{
+	long long mil = delay * 1000;
+	std::this_thread::sleep_for(std::chrono::milliseconds(mil));
+
+	if (stop) {
+		switcher->Stop();
+	} else {
+		switcher->Start();
+	}
+}
+
+bool isFrontendAction(sceneTriggerAction triggerAction)
+{
+	return triggerAction == sceneTriggerAction::START_RECORDING ||
+	       triggerAction == sceneTriggerAction::PAUSE_RECORDING ||
+	       triggerAction == sceneTriggerAction::UNPAUSE_RECORDING ||
+	       triggerAction == sceneTriggerAction::STOP_RECORDING ||
+	       triggerAction == sceneTriggerAction::START_STREAMING ||
+	       triggerAction == sceneTriggerAction::STOP_STREAMING ||
+	       triggerAction == sceneTriggerAction::START_REPLAY_BUFFER ||
+	       triggerAction == sceneTriggerAction::STOP_REPLAY_BUFFER ||
+	       triggerAction == sceneTriggerAction::START_VCAM ||
+	       triggerAction == sceneTriggerAction::STOP_VCAM;
+}
+
+bool isAudioAction(sceneTriggerAction t)
+{
+	return t == sceneTriggerAction::MUTE_SOURCE ||
+	       t == sceneTriggerAction::UNMUTE_SOURCE;
+}
+
+bool isSwitcherStatusAction(sceneTriggerAction t)
+{
+	return t == sceneTriggerAction::START_SWITCHER ||
+	       t == sceneTriggerAction::STOP_SWITCHER;
+}
+
+void SceneTrigger::performAction()
+{
+	if (triggerAction == sceneTriggerAction::NONE) {
+		return;
+	}
+
+	std::thread t;
+
+	if (isFrontendAction(triggerAction)) {
+		t = std::thread(frontEndActionThread, triggerAction,
+				duration.Seconds());
+	} else if (isAudioAction(triggerAction)) {
+		bool mute = triggerAction == sceneTriggerAction::MUTE_SOURCE;
+		t = std::thread(muteThread, audioSource, duration.Seconds(),
+				mute);
+	} else if (isSwitcherStatusAction(triggerAction)) {
+		bool stop = triggerAction == sceneTriggerAction::STOP_SWITCHER;
+		t = std::thread(statusThread, duration.Seconds(), stop);
+	} else {
+		blog(LOG_WARNING, "ignoring unknown action '%d'",
+		     static_cast<int>(triggerAction));
+	}
+
+	t.detach();
+}
+
+bool SceneTrigger::checkMatch(OBSWeakSource currentScene,
+			      OBSWeakSource previousScene)
+{
+	switch (triggerType) {
+	case sceneTriggerType::NONE:
+		return false;
+	case sceneTriggerType::SCENE_ACTIVE:
+		return currentScene == scene;
+	case sceneTriggerType::SCENE_INACTIVE:
+		return currentScene != scene;
+	case sceneTriggerType::SCENE_LEAVE:
+		return previousScene == scene;
+	}
+	return false;
+}
+
+void SwitcherData::checkTriggers()
+{
+	if (SceneTrigger::pause) {
+		return;
+	}
+
+	for (auto &t : sceneTriggers) {
+		if (stop && !isSwitcherStatusAction(t.triggerAction)) {
+			continue;
+		}
+
+		if (t.checkMatch(currentScene, previousScene)) {
+			t.logMatch();
+			t.performAction();
+		}
+	}
+}
+
+void SwitcherData::saveSceneTriggers(obs_data_t *obj)
+{
+	obs_data_array_t *triggerArray = obs_data_array_create();
+	for (auto &s : sceneTriggers) {
+		obs_data_t *array_obj = obs_data_create();
+
+		s.save(array_obj);
+		obs_data_array_push_back(triggerArray, array_obj);
+
+		obs_data_release(array_obj);
+	}
+	obs_data_set_array(obj, "triggers", triggerArray);
+	obs_data_array_release(triggerArray);
+}
+
+void SwitcherData::loadSceneTriggers(obs_data_t *obj)
+{
+	sceneTriggers.clear();
+
+	obs_data_array_t *triggerArray = obs_data_get_array(obj, "triggers");
+	size_t count = obs_data_array_count(triggerArray);
+
+	for (size_t i = 0; i < count; i++) {
+		obs_data_t *array_obj = obs_data_array_item(triggerArray, i);
+
+		sceneTriggers.emplace_back();
+		sceneTriggers.back().load(array_obj);
+
+		obs_data_release(array_obj);
+	}
+	obs_data_array_release(triggerArray);
+}
+
+void AdvSceneSwitcher::SetupTriggerTab()
+{
+	for (auto &s : switcher->sceneTriggers) {
+		QListWidgetItem *item;
+		item = new QListWidgetItem(ui->sceneTriggers);
+		ui->sceneTriggers->addItem(item);
+		SceneTriggerWidget *sw = new SceneTriggerWidget(this, &s);
+		item->setSizeHint(sw->minimumSizeHint());
+		ui->sceneTriggers->setItemWidget(item, sw);
+	}
+
+	if (switcher->sceneTriggers.size() == 0) {
+		if (!switcher->disableHints) {
+			addPulse =
+				PulseWidget(ui->triggerAdd, QColor(Qt::green));
+		}
+		ui->triggerHelp->setVisible(true);
+	} else {
+		ui->triggerHelp->setVisible(false);
+	}
+}
+
+void SceneTrigger::save(obs_data_t *obj)
+{
+	obs_data_set_string(obj, "scene", GetWeakSourceName(scene).c_str());
+	obs_data_set_int(obj, "triggerType", static_cast<int>(triggerType));
+	obs_data_set_int(obj, "triggerAction", static_cast<int>(triggerAction));
+	duration.Save(obj, "duration");
+	obs_data_set_string(obj, "audioSource",
+			    GetWeakSourceName(audioSource).c_str());
+}
+
+void SceneTrigger::load(obs_data_t *obj)
+{
+	const char *sceneName = obs_data_get_string(obj, "scene");
+	scene = GetWeakSourceByName(sceneName);
+
+	triggerType = static_cast<sceneTriggerType>(
+		obs_data_get_int(obj, "triggerType"));
+	triggerAction = static_cast<sceneTriggerAction>(
+		obs_data_get_int(obj, "triggerAction"));
+	duration.Load(obj, "duration");
+
+	const char *audioSourceName = obs_data_get_string(obj, "audioSource");
+	audioSource = GetWeakSourceByName(audioSourceName);
+}
+
+static inline void populateTriggers(QComboBox *list)
+{
+	AddSelectionEntry(
+		list,
+		obs_module_text(
+			"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.none"));
+
+	list->addItem(obs_module_text(
+		"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneActive"));
+	list->addItem(obs_module_text(
+		"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneInactive"));
+	list->addItem(obs_module_text(
+		"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneLeave"));
+}
+
+inline void populateActions(QComboBox *list)
+{
+	AddSelectionEntry(
+		list,
+		obs_module_text(
+			"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.none"));
+
+	list->addItem(obs_module_text(
+		"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startRecording"));
+	list->addItem(obs_module_text(
+		"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.pauseRecording"));
+	list->addItem(obs_module_text(
+		"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.unpauseRecording"));
+	list->addItem(obs_module_text(
+		"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopRecording"));
+	list->addItem(obs_module_text(
+		"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startStreaming"));
+	list->addItem(obs_module_text(
+		"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopStreaming"));
+	list->addItem(obs_module_text(
+		"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startReplayBuffer"));
+	list->addItem(obs_module_text(
+		"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopReplayBuffer"));
+	list->addItem(obs_module_text(
+		"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.muteSource"));
+	list->addItem(obs_module_text(
+		"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.unmuteSource"));
+	list->addItem(obs_module_text(
+		"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startSwitcher"));
+	list->addItem(obs_module_text(
+		"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopSwitcher"));
+	list->addItem(obs_module_text(
+		"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startVirtualCamera"));
+	list->addItem(obs_module_text(
+		"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopVirtualCamera"));
+}
+
+SceneTriggerWidget::SceneTriggerWidget(QWidget *parent, SceneTrigger *s)
+	: SwitchWidget(parent, s, false, false)
+{
+	triggers = new QComboBox();
+	actions = new QComboBox();
+	duration = new DurationSelection();
+	audioSources = new QComboBox();
+
+	QWidget::connect(triggers, SIGNAL(currentIndexChanged(int)), this,
+			 SLOT(TriggerTypeChanged(int)));
+	QWidget::connect(actions, SIGNAL(currentIndexChanged(int)), this,
+			 SLOT(TriggerActionChanged(int)));
+	QWidget::connect(duration, SIGNAL(DurationChanged(const Duration &)),
+			 this, SLOT(DurationChanged(const Duration &)));
+	QWidget::connect(audioSources,
+			 SIGNAL(currentTextChanged(const QString &)), this,
+			 SLOT(AudioSourceChanged(const QString &)));
+
+	populateTriggers(triggers);
+	populateActions(actions);
+	PopulateAudioSelection(audioSources);
+
+	if (s) {
+		triggers->setCurrentIndex(static_cast<int>(s->triggerType));
+		actions->setCurrentIndex(static_cast<int>(s->triggerAction));
+		duration->SetDuration(s->duration);
+
+		audioSources->setCurrentText(
+			GetWeakSourceName(s->audioSource).c_str());
+
+		if (isAudioAction(s->triggerAction)) {
+			audioSources->show();
+		} else {
+			audioSources->hide();
+		}
+	}
+
+	QHBoxLayout *mainLayout = new QHBoxLayout;
+	std::unordered_map<std::string, QWidget *> widgetPlaceholders = {
+		{"{{triggers}}", triggers},
+		{"{{actions}}", actions},
+		{"{{audioSources}}", audioSources},
+		{"{{duration}}", duration},
+		{"{{scenes}}", scenes}};
+	PlaceWidgets(obs_module_text("AdvSceneSwitcher.sceneTriggerTab.entry"),
+		     mainLayout, widgetPlaceholders);
+	setLayout(mainLayout);
+
+	switchData = s;
+
+	loading = false;
+}
+
+SceneTrigger *SceneTriggerWidget::getSwitchData()
+{
+	return switchData;
+}
+
+void SceneTriggerWidget::setSwitchData(SceneTrigger *s)
+{
+	switchData = s;
+}
+
+void SceneTriggerWidget::swapSwitchData(SceneTriggerWidget *s1,
+					SceneTriggerWidget *s2)
+{
+	SwitchWidget::swapSwitchData(s1, s2);
+
+	SceneTrigger *t = s1->getSwitchData();
+	s1->setSwitchData(s2->getSwitchData());
+	s2->setSwitchData(t);
+}
+
+void SceneTriggerWidget::TriggerTypeChanged(int index)
+{
+	if (loading || !switchData) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	switchData->triggerType = static_cast<sceneTriggerType>(index);
+}
+
+void SceneTriggerWidget::TriggerActionChanged(int index)
+{
+	if (loading || !switchData) {
+		return;
+	}
+
+	{
+		std::lock_guard<std::mutex> lock(switcher->m);
+		switchData->triggerAction =
+			static_cast<sceneTriggerAction>(index);
+	}
+
+	if (isAudioAction(switchData->triggerAction)) {
+		audioSources->show();
+	} else {
+		audioSources->hide();
+	}
+}
+
+void SceneTriggerWidget::DurationChanged(const Duration &duration)
+{
+	if (loading || !switchData) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	switchData->duration = duration;
+}
+
+void SceneTriggerWidget::AudioSourceChanged(const QString &text)
+{
+	if (loading || !switchData) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	switchData->audioSource = GetWeakSourceByQString(text);
+}
+
+} // namespace advss

lib/legacy/scene-trigger.hpp

@@ -0,0 +1,88 @@
+/******************************************************************************
+    Note: Long-term goal is to remove this tab / file.
+    Most functionality shall be moved to the Macro tab instead.
+
+    So if you plan to make changes here, please consider applying them to the
+    corresponding macro tab functionality instead.
+******************************************************************************/
+#pragma once
+
+#include "switch-generic.hpp"
+#include "duration-control.hpp"
+
+namespace advss {
+
+enum class sceneTriggerType {
+	NONE = 0,
+	SCENE_ACTIVE = 1,
+	SCENE_INACTIVE = 2,
+	SCENE_LEAVE = 3,
+};
+
+enum class sceneTriggerAction {
+	NONE = 0,
+	START_RECORDING,
+	PAUSE_RECORDING,
+	UNPAUSE_RECORDING,
+	STOP_RECORDING,
+
+	START_STREAMING,
+	STOP_STREAMING,
+
+	START_REPLAY_BUFFER,
+	STOP_REPLAY_BUFFER,
+
+	MUTE_SOURCE,
+	UNMUTE_SOURCE,
+
+	START_SWITCHER,
+	STOP_SWITCHER,
+
+	START_VCAM,
+	STOP_VCAM,
+};
+
+struct SceneTrigger : SceneSwitcherEntry {
+	static bool pause;
+	sceneTriggerType triggerType = sceneTriggerType::NONE;
+	sceneTriggerAction triggerAction = sceneTriggerAction::NONE;
+	Duration duration;
+	OBSWeakSource audioSource = nullptr;
+
+	const char *getType() { return "trigger"; }
+	void save(obs_data_t *obj);
+	void load(obs_data_t *obj);
+
+	bool checkMatch(OBSWeakSource currentScene,
+			OBSWeakSource previousScene);
+	void performAction();
+	void logMatch();
+};
+
+class SceneTriggerWidget : public SwitchWidget {
+	Q_OBJECT
+
+public:
+	SceneTriggerWidget(QWidget *parent, SceneTrigger *s);
+	SceneTrigger *getSwitchData();
+	void setSwitchData(SceneTrigger *s);
+
+	static void swapSwitchData(SceneTriggerWidget *s1,
+				   SceneTriggerWidget *s2);
+
+private slots:
+	void TriggerTypeChanged(int index);
+	void TriggerActionChanged(int index);
+	void DurationChanged(const Duration &);
+	void AudioSourceChanged(const QString &text);
+
+private:
+	QComboBox *triggers;
+	QComboBox *actions;
+	DurationSelection *duration;
+	QComboBox *audioSources;
+
+	SceneTrigger *switchData;
+};
+
+} // namespace advss

lib/legacy/switch-audio.cpp

@@ -12,7 +12,7 @@
 namespace advss {
 
 bool AudioSwitch::pause = false;
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;
 
 void AdvSceneSwitcher::on_audioAdd_clicked()
 {
@@ -22,7 +22,7 @@ void AdvSceneSwitcher::on_audioAdd_clicked()
 	AudioSwitchWidget *sw =
 		new AudioSwitchWidget(this, &switcher->audioSwitches.back());
 
-	listAddClicked(ui->audioSwitches, sw, &addPulse);
+	listAddClicked(ui->audioSwitches, sw, ui->audioAdd, &addPulse);
 
 	ui->audioHelp->setVisible(false);
 }
@@ -232,8 +232,7 @@ void AdvSceneSwitcher::SetupAudioTab()
 
 	if (switcher->audioSwitches.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse = HighlightWidget(ui->audioAdd,
-						   QColor(Qt::green));
+			addPulse = PulseWidget(ui->audioAdd, QColor(Qt::green));
 		}
 		ui->audioHelp->setVisible(true);
 	} else {

lib/legacy/switch-executable.cpp

@@ -9,7 +9,7 @@
 namespace advss {
 
 bool ExecutableSwitch::pause = false;
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;
 
 void AdvSceneSwitcher::on_executableAdd_clicked()
 {
@@ -19,7 +19,7 @@ void AdvSceneSwitcher::on_executableAdd_clicked()
 	listAddClicked(ui->executables,
 		       new ExecutableSwitchWidget(
 			       this, &switcher->executableSwitches.back()),
-		       &addPulse);
+		       ui->executableAdd, &addPulse);
 
 	ui->exeHelp->setVisible(false);
 }
@@ -177,8 +177,8 @@ void AdvSceneSwitcher::SetupExecutableTab()
 
 	if (switcher->executableSwitches.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse = HighlightWidget(ui->executableAdd,
-						   QColor(Qt::green));
+			addPulse = PulseWidget(ui->executableAdd,
+					       QColor(Qt::green));
 		}
 		ui->exeHelp->setVisible(true);
 	} else {

lib/legacy/switch-file.cpp

@@ -18,7 +18,7 @@
 namespace advss {
 
 bool FileSwitch::pause = false;
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;
 static std::hash<std::string> strHash;
 
 void AdvSceneSwitcher::on_browseButton_clicked()
@@ -291,7 +291,7 @@ void AdvSceneSwitcher::on_fileAdd_clicked()
 	listAddClicked(ui->fileSwitches,
 		       new FileSwitchWidget(this,
 					    &switcher->fileSwitches.back()),
-		       &addPulse);
+		       ui->fileAdd, &addPulse);
 
 	ui->fileHelp->setVisible(false);
 }
@@ -441,8 +441,7 @@ void AdvSceneSwitcher::SetupFileTab()
 
 	if (switcher->fileSwitches.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse =
-				HighlightWidget(ui->fileAdd, QColor(Qt::green));
+			addPulse = PulseWidget(ui->fileAdd, QColor(Qt::green));
 		}
 		ui->fileHelp->setVisible(true);
 	} else {

lib/legacy/switch-media.cpp

@@ -9,7 +9,7 @@
 namespace advss {
 
 bool MediaSwitch::pause = false;
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;
 
 constexpr auto media_played_to_end_idx = 8;
 constexpr auto media_any_idx = 9;
@@ -22,7 +22,7 @@ void AdvSceneSwitcher::on_mediaAdd_clicked()
 	listAddClicked(ui->mediaSwitches,
 		       new MediaSwitchWidget(this,
 					     &switcher->mediaSwitches.back()),
-		       &addPulse);
+		       ui->mediaAdd, &addPulse);
 
 	ui->mediaHelp->setVisible(false);
 }
@@ -252,8 +252,7 @@ void AdvSceneSwitcher::SetupMediaTab()
 
 	if (switcher->mediaSwitches.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse = HighlightWidget(ui->mediaAdd,
-						   QColor(Qt::green));
+			addPulse = PulseWidget(ui->mediaAdd, QColor(Qt::green));
 		}
 		ui->mediaHelp->setVisible(true);
 	} else {

lib/legacy/switch-network.cpp

@@ -0,0 +1,717 @@
+/*
+Most of this code is based on https://github.com/Palakis/obs-websocket
+*/
+
+#include "advanced-scene-switcher.hpp"
+#include "obs-module-helper.hpp"
+#include "scene-switch-helpers.hpp"
+#include "source-helpers.hpp"
+#include "switcher-data.hpp"
+
+#include <obs-frontend-api.h>
+#include <QMessageBox>
+#include <QTime>
+#include <QMainWindow>
+
+namespace advss {
+
+#define PARAM_SERVER_ENABLE "ServerEnabled"
+#define PARAM_SERVER_PORT "ServerPort"
+#define PARAM_LOCKTOIPV4 "LockToIPv4"
+
+#define PARAM_CLIENT_ENABLE "ClientEnabled"
+#define PARAM_CLIENT_PORT "ClientPort"
+#define PARAM_ADDRESS "Address"
+#define PARAM_CLIENT_SEND_SCENE_CHANGE "SendSceneChange"
+#define PARAM_CLIENT_SEND_SCENE_CHANGE_ALL "SendSceneChangeAll"
+#define PARAM_CLIENT_SENDPREVIEW "SendPreview"
+
+#define RECONNECT_DELAY 10
+
+#define SCENE_ENTRY "scene"
+#define TRANSITION_ENTRY "transition"
+#define TRANSITION_DURATION "duration"
+#define SET_PREVIEW "preview"
+
+using websocketpp::lib::placeholders::_1;
+using websocketpp::lib::placeholders::_2;
+using websocketpp::lib::bind;
+
+NetworkConfig::NetworkConfig()
+	: ServerEnabled(false),
+	  ServerPort(55555),
+	  LockToIPv4(false),
+	  ClientEnabled(false),
+	  Address(""),
+	  ClientPort(55555),
+	  SendSceneChange(true),
+	  SendSceneChangeAll(true),
+	  SendPreview(true)
+{
+}
+
+void NetworkConfig::Load(obs_data_t *obj)
+{
+	SetDefaults(obj);
+
+	ServerEnabled = obs_data_get_bool(obj, PARAM_SERVER_ENABLE);
+	ServerPort = obs_data_get_int(obj, PARAM_SERVER_PORT);
+	LockToIPv4 = obs_data_get_bool(obj, PARAM_LOCKTOIPV4);
+
+	ClientEnabled = obs_data_get_bool(obj, PARAM_CLIENT_ENABLE);
+	Address = obs_data_get_string(obj, PARAM_ADDRESS);
+	ClientPort = obs_data_get_int(obj, PARAM_CLIENT_PORT);
+	SendSceneChange =
+		obs_data_get_bool(obj, PARAM_CLIENT_SEND_SCENE_CHANGE);
+	SendSceneChangeAll =
+		obs_data_get_bool(obj, PARAM_CLIENT_SEND_SCENE_CHANGE_ALL);
+	SendPreview = obs_data_get_bool(obj, PARAM_CLIENT_SENDPREVIEW);
+}
+
+void NetworkConfig::Save(obs_data_t *obj)
+{
+	obs_data_set_bool(obj, PARAM_SERVER_ENABLE, ServerEnabled);
+	obs_data_set_int(obj, PARAM_SERVER_PORT, ServerPort);
+	obs_data_set_bool(obj, PARAM_LOCKTOIPV4, LockToIPv4);
+
+	obs_data_set_bool(obj, PARAM_CLIENT_ENABLE, ClientEnabled);
+	obs_data_set_string(obj, PARAM_ADDRESS, Address.c_str());
+	obs_data_set_int(obj, PARAM_CLIENT_PORT, ClientPort);
+	obs_data_set_bool(obj, PARAM_CLIENT_SEND_SCENE_CHANGE, SendSceneChange);
+	obs_data_set_bool(obj, PARAM_CLIENT_SEND_SCENE_CHANGE_ALL,
+			  SendSceneChangeAll);
+	obs_data_set_bool(obj, PARAM_CLIENT_SENDPREVIEW, SendPreview);
+}
+
+void NetworkConfig::SetDefaults(obs_data_t *obj)
+{
+	obs_data_set_default_bool(obj, PARAM_SERVER_ENABLE, false);
+	obs_data_set_default_int(obj, PARAM_SERVER_PORT, ServerPort);
+	obs_data_set_default_bool(obj, PARAM_LOCKTOIPV4, LockToIPv4);
+
+	obs_data_set_default_bool(obj, PARAM_CLIENT_ENABLE, false);
+	obs_data_set_default_string(obj, PARAM_ADDRESS, Address.c_str());
+	obs_data_set_default_int(obj, PARAM_CLIENT_PORT, ClientPort);
+	obs_data_set_default_bool(obj, PARAM_CLIENT_SEND_SCENE_CHANGE,
+				  SendSceneChange);
+	obs_data_set_default_bool(obj, PARAM_CLIENT_SEND_SCENE_CHANGE_ALL,
+				  SendSceneChangeAll);
+	obs_data_set_default_bool(obj, PARAM_CLIENT_SENDPREVIEW, SendPreview);
+}
+
+std::string NetworkConfig::GetClientUri()
+{
+	return "ws://" + Address + ":" + std::to_string(ClientPort);
+}
+
+bool NetworkConfig::ShouldSendSceneChange()
+{
+	return ServerEnabled && SendSceneChange;
+}
+
+bool NetworkConfig::ShouldSendFrontendSceneChange()
+{
+	return ShouldSendSceneChange() && SendSceneChangeAll;
+}
+
+bool NetworkConfig::ShouldSendPrviewSceneChange()
+{
+	return ServerEnabled && SendPreview;
+}
+
+WSServer::WSServer() : QObject(nullptr), _connections(), _clMutex()
+{
+	_server.get_alog().clear_channels(
+		websocketpp::log::alevel::frame_header |
+		websocketpp::log::alevel::frame_payload |
+		websocketpp::log::alevel::control);
+	_server.init_asio();
+#ifndef _WIN32
+	_server.set_reuse_addr(true);
+#endif
+
+	_server.set_open_handler(bind(&WSServer::onOpen, this, _1));
+	_server.set_close_handler(bind(&WSServer::onClose, this, _1));
+	_server.set_message_handler(bind(&WSServer::onMessage, this, _1, _2));
+}
+
+WSServer::~WSServer()
+{
+	stop();
+}
+
+void WSServer::start(quint16 port, bool lockToIPv4)
+{
+	if (_server.is_listening() &&
+	    (port == _serverPort && _lockToIPv4 == lockToIPv4)) {
+		blog(LOG_INFO,
+		     "WSServer::start: server already on this port and protocol mode. no restart needed");
+		return;
+	}
+
+	if (_server.is_listening()) {
+		stop();
+	}
+
+	_server.reset();
+
+	_serverPort = port;
+	_lockToIPv4 = lockToIPv4;
+
+	websocketpp::lib::error_code errorCode;
+	if (lockToIPv4) {
+		blog(LOG_INFO, "WSServer::start: Locked to IPv4 bindings");
+		_server.listen(websocketpp::lib::asio::ip::tcp::v4(),
+			       _serverPort, errorCode);
+	} else {
+		blog(LOG_INFO, "WSServer::start: Not locked to IPv4 bindings");
+		_server.listen(_serverPort, errorCode);
+	}
+
+	if (errorCode) {
+		std::string errorCodeMessage = errorCode.message();
+		blog(LOG_INFO, "server: listen failed: %s",
+		     errorCodeMessage.c_str());
+
+		QString errorTitle =
+			obs_module_text("AdvSceneSwitcher.windowTitle");
+		QString errorMessage =
+			QString(obs_module_text(
+					"AdvSceneSwitcher.networkTab.startFailed.message"))
+				.arg(_serverPort)
+				.arg(errorCodeMessage.c_str());
+
+		QMainWindow *mainWindow = reinterpret_cast<QMainWindow *>(
+			obs_frontend_get_main_window());
+		QMessageBox::warning(mainWindow, errorTitle, errorMessage);
+
+		return;
+	}
+	switcher->serverStatus = ServerStatus::STARTING;
+
+	_server.start_accept();
+
+	_threadPool.start(Compatability::CreateFunctionRunnable([=]() {
+		blog(LOG_INFO, "WSServer::start: io thread started");
+		_server.run();
+		blog(LOG_INFO, "WSServer::start: io thread exited");
+	}));
+
+	switcher->serverStatus = ServerStatus::RUNNING;
+	blog(LOG_INFO,
+	     "WSServer::start: server started successfully on port %d",
+	     _serverPort);
+}
+
+void WSServer::stop()
+{
+	if (!_server.is_listening()) {
+		return;
+	}
+
+	_server.stop_listening();
+	for (connection_hdl hdl : _connections) {
+		websocketpp::lib::error_code ec;
+		_server.close(hdl, websocketpp::close::status::going_away,
+			      "Server stopping", ec);
+	}
+
+	_threadPool.waitForDone();
+
+	while (_connections.size() > 0) {
+		std::this_thread::sleep_for(std::chrono::milliseconds(10));
+	}
+
+	switcher->serverStatus = ServerStatus::NOT_RUNNING;
+	blog(LOG_INFO, "server stopped successfully");
+}
+
+void WSServer::sendMessage(SceneSwitchInfo sceneSwitch, bool preview)
+{
+	if (!sceneSwitch.scene) {
+		return;
+	}
+
+	OBSData data = obs_data_create();
+	obs_data_set_string(data, SCENE_ENTRY,
+			    GetWeakSourceName(sceneSwitch.scene).c_str());
+	obs_data_set_string(data, TRANSITION_ENTRY,
+			    GetWeakSourceName(sceneSwitch.transition).c_str());
+	obs_data_set_int(data, TRANSITION_DURATION, sceneSwitch.duration);
+	obs_data_set_bool(data, SET_PREVIEW, preview);
+	std::string message = obs_data_get_json(data);
+	obs_data_release(data);
+
+	for (connection_hdl hdl : _connections) {
+		websocketpp::lib::error_code ec;
+		_server.send(hdl, message, websocketpp::frame::opcode::text,
+			     ec);
+		if (ec) {
+			std::string errorCodeMessage = ec.message();
+			blog(LOG_INFO, "server: send failed: %s",
+			     errorCodeMessage.c_str());
+		}
+	}
+
+	if (VerboseLoggingEnabled()) {
+		blog(LOG_INFO, "server sent message:\n%s", message.c_str());
+	}
+}
+
+void WSServer::onOpen(connection_hdl hdl)
+{
+	{
+		std::lock_guard<std::recursive_mutex> lock(_clMutex);
+		_connections.insert(hdl);
+	}
+
+	QString clientIp = getRemoteEndpoint(hdl);
+	blog(LOG_INFO, "new client connection from %s",
+	     clientIp.toUtf8().constData());
+}
+
+std::string processMessage(std::string payload)
+{
+	auto config = switcher->networkConfig;
+	std::string msgContainer(payload);
+	const char *msg = msgContainer.c_str();
+
+	OBSData data = obs_data_create_from_json(msg);
+	if (!data) {
+		blog(LOG_ERROR, "invalid JSON payload received for '%s'", msg);
+		return "invalid JSON payload";
+	}
+
+	if (!obs_data_has_user_value(data, SCENE_ENTRY) ||
+	    !obs_data_has_user_value(data, TRANSITION_ENTRY) ||
+	    !obs_data_has_user_value(data, TRANSITION_DURATION) ||
+	    !obs_data_has_user_value(data, SET_PREVIEW)) {
+		return "missing request parameters";
+	}
+
+	std::string sceneName = obs_data_get_string(data, SCENE_ENTRY);
+	std::string transitionName =
+		obs_data_get_string(data, TRANSITION_ENTRY);
+	int duration = obs_data_get_int(data, TRANSITION_DURATION);
+	bool preview = obs_data_get_bool(data, SET_PREVIEW);
+
+	obs_data_release(data);
+
+	auto scene = GetWeakSourceByName(sceneName.c_str());
+	if (!scene) {
+		return "ignoring request - unknown scene '" + sceneName + "'";
+	}
+
+	std::string ret = "message ok";
+
+	auto transition = GetWeakTransitionByName(transitionName.c_str());
+	if (VerboseLoggingEnabled() && !transition) {
+		ret += " - ignoring invalid transition: '" + transitionName +
+		       "'";
+	}
+	if (preview) {
+		SwitchPreviewScene(scene);
+	} else {
+		SwitchScene({scene, transition, duration});
+	}
+	return ret;
+}
+
+void WSServer::onMessage(connection_hdl, server::message_ptr message)
+{
+	auto opcode = message->get_opcode();
+	if (opcode != websocketpp::frame::opcode::text) {
+		return;
+	}
+
+	_threadPool.start(Compatability::CreateFunctionRunnable([=]() {
+		if (message->get_payload() != "message ok") {
+			blog(LOG_WARNING, "received response: %s",
+			     message->get_payload().c_str());
+		}
+	}));
+}
+
+void WSServer::onClose(connection_hdl hdl)
+{
+	{
+		std::lock_guard<std::recursive_mutex> lock(_clMutex);
+		_connections.erase(hdl);
+	}
+
+	auto conn = _server.get_con_from_hdl(hdl);
+	auto localCloseCode = conn->get_local_close_code();
+
+	if (localCloseCode != websocketpp::close::status::going_away) {
+		QString clientIp = getRemoteEndpoint(hdl);
+		blog(LOG_INFO, "client %s disconnected",
+		     clientIp.toUtf8().constData());
+	}
+}
+
+QString WSServer::getRemoteEndpoint(connection_hdl hdl)
+{
+	auto conn = _server.get_con_from_hdl(hdl);
+	return QString::fromStdString(conn->get_remote_endpoint());
+}
+
+WSClient::WSClient() : QObject(nullptr)
+{
+	_client.get_alog().clear_channels(
+		websocketpp::log::alevel::frame_header |
+		websocketpp::log::alevel::frame_payload |
+		websocketpp::log::alevel::control);
+	_client.init_asio();
+#ifndef _WIN32
+	_client.set_reuse_addr(true);
+#endif
+
+	_client.set_open_handler(bind(&WSClient::onOpen, this, _1));
+	_client.set_fail_handler(bind(&WSClient::onFail, this, _1));
+	_client.set_message_handler(bind(&WSClient::onMessage, this, _1, _2));
+	_client.set_close_handler(bind(&WSClient::onClose, this, _1));
+}
+
+WSClient::~WSClient()
+{
+	disconnect();
+}
+
+void WSClient::connectThread()
+{
+	while (_retry) {
+		_client.reset();
+		switcher->clientStatus = ClientStatus::CONNECTING;
+		// Create a connection to the given URI and queue it for connection once
+		// the event loop starts
+		websocketpp::lib::error_code ec;
+		client::connection_ptr con = _client.get_connection(_uri, ec);
+		if (ec) {
+			_failMsg = ec.message();
+			blog(LOG_INFO, "client: connect failed: %s",
+			     _failMsg.c_str());
+			switcher->clientStatus = ClientStatus::FAIL;
+		} else {
+			_client.connect(con);
+			_connection = connection_hdl(con);
+
+			// Start the ASIO io_service run loop
+			blog(LOG_INFO, "WSClient::connect: io thread started");
+			_connected = true;
+			_client.run();
+			_connected = false;
+			blog(LOG_INFO, "WSClient::connect: io thread exited");
+		}
+
+		if (_retry) {
+			std::unique_lock<std::mutex> lck(_waitMtx);
+			blog(LOG_INFO,
+			     "trying to reconnect to %s in %d seconds.",
+			     _uri.c_str(), RECONNECT_DELAY);
+			_cv.wait_for(lck,
+				     std::chrono::seconds(RECONNECT_DELAY));
+		}
+	}
+}
+
+void WSClient::connect(std::string uri)
+{
+	disconnect();
+	_uri = uri;
+	_retry = true;
+
+	_thread = std::thread(&WSClient::connectThread, this);
+
+	switcher->clientStatus = ClientStatus::DISCONNECTED;
+	blog(LOG_INFO, "WSClient::connect: exited");
+}
+
+void WSClient::disconnect()
+{
+	_retry = false;
+	websocketpp::lib::error_code ec;
+	_client.close(_connection, websocketpp::close::status::normal,
+		      "Client stopping", ec);
+
+	{
+		std::unique_lock<std::mutex> waitLck(_waitMtx);
+		blog(LOG_INFO, "trying to reconnect to %s in %d seconds.",
+		     _uri.c_str(), RECONNECT_DELAY);
+		_cv.notify_all();
+	}
+
+	while (_connected) {
+		std::this_thread::sleep_for(std::chrono::milliseconds(10));
+		_client.close(_connection, websocketpp::close::status::normal,
+			      "Client stopping", ec);
+	}
+
+	if (_thread.joinable()) {
+		_thread.join();
+	}
+}
+
+void WSClient::onOpen(connection_hdl)
+{
+	blog(LOG_INFO, "connection to %s opened", _uri.c_str());
+	switcher->clientStatus = ClientStatus::CONNECTED;
+}
+
+void WSClient::onFail(connection_hdl)
+{
+	blog(LOG_INFO, "connection to %s failed", _uri.c_str());
+}
+
+void WSClient::onMessage(connection_hdl hdl, client::message_ptr message)
+{
+	auto opcode = message->get_opcode();
+	if (opcode != websocketpp::frame::opcode::text) {
+		return;
+	}
+
+	std::string payload = message->get_payload();
+	std::string response = processMessage(payload);
+	websocketpp::lib::error_code errorCode;
+	_client.send(hdl, response, websocketpp::frame::opcode::text,
+		     errorCode);
+
+	if (errorCode) {
+		std::string errorCodeMessage = errorCode.message();
+		blog(LOG_INFO, "client(response): send failed: %s",
+		     errorCodeMessage.c_str());
+	}
+
+	if (VerboseLoggingEnabled()) {
+		blog(LOG_INFO, "client sent message:\n%s", response.c_str());
+	}
+}
+
+void WSClient::onClose(connection_hdl)
+{
+	blog(LOG_INFO, "client-connection to %s closed.", _uri.c_str());
+	switcher->clientStatus = ClientStatus::DISCONNECTED;
+}
+
+void SwitcherData::loadNetworkSettings(obs_data_t *obj)
+{
+	networkConfig.Load(obj);
+}
+
+void SwitcherData::saveNetworkSwitches(obs_data_t *obj)
+{
+	networkConfig.Save(obj);
+	if (!networkConfig.ServerEnabled) {
+		server.stop();
+	}
+}
+
+void AdvSceneSwitcher::SetupNetworkTab()
+{
+	ui->serverSettings->setChecked(switcher->networkConfig.ServerEnabled);
+	ui->serverPort->setValue(switcher->networkConfig.ServerPort);
+	ui->lockToIPv4->setChecked(switcher->networkConfig.LockToIPv4);
+
+	ui->clientSettings->setChecked(switcher->networkConfig.ClientEnabled);
+	ui->clientHostname->setText(switcher->networkConfig.Address.c_str());
+	ui->clientPort->setValue(switcher->networkConfig.ClientPort);
+	ui->sendSceneChange->setChecked(
+		switcher->networkConfig.SendSceneChange);
+	ui->restrictSend->setChecked(
+		!switcher->networkConfig.SendSceneChangeAll);
+	ui->sendPreview->setChecked(switcher->networkConfig.SendPreview);
+	ui->restrictSend->setDisabled(!switcher->networkConfig.SendSceneChange);
+
+	QTimer *statusTimer = new QTimer(this);
+	connect(statusTimer, SIGNAL(timeout()), this,
+		SLOT(UpdateClientStatus()));
+	connect(statusTimer, SIGNAL(timeout()), this,
+		SLOT(UpdateServerStatus()));
+	statusTimer->start(500);
+}
+
+void AdvSceneSwitcher::on_serverSettings_toggled(bool on)
+{
+	if (loading) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	switcher->networkConfig.ServerEnabled = on;
+	if (on) {
+		switcher->server.start(switcher->networkConfig.ServerPort,
+				       switcher->networkConfig.LockToIPv4);
+	} else {
+		switcher->server.stop();
+	}
+}
+
+void AdvSceneSwitcher::on_serverPort_valueChanged(int value)
+{
+	if (loading) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	switcher->networkConfig.ServerPort = value;
+}
+
+void AdvSceneSwitcher::on_lockToIPv4_stateChanged(int state)
+{
+	if (loading) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	switcher->networkConfig.LockToIPv4 = state;
+}
+
+void AdvSceneSwitcher::on_serverRestart_clicked()
+{
+	if (loading) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	switcher->server.start(switcher->networkConfig.ServerPort,
+			       switcher->networkConfig.LockToIPv4);
+}
+
+void AdvSceneSwitcher::UpdateServerStatus()
+{
+	switch (switcher->serverStatus) {
+	case ServerStatus::NOT_RUNNING:
+		ui->serverStatus->setText(obs_module_text(
+			"AdvSceneSwitcher.networkTab.server.status.notRunning"));
+		break;
+	case ServerStatus::STARTING:
+		ui->serverStatus->setText(obs_module_text(
+			"AdvSceneSwitcher.networkTab.server.status.starting"));
+		break;
+	case ServerStatus::RUNNING:
+		ui->serverStatus->setText(obs_module_text(
+			"AdvSceneSwitcher.networkTab.server.status.running"));
+		break;
+	default:
+		break;
+	}
+}
+
+void AdvSceneSwitcher::on_clientSettings_toggled(bool on)
+{
+	if (loading) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	switcher->networkConfig.ClientEnabled = on;
+
+	if (on) {
+		switcher->client.connect(
+			switcher->networkConfig.GetClientUri());
+	} else {
+		switcher->client.disconnect();
+	}
+}
+
+void AdvSceneSwitcher::on_clientHostname_textChanged(const QString &text)
+{
+	if (loading) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	switcher->networkConfig.Address = text.toUtf8().constData();
+}
+
+void AdvSceneSwitcher::on_clientPort_valueChanged(int value)
+{
+	if (loading) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	switcher->networkConfig.ClientPort = value;
+}
+
+void AdvSceneSwitcher::on_sendSceneChange_stateChanged(int state)
+{
+	if (loading) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	switcher->networkConfig.SendSceneChange = state;
+	ui->restrictSend->setDisabled(!state);
+}
+
+void AdvSceneSwitcher::on_restrictSend_stateChanged(int state)
+{
+	if (loading) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	switcher->networkConfig.SendSceneChangeAll = !state;
+}
+
+void AdvSceneSwitcher::on_sendPreview_stateChanged(int state)
+{
+	if (loading) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	switcher->networkConfig.SendPreview = state;
+}
+
+void AdvSceneSwitcher::on_clientReconnect_clicked()
+{
+	if (loading) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	switcher->client.connect(switcher->networkConfig.GetClientUri());
+}
+
+void AdvSceneSwitcher::UpdateClientStatus()
+{
+	switch (switcher->clientStatus) {
+	case ClientStatus::DISCONNECTED:
+		ui->clientStatus->setText(obs_module_text(
+			"AdvSceneSwitcher.networkTab.client.status.disconnected"));
+		break;
+	case ClientStatus::CONNECTING:
+		ui->clientStatus->setText(obs_module_text(
+			"AdvSceneSwitcher.networkTab.client.status.connecting"));
+		break;
+	case ClientStatus::CONNECTED:
+		ui->clientStatus->setText(obs_module_text(
+			"AdvSceneSwitcher.networkTab.client.status.connected"));
+		break;
+	case ClientStatus::FAIL:
+		ui->clientStatus->setText(QString("Error: ") +
+					  switcher->client.getFail().c_str());
+		break;
+	default:
+		break;
+	}
+}
+
+void Compatability::StdFunctionRunnable::run()
+{
+	cb();
+}
+
+QRunnable *Compatability::CreateFunctionRunnable(std::function<void()> func)
+{
+	return new Compatability::StdFunctionRunnable(std::move(func));
+}
+
+Compatability::StdFunctionRunnable::StdFunctionRunnable(
+	std::function<void()> func)
+	: cb(std::move(func))
+{
+}
+
+} // namespace advss

lib/legacy/switch-network.hpp

@@ -0,0 +1,137 @@
+/*
+Most of this code is based on https://github.com/Palakis/obs-websocket
+*/
+
+#pragma once
+
+#include <set>
+#include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
+#include <QtCore/QVariantHash>
+#include <QtCore/QThreadPool>
+#include <mutex>
+#include <condition_variable>
+#include <functional>
+#include <QRunnable>
+
+#include <websocketpp/config/asio_no_tls_client.hpp>
+#include <websocketpp/config/asio_no_tls.hpp>
+#include <websocketpp/server.hpp>
+#include <websocketpp/client.hpp>
+
+namespace advss {
+
+using websocketpp::connection_hdl;
+typedef websocketpp::server<websocketpp::config::asio> server;
+typedef websocketpp::client<websocketpp::config::asio_client> client;
+
+struct SceneSwitchInfo;
+
+class NetworkConfig {
+public:
+	NetworkConfig();
+	void Load(obs_data_t *obj);
+	void Save(obs_data_t *obj);
+	void SetDefaults(obs_data_t *obj);
+
+	std::string GetClientUri();
+
+	bool ShouldSendSceneChange();
+	bool ShouldSendFrontendSceneChange();
+	bool ShouldSendPrviewSceneChange();
+
+	// Server
+	bool ServerEnabled;
+	uint64_t ServerPort;
+	bool LockToIPv4;
+
+	// Client
+	bool ClientEnabled;
+	std::string Address;
+	uint64_t ClientPort;
+	bool SendSceneChange;
+	bool SendSceneChangeAll;
+	bool SendPreview;
+};
+
+class WSServer : public QObject {
+	Q_OBJECT
+
+public:
+	explicit WSServer();
+	virtual ~WSServer();
+	void start(quint16 port, bool lockToIPv4);
+	void stop();
+	void sendMessage(SceneSwitchInfo sceneSwitch, bool preview = false);
+	QThreadPool *threadPool() { return &_threadPool; }
+
+private:
+	void onOpen(connection_hdl hdl);
+	void onMessage(connection_hdl hdl, server::message_ptr message);
+	void onClose(connection_hdl hdl);
+
+	QString getRemoteEndpoint(connection_hdl hdl);
+
+	server _server;
+	quint16 _serverPort = 55555;
+	bool _lockToIPv4 = false;
+	std::set<connection_hdl, std::owner_less<connection_hdl>> _connections;
+	std::recursive_mutex _clMutex;
+	QThreadPool _threadPool;
+};
+
+enum class ServerStatus {
+	NOT_RUNNING,
+	STARTING,
+	RUNNING,
+};
+
+class WSClient : public QObject {
+	Q_OBJECT
+
+public:
+	explicit WSClient();
+	virtual ~WSClient();
+	void connect(std::string uri);
+	void disconnect();
+	std::string getFail() { return _failMsg; }
+
+private:
+	void onOpen(connection_hdl hdl);
+	void onFail(connection_hdl hdl);
+	void onMessage(connection_hdl hdl, client::message_ptr message);
+	void onClose(connection_hdl hdl);
+	void connectThread();
+
+	client _client;
+	std::string _uri;
+	connection_hdl _connection;
+	std::thread _thread;
+	bool _retry = false;
+	std::atomic_bool _connected = {false};
+	std::mutex _waitMtx;
+	std::condition_variable _cv;
+	std::string _failMsg;
+};
+
+enum class ClientStatus {
+	DISCONNECTED,
+	CONNECTING,
+	CONNECTED,
+	FAIL,
+};
+
+namespace Compatability {
+// Reimplement QRunnable for std::function. Retrocompatability for Qt < 5.15
+class StdFunctionRunnable : public QRunnable {
+	std::function<void()> cb;
+
+public:
+	StdFunctionRunnable(std::function<void()> func);
+	void run() override;
+};
+
+QRunnable *CreateFunctionRunnable(std::function<void()> func);
+} // namespace Compatability
+
+} // namespace advss

lib/legacy/switch-pause.cpp

@@ -10,7 +10,7 @@
 
 namespace advss {
 
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;
 
 void AdvSceneSwitcher::on_pauseAdd_clicked()
 {
@@ -20,7 +20,7 @@ void AdvSceneSwitcher::on_pauseAdd_clicked()
 	listAddClicked(ui->pauseEntries,
 		       new PauseEntryWidget(this,
 					    &switcher->pauseEntries.back()),
-		       &addPulse);
+		       ui->pauseAdd, &addPulse);
 
 	ui->pauseHelp->setVisible(false);
 }
@@ -264,8 +264,7 @@ void AdvSceneSwitcher::SetupPauseTab()
 
 	if (switcher->pauseEntries.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse = HighlightWidget(ui->pauseAdd,
-						   QColor(Qt::green));
+			addPulse = PulseWidget(ui->pauseAdd, QColor(Qt::green));
 		}
 		ui->pauseHelp->setVisible(true);
 	} else {

lib/legacy/switch-random.cpp

@@ -9,7 +9,7 @@
 namespace advss {
 
 bool RandomSwitch::pause = false;
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;
 
 void AdvSceneSwitcher::on_randomAdd_clicked()
 {
@@ -19,7 +19,7 @@ void AdvSceneSwitcher::on_randomAdd_clicked()
 	listAddClicked(ui->randomSwitches,
 		       new RandomSwitchWidget(this,
 					      &switcher->randomSwitches.back()),
-		       &addPulse);
+		       ui->randomAdd, &addPulse);
 
 	ui->randomHelp->setVisible(false);
 }
@@ -131,8 +131,8 @@ void AdvSceneSwitcher::SetupRandomTab()
 
 	if (switcher->randomSwitches.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse = HighlightWidget(ui->randomAdd,
-						   QColor(Qt::green));
+			addPulse =
+				PulseWidget(ui->randomAdd, QColor(Qt::green));
 		}
 		ui->randomHelp->setVisible(true);
 	} else {
@@ -143,12 +143,12 @@ void AdvSceneSwitcher::SetupRandomTab()
 		border-style: outset; \
 		border-width: 2px; \
 		border-radius: 7px; \
-		border-color: rgb(0,0,0) \
+		border-color: rgb(0,0,0,0) \
 		}");
 	if (switcher->switchIfNotMatching != NoMatchBehavior::RANDOM_SWITCH) {
 		if (!switcher->disableHints) {
-			HighlightWidget(ui->randomDisabledWarning,
-					QColor(Qt::red), QColor(0, 0, 0, 0));
+			PulseWidget(ui->randomDisabledWarning, QColor(Qt::red),
+				    QColor(0, 0, 0, 0));
 		}
 	} else {
 		ui->randomDisabledWarning->setVisible(false);

lib/legacy/switch-screen-region.cpp

@@ -11,7 +11,7 @@
 namespace advss {
 
 bool ScreenRegionSwitch::pause = false;
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;
 
 void AdvSceneSwitcher::ClearFrames(QListWidget *list)
 {
@@ -79,7 +79,7 @@ void AdvSceneSwitcher::on_screenRegionAdd_clicked()
 	listAddClicked(ui->screenRegionSwitches,
 		       new ScreenRegionWidget(
 			       this, &switcher->screenRegionSwitches.back()),
-		       &addPulse);
+		       ui->screenRegionAdd, &addPulse);
 
 	ui->regionHelp->setVisible(false);
 }
@@ -248,8 +248,8 @@ void AdvSceneSwitcher::SetupRegionTab()
 
 	if (switcher->screenRegionSwitches.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse = HighlightWidget(ui->screenRegionAdd,
-						   QColor(Qt::green));
+			addPulse = PulseWidget(ui->screenRegionAdd,
+					       QColor(Qt::green));
 		}
 		ui->regionHelp->setVisible(true);
 	} else {

lib/legacy/switch-sequence.cpp

@@ -16,7 +16,7 @@ namespace advss {
 constexpr auto max_extend_text_size = 150;
 
 bool SceneSequenceSwitch::pause = false;
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;
 
 void AdvSceneSwitcher::on_sceneSequenceAdd_clicked()
 {
@@ -26,7 +26,7 @@ void AdvSceneSwitcher::on_sceneSequenceAdd_clicked()
 	listAddClicked(ui->sceneSequenceSwitches,
 		       new SequenceWidget(
 			       this, &switcher->sceneSequenceSwitches.back()),
-		       &addPulse);
+		       ui->sceneSequenceAdd, &addPulse);
 
 	ui->sequenceHelp->setVisible(false);
 }
@@ -299,8 +299,8 @@ void AdvSceneSwitcher::SetupSequenceTab()
 
 	if (switcher->sceneSequenceSwitches.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse = HighlightWidget(ui->sceneSequenceAdd,
-						   QColor(Qt::green));
+			addPulse = PulseWidget(ui->sceneSequenceAdd,
+					       QColor(Qt::green));
 		}
 		ui->sequenceHelp->setVisible(true);
 	} else {
@@ -585,8 +585,6 @@ SequenceWidget::SequenceWidget(QWidget *parent, SceneSequenceSwitch *s,
 			    QVariant(QStringLiteral("addIconSmall")));
 	reduce->setProperty("themeID",
 			    QVariant(QStringLiteral("removeIconSmall")));
-	extend->setProperty("class", QVariant(QStringLiteral("icon-plus")));
-	reduce->setProperty("class", QVariant(QStringLiteral("icon-trash")));
 
 	extend->setMaximumSize(22, 22);
 	reduce->setMaximumSize(22, 22);

lib/legacy/switch-time.cpp

@@ -7,7 +7,7 @@
 namespace advss {
 
 bool TimeSwitch::pause = false;
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;
 
 void AdvSceneSwitcher::on_timeAdd_clicked()
 {
@@ -17,7 +17,7 @@ void AdvSceneSwitcher::on_timeAdd_clicked()
 	listAddClicked(ui->timeSwitches,
 		       new TimeSwitchWidget(this,
 					    &switcher->timeSwitches.back()),
-		       &addPulse);
+		       ui->timeAdd, &addPulse);
 
 	ui->timeHelp->setVisible(false);
 }
@@ -197,8 +197,7 @@ void AdvSceneSwitcher::SetupTimeTab()
 
 	if (switcher->timeSwitches.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse =
-				HighlightWidget(ui->timeAdd, QColor(Qt::green));
+			addPulse = PulseWidget(ui->timeAdd, QColor(Qt::green));
 		}
 		ui->timeHelp->setVisible(true);
 	} else {

lib/legacy/switch-video.cpp

@@ -14,7 +14,7 @@
 namespace advss {
 
 bool VideoSwitch::pause = false;
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;
 
 void AdvSceneSwitcher::on_videoAdd_clicked()
 {
@@ -24,7 +24,7 @@ void AdvSceneSwitcher::on_videoAdd_clicked()
 	VideoSwitchWidget *sw =
 		new VideoSwitchWidget(this, &switcher->videoSwitches.back());
 
-	listAddClicked(ui->videoSwitches, sw, &addPulse);
+	listAddClicked(ui->videoSwitches, sw, ui->videoAdd, &addPulse);
 
 	ui->videoHelp->setVisible(false);
 }
@@ -105,7 +105,7 @@ void AdvSceneSwitcher::on_getScreenshot_clicked()
 	}
 
 	auto source = obs_weak_source_get_source(s->videoSource);
-	auto screenshotData = std::make_unique<Screenshot>(source);
+	auto screenshotData = std::make_unique<ScreenshotHelper>(source);
 	obs_source_release(source);
 
 	QString filePath = QFileDialog::getSaveFileName(this);
@@ -121,16 +121,16 @@ void AdvSceneSwitcher::on_getScreenshot_clicked()
 	// During selection of the save path enough time should usually have
 	// passed already
 	// Add this just in case ...
-	if (!screenshotData->IsDone()) {
+	if (!screenshotData->done) {
 		std::this_thread::sleep_for(std::chrono::seconds(1));
 	}
 
-	if (!screenshotData->IsDone()) {
+	if (!screenshotData->done) {
 		DisplayMessage("Failed to get screenshot of source!");
 		return;
 	}
 
-	screenshotData->GetImage().save(file.fileName());
+	screenshotData->image.save(file.fileName());
 	sw->SetFilePath(file.fileName());
 }
 
@@ -202,8 +202,7 @@ void AdvSceneSwitcher::SetupVideoTab()
 
 	if (switcher->videoSwitches.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse = HighlightWidget(ui->videoAdd,
-						   QColor(Qt::green));
+			addPulse = PulseWidget(ui->videoAdd, QColor(Qt::green));
 		}
 		ui->videoHelp->setVisible(true);
 	} else {
@@ -262,7 +261,7 @@ void VideoSwitch::load(obs_data_t *obj)
 void VideoSwitch::getScreenshot()
 {
 	auto source = obs_weak_source_get_source(videoSource);
-	screenshotData = std::make_unique<Screenshot>(source);
+	screenshotData = std::make_unique<ScreenshotHelper>(source);
 	obs_source_release(source);
 }
 
@@ -293,55 +292,56 @@ bool VideoSwitch::checkMatch()
 
 	bool match = false;
 
-	if (!screenshotData) {
-		getScreenshot();
-		return match;
+	if (screenshotData) {
+		if (screenshotData->done) {
+			bool conditionMatch = false;
+
+			switch (condition) {
+			case videoSwitchType::MATCH:
+				conditionMatch = screenshotData->image ==
+						 matchImage;
+				break;
+			case videoSwitchType::DIFFER:
+				conditionMatch = screenshotData->image !=
+						 matchImage;
+				break;
+			case videoSwitchType::HAS_NOT_CHANGED:
+				conditionMatch = screenshotData->image ==
+						 matchImage;
+				break;
+			case videoSwitchType::HAS_CHANGED:
+				conditionMatch = screenshotData->image !=
+						 matchImage;
+				break;
+			default:
+				break;
+			}
+
+			if (conditionMatch) {
+				currentMatchDuration +=
+					std::chrono::duration_cast<
+						std::chrono::milliseconds>(
+						screenshotData->time -
+						previousTime);
+			} else {
+				currentMatchDuration = {};
+			}
+
+			bool durationMatch = currentMatchDuration.count() >=
+					     duration * 1000;
+
+			if (conditionMatch && durationMatch) {
+				match = true;
+			}
+
+			if (!requiresFileInput(condition)) {
+				matchImage = std::move(screenshotData->image);
+			}
+			previousTime = std::move(screenshotData->time);
+
+			screenshotData.reset(nullptr);
+		}
 	}
-	if (!screenshotData->IsDone()) {
-		getScreenshot();
-		return match;
-	}
-
-	bool conditionMatch = false;
-
-	switch (condition) {
-	case videoSwitchType::MATCH:
-		conditionMatch = screenshotData->GetImage() == matchImage;
-		break;
-	case videoSwitchType::DIFFER:
-		conditionMatch = screenshotData->GetImage() != matchImage;
-		break;
-	case videoSwitchType::HAS_NOT_CHANGED:
-		conditionMatch = screenshotData->GetImage() == matchImage;
-		break;
-	case videoSwitchType::HAS_CHANGED:
-		conditionMatch = screenshotData->GetImage() != matchImage;
-		break;
-	default:
-		break;
-	}
-
-	if (conditionMatch) {
-		currentMatchDuration +=
-			std::chrono::duration_cast<std::chrono::milliseconds>(
-				screenshotData->GetScreenshotTime() -
-				previousTime);
-	} else {
-		currentMatchDuration = {};
-	}
-
-	bool durationMatch = currentMatchDuration.count() >= duration * 1000;
-
-	if (conditionMatch && durationMatch) {
-		match = true;
-	}
-
-	if (!requiresFileInput(condition)) {
-		matchImage = screenshotData->GetImage();
-	}
-	previousTime = screenshotData->GetScreenshotTime();
-
-	screenshotData.reset(nullptr);
 
 	getScreenshot();
 	return match;

lib/legacy/switch-video.hpp

@@ -32,7 +32,7 @@ struct VideoSwitch : virtual SceneSwitcherEntry {
 	double duration = 0;
 	bool ignoreInactiveSource = false;
 
-	std::unique_ptr<Screenshot> screenshotData = nullptr;
+	std::unique_ptr<ScreenshotHelper> screenshotData = nullptr;
 	std::chrono::high_resolution_clock::time_point previousTime{};
 	QImage matchImage;
 

lib/legacy/switch-window.cpp

@@ -11,7 +11,7 @@
 namespace advss {
 
 bool WindowSwitch::pause = false;
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;
 
 void AdvSceneSwitcher::on_windowAdd_clicked()
 {
@@ -21,7 +21,7 @@ void AdvSceneSwitcher::on_windowAdd_clicked()
 	listAddClicked(ui->windowSwitches,
 		       new WindowSwitchWidget(this,
 					      &switcher->windowSwitches.back()),
-		       &addPulse);
+		       ui->windowAdd, &addPulse);
 
 	ui->windowHelp->setVisible(false);
 }
@@ -335,8 +335,8 @@ void AdvSceneSwitcher::SetupTitleTab()
 
 	if (switcher->windowSwitches.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse = HighlightWidget(ui->windowAdd,
-						   QColor(Qt::green));
+			addPulse =
+				PulseWidget(ui->windowAdd, QColor(Qt::green));
 		}
 		ui->windowHelp->setVisible(true);
 	} else {

lib/macro/macro-action-edit.cpp

@@ -1,7 +1,7 @@
 #include "macro-action-edit.hpp"
 #include "advanced-scene-switcher.hpp"
 #include "macro-helpers.hpp"
-#include "macro-settings.hpp"
+#include "macro-properties.hpp"
 #include "macro.hpp"
 #include "plugin-state-helpers.hpp"
 #include "section.hpp"
@@ -29,7 +29,8 @@ static inline void populateActionSelection(QComboBox *list)
 MacroActionEdit::MacroActionEdit(QWidget *parent,
 				 std::shared_ptr<MacroAction> *entryData,
 				 const std::string &id)
-	: MacroSegmentEdit(parent),
+	: MacroSegmentEdit(GetGlobalMacroProperties()._highlightActions,
+			   parent),
 	  _actionSelection(new FilterComboBox()),
 	  _enable(new SwitchButton()),
 	  _entryData(entryData)
@@ -39,6 +40,8 @@ MacroActionEdit::MacroActionEdit(QWidget *parent,
 			 SLOT(ActionSelectionChanged(const QString &)));
 	QWidget::connect(_enable, SIGNAL(checked(bool)), this,
 			 SLOT(ActionEnableChanged(bool)));
+	QWidget::connect(window(), SIGNAL(HighlightActionsChanged(bool)), this,
+			 SLOT(EnableHighlight(bool)));
 	QWidget::connect(&_actionStateTimer, SIGNAL(timeout()), this,
 			 SLOT(UpdateActionState()));
 
@@ -158,20 +161,33 @@ std::shared_ptr<MacroSegment> MacroActionEdit::Data() const
 	return *_entryData;
 }
 
-void AdvSceneSwitcher::AddMacroAction(Macro *macro, int idx,
-				      const std::string &id, obs_data_t *data)
+void AdvSceneSwitcher::AddMacroAction(int idx)
 {
-	if (idx < 0 || idx > (int)macro->Actions().size()) {
-		assert(false);
+	auto macro = GetSelectedMacro();
+	if (!macro) {
 		return;
 	}
 
+	if (idx < 0 || idx > (int)macro->Actions().size()) {
+		return;
+	}
+
+	std::string id;
+	if (idx - 1 >= 0) {
+		id = macro->Actions().at(idx - 1)->GetId();
+	} else {
+		id = MacroAction::GetDefaultID();
+	}
 	{
 		auto lock = LockContext();
-		macro->Actions().emplace(macro->Actions().begin() + idx,
-					 MacroActionFactory::Create(id, macro));
-		if (data) {
+		macro->Actions().emplace(
+			macro->Actions().begin() + idx,
+			MacroActionFactory::Create(id, macro.get()));
+		if (idx - 1 >= 0) {
+			auto data = obs_data_create();
+			macro->Actions().at(idx - 1)->Save(data);
 			macro->Actions().at(idx)->Load(data);
+			obs_data_release(data);
 		}
 		macro->Actions().at(idx)->PostLoad();
 		RunPostLoadSteps();
@@ -182,37 +198,9 @@ void AdvSceneSwitcher::AddMacroAction(Macro *macro, int idx,
 		SetActionData(*macro);
 	}
 	HighlightAction(idx);
-	ui->actionsList->SetHelpMsgVisible(false);
 	emit(MacroSegmentOrderChanged());
 }
 
-void AdvSceneSwitcher::AddMacroAction(int idx)
-{
-	auto macro = GetSelectedMacro();
-	if (!macro) {
-		return;
-	}
-
-	if (idx < 0 || idx > (int)macro->Actions().size()) {
-		assert(false);
-		return;
-	}
-
-	std::string id;
-	if (idx - 1 >= 0) {
-		id = macro->Actions().at(idx - 1)->GetId();
-	} else {
-		id = MacroAction::GetDefaultID();
-	}
-
-	OBSDataAutoRelease data;
-	if (idx - 1 >= 0) {
-		data = obs_data_create();
-		macro->Actions().at(idx - 1)->Save(data);
-	}
-	AddMacroAction(macro.get(), idx, id, data);
-}
-
 void AdvSceneSwitcher::on_actionAdd_clicked()
 {
 	auto macro = GetSelectedMacro();
@@ -228,6 +216,7 @@ void AdvSceneSwitcher::on_actionAdd_clicked()
 	if (currentActionIdx != -1) {
 		MacroActionSelectionChanged(currentActionIdx + 1);
 	}
+	ui->actionsList->SetHelpMsgVisible(false);
 }
 
 void AdvSceneSwitcher::RemoveMacroAction(int idx)
@@ -322,6 +311,7 @@ void AdvSceneSwitcher::on_elseActionAdd_clicked()
 	if (currentElseActionIdx != -1) {
 		MacroElseActionSelectionChanged(currentElseActionIdx + 1);
 	}
+	ui->elseActionsList->SetHelpMsgVisible(false);
 }
 
 void AdvSceneSwitcher::on_elseActionRemove_clicked()
@@ -460,21 +450,31 @@ void AdvSceneSwitcher::MacroElseActionReorder(int to, int from)
 	emit(MacroSegmentOrderChanged());
 }
 
-void AdvSceneSwitcher::AddMacroElseAction(Macro *macro, int idx,
-					  const std::string &id,
-					  obs_data_t *data)
+void AdvSceneSwitcher::AddMacroElseAction(int idx)
 {
-	if (idx < 0 || idx > (int)macro->ElseActions().size()) {
-		assert(false);
+	auto macro = GetSelectedMacro();
+	if (!macro) {
 		return;
 	}
 
+	if (idx < 0 || idx > (int)macro->ElseActions().size()) {
+		return;
+	}
+
+	std::string id;
+	if (idx - 1 >= 0) {
+		id = macro->ElseActions().at(idx - 1)->GetId();
+	} else {
+		id = MacroAction::GetDefaultID();
+	}
 	{
 		auto lock = LockContext();
-		macro->ElseActions().emplace(macro->ElseActions().begin() + idx,
-					     MacroActionFactory::Create(id,
-									macro));
-		if (data) {
+		macro->ElseActions().emplace(
+			macro->ElseActions().begin() + idx,
+			MacroActionFactory::Create(id, macro.get()));
+		if (idx - 1 >= 0) {
+			OBSDataAutoRelease data = obs_data_create();
+			macro->ElseActions().at(idx - 1)->Save(data);
 			macro->ElseActions().at(idx)->Load(data);
 		}
 		macro->ElseActions().at(idx)->PostLoad();
@@ -486,37 +486,9 @@ void AdvSceneSwitcher::AddMacroElseAction(Macro *macro, int idx,
 		SetElseActionData(*macro);
 	}
 	HighlightElseAction(idx);
-	ui->elseActionsList->SetHelpMsgVisible(false);
 	emit(MacroSegmentOrderChanged());
 }
 
-void AdvSceneSwitcher::AddMacroElseAction(int idx)
-{
-	auto macro = GetSelectedMacro();
-	if (!macro) {
-		return;
-	}
-
-	if (idx < 0 || idx > (int)macro->ElseActions().size()) {
-		assert(false);
-		return;
-	}
-
-	std::string id;
-	if (idx - 1 >= 0) {
-		id = macro->ElseActions().at(idx - 1)->GetId();
-	} else {
-		id = MacroAction::GetDefaultID();
-	}
-
-	OBSDataAutoRelease data;
-	if (idx - 1 >= 0) {
-		data = obs_data_create();
-		macro->ElseActions().at(idx - 1)->Save(data);
-	}
-	AddMacroElseAction(macro.get(), idx, id, data);
-}
-
 void AdvSceneSwitcher::RemoveMacroElseAction(int idx)
 {
 	auto macro = GetSelectedMacro();
@@ -535,7 +507,7 @@ void AdvSceneSwitcher::RemoveMacroElseAction(int idx)
 		SetMacroAbortWait(true);
 		GetMacroWaitCV().notify_all();
 		macro->UpdateElseActionIndices();
-		SetElseActionData(*macro);
+		SetActionData(*macro);
 	}
 	MacroElseActionSelectionChanged(-1);
 	lastInteracted = MacroSection::ELSE_ACTIONS;

lib/macro/macro-action-factory.cpp

@@ -1,28 +1,7 @@
 #include "macro-action-factory.hpp"
 
-#include <mutex>
-
 namespace advss {
 
-namespace {
-
-class MacroActionUnknown : public MacroAction {
-public:
-	MacroActionUnknown(Macro *m) : MacroAction(m) {}
-	std::shared_ptr<MacroAction> Copy() const
-	{
-		return std::make_shared<MacroActionUnknown>(GetMacro());
-	}
-	bool PerformAction() { return true; };
-	bool Save(obs_data_t *obj) const { return MacroAction::Save(obj); };
-	bool Load(obs_data_t *obj) { return MacroAction::Load(obj); };
-	std::string GetId() const { return "unknown"; }
-};
-
-} // namespace
-
-static std::recursive_mutex mutex;
-
 std::map<std::string, MacroActionInfo> &MacroActionFactory::GetMap()
 {
 	static std::map<std::string, MacroActionInfo> _methods;
@@ -31,7 +10,6 @@ std::map<std::string, MacroActionInfo> &MacroActionFactory::GetMap()
 
 bool MacroActionFactory::Register(const std::string &id, MacroActionInfo info)
 {
-	std::lock_guard<std::recursive_mutex> lock(mutex);
 	if (auto it = GetMap().find(id); it == GetMap().end()) {
 		GetMap()[id] = info;
 		return true;
@@ -39,61 +17,35 @@ bool MacroActionFactory::Register(const std::string &id, MacroActionInfo info)
 	return false;
 }
 
-bool MacroActionFactory::Deregister(const std::string &id)
-{
-	std::lock_guard<std::recursive_mutex> lock(mutex);
-	if (GetMap().count(id) == 0) {
-		return false;
-	}
-	GetMap().erase(id);
-	return true;
-}
-
-static std::shared_ptr<MacroAction> createUnknownAction(Macro *m)
-{
-	return std::make_shared<MacroActionUnknown>(m);
-}
-
 std::shared_ptr<MacroAction> MacroActionFactory::Create(const std::string &id,
 							Macro *m)
 {
-	std::lock_guard<std::recursive_mutex> lock(mutex);
-	if (auto it = GetMap().find(id); it != GetMap().end()) {
+	if (auto it = GetMap().find(id); it != GetMap().end())
 		return it->second._create(m);
-	}
 
-	return createUnknownAction(m);
-}
-
-static QWidget *createUnknownActionWidget()
-{
-	return new QLabel(obs_module_text("AdvSceneSwitcher.action.unknown"));
+	return nullptr;
 }
 
 QWidget *MacroActionFactory::CreateWidget(const std::string &id,
 					  QWidget *parent,
 					  std::shared_ptr<MacroAction> action)
 {
-	std::lock_guard<std::recursive_mutex> lock(mutex);
-	if (auto it = GetMap().find(id); it != GetMap().end()) {
+	if (auto it = GetMap().find(id); it != GetMap().end())
 		return it->second._createWidget(parent, action);
-	}
 
-	return createUnknownActionWidget();
+	return nullptr;
 }
 
 std::string MacroActionFactory::GetActionName(const std::string &id)
 {
-	std::lock_guard<std::recursive_mutex> lock(mutex);
 	if (auto it = GetMap().find(id); it != GetMap().end()) {
 		return it->second._name;
 	}
-	return obs_module_text("AdvSceneSwitcher.action.unknown");
+	return "unknown action";
 }
 
 std::string MacroActionFactory::GetIdByName(const QString &name)
 {
-	std::lock_guard<std::recursive_mutex> lock(mutex);
 	for (auto it : GetMap()) {
 		if (name == obs_module_text(it.second._name.c_str())) {
 			return it.first;
@@ -102,14 +54,4 @@ std::string MacroActionFactory::GetIdByName(const QString &name)
 	return "";
 }
 
-bool CanCreateDefaultAction()
-{
-	const auto action = MacroActionFactory::Create(
-		MacroAction::GetDefaultID().data(), nullptr);
-	if (!action) {
-		return false;
-	}
-	return action->GetId() == MacroAction::GetDefaultID().data();
-}
-
 } // namespace advss

lib/macro/macro-action-factory.hpp

@@ -6,10 +6,10 @@
 namespace advss {
 
 struct MacroActionInfo {
+	using CreateAction = std::shared_ptr<MacroAction> (*)(Macro *m);
 	using CreateActionWidget = QWidget *(*)(QWidget *parent,
 						std::shared_ptr<MacroAction>);
-
-	std::function<std::shared_ptr<MacroAction>(Macro *m)> _create = nullptr;
+	CreateAction _create = nullptr;
 	CreateActionWidget _createWidget = nullptr;
 	std::string _name;
 };
@@ -19,7 +19,6 @@ public:
 	MacroActionFactory() = delete;
 
 	EXPORT static bool Register(const std::string &id, MacroActionInfo);
-	static bool Deregister(const std::string &id);
 	static std::shared_ptr<MacroAction> Create(const std::string &id,
 						   Macro *m);
 	static QWidget *CreateWidget(const std::string &id, QWidget *parent,
@@ -32,6 +31,4 @@ private:
 	static std::map<std::string, MacroActionInfo> &GetMap();
 };
 
-bool CanCreateDefaultAction();
-
 } // namespace advss

lib/macro/macro-action-macro.cpp

@@ -1,5 +1,4 @@
 #include "macro-action-macro.hpp"
-#include "help-icon.hpp"
 #include "layout-helpers.hpp"
 #include "macro.hpp"
 
@@ -49,7 +48,9 @@ bool MacroActionMacro::PerformAction()
 		macro->ResetRunCount();
 		break;
 	case Action::RUN:
-		RunActions(macro.get());
+		if (!macro->Paused()) {
+			macro->PerformActions(true, false, true);
+		}
 		break;
 	case Action::STOP:
 		macro->Stop();
@@ -126,7 +127,6 @@ bool MacroActionMacro::Save(obs_data_t *obj) const
 	_macro.Save(obj);
 	_actionIndex.Save(obj, "actionIndex");
 	obs_data_set_int(obj, "action", static_cast<int>(_action));
-	_runOptions.Save(obj);
 	return true;
 }
 
@@ -137,15 +137,6 @@ bool MacroActionMacro::Load(obs_data_t *obj)
 	_actionIndex.Load(obj, "actionIndex");
 	_action = static_cast<MacroActionMacro::Action>(
 		obs_data_get_int(obj, "action"));
-	_runOptions.Load(obj);
-	return true;
-}
-
-bool MacroActionMacro::PostLoad()
-{
-	MacroRefAction::PostLoad();
-	MacroAction::PostLoad();
-	_runOptions.macro.PostLoad();
 	return true;
 }
 
@@ -169,68 +160,11 @@ void MacroActionMacro::ResolveVariablesToFixedValues()
 	_actionIndex.ResolveVariables();
 }
 
-static void runActionsHelper(Macro *macro, bool runElseActions, bool setInputs,
-			     const StringList &inputs)
+static inline void populateActionSelection(QComboBox *list)
 {
-	if (setInputs) {
-		macro->GetInputVariables().SetValues(inputs);
+	for (auto entry : actionTypes) {
+		list->addItem(obs_module_text(entry.second.c_str()));
 	}
-	macro->PerformActions(!runElseActions, false, true);
-}
-
-void MacroActionMacro::RunActions(Macro *actionMacro) const
-{
-	if (_runOptions.skipWhenPaused && actionMacro->Paused()) {
-		return;
-	}
-
-	if (_runOptions.logic == RunOptions::Logic::IGNORE_CONDITIONS) {
-		runActionsHelper(actionMacro, _runOptions.runElseActions,
-				 _runOptions.setInputs, _runOptions.inputs);
-		return;
-	}
-
-	auto conditionMacro = _runOptions.macro.GetMacro();
-	if (!conditionMacro) {
-		return;
-	}
-
-	if (_runOptions.reevaluateConditionState) {
-		conditionMacro->CheckConditions(true);
-	}
-
-	if ((_runOptions.logic == RunOptions::Logic::CONDITIONS &&
-	     conditionMacro->ConditionsMatched()) ||
-	    (_runOptions.logic == RunOptions::Logic::INVERT_CONDITIONS &&
-	     !conditionMacro->ConditionsMatched())) {
-		runActionsHelper(actionMacro, _runOptions.runElseActions,
-				 _runOptions.setInputs, _runOptions.inputs);
-	}
-}
-
-static void populateActionSelection(QComboBox *list)
-{
-	for (const auto &[_, name] : actionTypes) {
-		list->addItem(obs_module_text(name.c_str()));
-	}
-}
-
-static void populateConditionBehaviorSelection(QComboBox *list)
-{
-	list->addItem(obs_module_text(
-		"AdvSceneSwitcher.action.macro.type.run.conditions.ignore"));
-	list->addItem(obs_module_text(
-		"AdvSceneSwitcher.action.macro.type.run.conditions.true"));
-	list->addItem(obs_module_text(
-		"AdvSceneSwitcher.action.macro.type.run.conditions.false"));
-}
-
-static void populateActionTypeSelection(QComboBox *list)
-{
-	list->addItem(obs_module_text(
-		"AdvSceneSwitcher.action.macro.type.run.actionType.regular"));
-	list->addItem(obs_module_text(
-		"AdvSceneSwitcher.action.macro.type.run.actionType.else"));
 }
 
 MacroActionMacroEdit::MacroActionMacroEdit(
@@ -239,28 +173,9 @@ MacroActionMacroEdit::MacroActionMacroEdit(
 	  _macros(new MacroSelection(parent)),
 	  _actionIndex(new MacroSegmentSelection(
 		  this, MacroSegmentSelection::Type::ACTION)),
-	  _actions(new QComboBox()),
-	  _conditionMacros(new MacroSelection(parent)),
-	  _conditionBehaviors(new QComboBox()),
-	  _reevaluateConditionState(new QCheckBox(
-		  obs_module_text("AdvSceneSwitcher.action.macro.type.run."
-				  "updateConditionMatchState"))),
-	  _actionTypes(new QComboBox()),
-	  _skipWhenPaused(new QCheckBox(obs_module_text(
-		  "AdvSceneSwitcher.action.macro.type.run.skipWhenPaused"))),
-	  _setInputs(new QCheckBox(obs_module_text(
-		  "AdvSceneSwitcher.action.macro.type.run.setInputs"))),
-	  _inputs(new MacroInputEdit()),
-	  _entryLayout(new QHBoxLayout()),
-	  _conditionLayout(new QHBoxLayout()),
-	  _reevaluateConditionStateLayout(new QHBoxLayout()),
-	  _setInputsLayout(new QHBoxLayout())
+	  _actions(new QComboBox())
 {
 	populateActionSelection(_actions);
-	populateConditionBehaviorSelection(_conditionBehaviors);
-	populateActionTypeSelection(_actionTypes);
-
-	_conditionMacros->HideSelectedMacro();
 
 	QWidget::connect(_macros, SIGNAL(currentTextChanged(const QString &)),
 			 this, SLOT(MacroChanged(const QString &)));
@@ -269,53 +184,20 @@ MacroActionMacroEdit::MacroActionMacroEdit(
 	QWidget::connect(_actionIndex,
 			 SIGNAL(SelectionChanged(const IntVariable &)), this,
 			 SLOT(ActionIndexChanged(const IntVariable &)));
-	QWidget::connect(_conditionMacros,
-			 SIGNAL(currentTextChanged(const QString &)), this,
-			 SLOT(ConditionMacroChanged(const QString &)));
-	QWidget::connect(_conditionBehaviors, SIGNAL(currentIndexChanged(int)),
-			 this, SLOT(ConditionBehaviorChanged(int)));
-	QWidget::connect(_actionTypes, SIGNAL(currentIndexChanged(int)), this,
-			 SLOT(ActionTypeChanged(int)));
-	QWidget::connect(_skipWhenPaused, SIGNAL(stateChanged(int)), this,
-			 SLOT(SkipWhenPausedChanged(int)));
-	QWidget::connect(_setInputs, SIGNAL(stateChanged(int)), this,
-			 SLOT(SetInputsChanged(int)));
-	QWidget::connect(_inputs,
-			 SIGNAL(MacroInputValuesChanged(const StringList &)),
-			 this, SLOT(InputsChanged(const StringList &)));
-	QWidget::connect(_reevaluateConditionState, SIGNAL(stateChanged(int)),
-			 this, SLOT(ReevaluateConditionStateChanged(int)));
 
-	_setInputsLayout->addWidget(_setInputs);
-	_setInputsLayout->addWidget(new HelpIcon(obs_module_text(
-		"AdvSceneSwitcher.action.macro.type.run.setInputs.description")));
-	_setInputsLayout->addStretch();
+	auto mainLayout = new QHBoxLayout;
+	PlaceWidgets(obs_module_text("AdvSceneSwitcher.action.macro.entry"),
+		     mainLayout,
+		     {{"{{actions}}", _actions},
+		      {"{{actionIndex}}", _actionIndex},
+		      {"{{macros}}", _macros}});
+	setLayout(mainLayout);
 
-	_reevaluateConditionStateLayout->addWidget(_reevaluateConditionState);
-	_reevaluateConditionStateLayout->addWidget(new HelpIcon(obs_module_text(
-		"AdvSceneSwitcher.action.macro.type.run.updateConditionMatchState.help")));
-	_reevaluateConditionStateLayout->addStretch();
-
-	auto layout = new QVBoxLayout();
-	layout->addLayout(_entryLayout);
-	layout->addLayout(_conditionLayout);
-	layout->addLayout(_reevaluateConditionStateLayout);
-	layout->addLayout(_setInputsLayout);
-	layout->addWidget(_inputs);
-	layout->addWidget(_skipWhenPaused);
-	setLayout(layout);
 	_entryData = entryData;
 	UpdateEntryData();
 	_loading = false;
 }
 
-void HighligthMacroSettingsButton(bool enable);
-
-MacroActionMacroEdit::~MacroActionMacroEdit()
-{
-	HighligthMacroSettingsButton(false);
-}
-
 void MacroActionMacroEdit::UpdateEntryData()
 {
 	if (!_entryData) {
@@ -325,132 +207,45 @@ void MacroActionMacroEdit::UpdateEntryData()
 	_actionIndex->SetValue(_entryData->_actionIndex);
 	_actionIndex->SetMacro(_entryData->_macro.GetMacro());
 	_macros->SetCurrentMacro(_entryData->_macro);
-	_conditionMacros->SetCurrentMacro(_entryData->_runOptions.macro);
-	_conditionBehaviors->setCurrentIndex(
-		static_cast<int>(_entryData->_runOptions.logic));
-	_reevaluateConditionState->setChecked(
-		_entryData->_runOptions.reevaluateConditionState);
-	_actionTypes->setCurrentIndex(
-		_entryData->_runOptions.runElseActions ? 1 : 0);
-	_skipWhenPaused->setChecked(_entryData->_runOptions.skipWhenPaused);
-	_setInputs->setChecked(_entryData->_runOptions.setInputs);
-	SetupMacroInput(_entryData->_macro.GetMacro().get());
 	SetWidgetVisibility();
 }
 
 void MacroActionMacroEdit::MacroChanged(const QString &text)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_macro = text;
-	const auto &macro = _entryData->_macro.GetMacro();
-	_actionIndex->SetMacro(macro);
-	SetupMacroInput(macro.get());
+	_actionIndex->SetMacro(_entryData->_macro.GetMacro());
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
-	SetWidgetVisibility();
 }
 
 void MacroActionMacroEdit::ActionChanged(int value)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_action = static_cast<MacroActionMacro::Action>(value);
 	SetWidgetVisibility();
 }
 
 void MacroActionMacroEdit::ActionIndexChanged(const IntVariable &value)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_actionIndex = value;
 }
 
-void MacroActionMacroEdit::ConditionMacroChanged(const QString &text)
-{
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_runOptions.macro = text;
-}
-
-void MacroActionMacroEdit::ConditionBehaviorChanged(int value)
-{
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_runOptions.logic =
-		static_cast<MacroActionMacro::RunOptions::Logic>(value);
-	SetWidgetVisibility();
-}
-
-void MacroActionMacroEdit::ReevaluateConditionStateChanged(int value)
-{
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_runOptions.reevaluateConditionState = value;
-	SetWidgetVisibility();
-}
-
-void MacroActionMacroEdit::ActionTypeChanged(int value)
-{
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_runOptions.runElseActions = value;
-}
-
-void MacroActionMacroEdit::SkipWhenPausedChanged(int value)
-{
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_runOptions.skipWhenPaused = value;
-}
-
-void MacroActionMacroEdit::SetInputsChanged(int value)
-{
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_runOptions.setInputs = value;
-	SetWidgetVisibility();
-}
-
-void MacroActionMacroEdit::InputsChanged(const StringList &inputs)
-{
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_runOptions.inputs = inputs;
-	adjustSize();
-	updateGeometry();
-}
-
 void MacroActionMacroEdit::SetWidgetVisibility()
 {
-	_entryLayout->removeWidget(_actions);
-	_entryLayout->removeWidget(_actionIndex);
-	_entryLayout->removeWidget(_macros);
-	_entryLayout->removeWidget(_actionTypes);
-	_conditionLayout->removeWidget(_conditionBehaviors);
-	_conditionLayout->removeWidget(_conditionMacros);
-
-	ClearLayout(_entryLayout);
-	ClearLayout(_conditionLayout);
-
-	const std::unordered_map<std::string, QWidget *> placeholders = {
-		{"{{actions}}", _actions},
-		{"{{actionIndex}}", _actionIndex},
-		{"{{macros}}", _macros},
-		{"{{actionTypes}}", _actionTypes},
-		{"{{conditionBehaviors}}", _conditionBehaviors},
-		{"{{conditionMacros}}", _conditionMacros},
-
-	};
-
-	PlaceWidgets(
-		obs_module_text(
-			_entryData->_action == MacroActionMacro::Action::RUN
-				? "AdvSceneSwitcher.action.macro.entry.run"
-				: "AdvSceneSwitcher.action.macro.entry.other"),
-		_entryLayout, placeholders);
-
-	if (_entryData->_runOptions.logic ==
-	    MacroActionMacro::RunOptions::Logic::IGNORE_CONDITIONS) {
-		_conditionLayout->addWidget(_conditionBehaviors);
-		_conditionLayout->addStretch();
-	} else {
-		PlaceWidgets(
-			obs_module_text(
-				"AdvSceneSwitcher.action.macro.entry.run.condition"),
-			_conditionLayout, placeholders);
-	}
-
 	if (_entryData->_action == MacroActionMacro::Action::RUN ||
 	    _entryData->_action == MacroActionMacro::Action::STOP) {
 		_macros->HideSelectedMacro();
@@ -465,73 +260,6 @@ void MacroActionMacroEdit::SetWidgetVisibility()
 			MacroActionMacro::Action::ENABLE_ACTION ||
 		_entryData->_action == MacroActionMacro::Action::TOGGLE_ACTION;
 	_actionIndex->setVisible(isModifyingActionState);
-
-	SetLayoutVisible(_conditionLayout,
-			 _entryData->_action == MacroActionMacro::Action::RUN);
-	const bool needsAdditionalConditionWidgets =
-		_entryData->_action == MacroActionMacro::Action::RUN &&
-		_entryData->_runOptions.logic !=
-			MacroActionMacro::RunOptions::Logic::IGNORE_CONDITIONS;
-	_conditionMacros->setVisible(needsAdditionalConditionWidgets);
-	SetLayoutVisible(_reevaluateConditionStateLayout,
-			 needsAdditionalConditionWidgets);
-	SetLayoutVisible(_setInputsLayout,
-			 _entryData->_action == MacroActionMacro::Action::RUN);
-	_inputs->setVisible(_entryData->_action ==
-				    MacroActionMacro::Action::RUN &&
-			    _entryData->_runOptions.setInputs);
-	HighligthMacroSettingsButton(_entryData->_action ==
-					     MacroActionMacro::Action::RUN &&
-				     _entryData->_runOptions.setInputs &&
-				     !_inputs->HasInputsToSet());
-	_actionTypes->setVisible(_entryData->_action ==
-				 MacroActionMacro::Action::RUN);
-	_skipWhenPaused->setVisible(_entryData->_action ==
-				    MacroActionMacro::Action::RUN);
-
-	adjustSize();
-	updateGeometry();
-}
-
-void MacroActionMacroEdit::SetupMacroInput(Macro *macro) const
-{
-	if (macro) {
-		_inputs->SetInputVariablesAndValues(
-			macro->GetInputVariables(),
-			_entryData->_runOptions.inputs);
-	} else {
-		_inputs->SetInputVariablesAndValues({}, {});
-	}
-}
-
-void MacroActionMacro::RunOptions::Save(obs_data_t *obj) const
-{
-	OBSDataAutoRelease data = obs_data_create();
-	obs_data_set_int(data, "logic", static_cast<int>(logic));
-	obs_data_set_bool(data, "reevaluateConditionState",
-			  reevaluateConditionState);
-	obs_data_set_bool(data, "runElseActions", runElseActions);
-	obs_data_set_bool(data, "skipWhenPaused", skipWhenPaused);
-	obs_data_set_bool(data, "setInputs", setInputs);
-	inputs.Save(data, "inputs");
-	macro.Save(data);
-	obs_data_set_obj(obj, "runOptions", data);
-}
-
-void MacroActionMacro::RunOptions::Load(obs_data_t *obj)
-{
-	if (!obs_data_has_user_value(obj, "runOptions")) {
-		return;
-	}
-	OBSDataAutoRelease data = obs_data_get_obj(obj, "runOptions");
-	logic = static_cast<Logic>(obs_data_get_int(data, "logic"));
-	reevaluateConditionState =
-		obs_data_get_bool(data, "reevaluateConditionState");
-	runElseActions = obs_data_get_bool(data, "runElseActions");
-	skipWhenPaused = obs_data_get_bool(data, "skipWhenPaused");
-	setInputs = obs_data_get_bool(data, "setInputs");
-	inputs.Load(data, "inputs");
-	macro.Load(data);
 }
 
 } // namespace advss

lib/macro/macro-action-macro.hpp

@@ -1,45 +1,25 @@
 #pragma once
 #include "macro-action-edit.hpp"
-#include "macro-input.hpp"
 #include "macro-selection.hpp"
 #include "macro-segment-selection.hpp"
 
-#include <QCheckBox>
 #include <QHBoxLayout>
 
 namespace advss {
 
-class MacroActionMacro final : public MacroRefAction {
+class MacroActionMacro : public MacroRefAction {
 public:
 	MacroActionMacro(Macro *m) : MacroAction(m), MacroRefAction(m) {}
 	bool PerformAction();
 	void LogAction() const;
 	bool Save(obs_data_t *obj) const;
 	bool Load(obs_data_t *obj);
-	bool PostLoad();
 	std::string GetShortDesc() const;
 	std::string GetId() const { return id; };
 	static std::shared_ptr<MacroAction> Create(Macro *m);
 	std::shared_ptr<MacroAction> Copy() const;
 	void ResolveVariablesToFixedValues();
 
-	struct RunOptions {
-		void Save(obs_data_t *obj) const;
-		void Load(obs_data_t *obj);
-		enum class Logic {
-			IGNORE_CONDITIONS,
-			CONDITIONS,
-			INVERT_CONDITIONS,
-		};
-		Logic logic;
-		bool reevaluateConditionState = false;
-		bool runElseActions = false;
-		bool skipWhenPaused = true;
-		bool setInputs = false;
-		StringList inputs;
-		MacroRef macro;
-	};
-
 	enum class Action {
 		PAUSE,
 		UNPAUSE,
@@ -50,25 +30,21 @@ public:
 		ENABLE_ACTION,
 		TOGGLE_ACTION,
 	};
-	Action _action = Action::RUN;
+	Action _action = Action::PAUSE;
 	IntVariable _actionIndex = 1;
-	RunOptions _runOptions = {};
 
 private:
-	void RunActions(Macro *actionMacro) const;
-
 	static bool _registered;
 	static const std::string id;
 };
 
-class MacroActionMacroEdit final : public QWidget {
+class MacroActionMacroEdit : public QWidget {
 	Q_OBJECT
 
 public:
 	MacroActionMacroEdit(
 		QWidget *parent,
 		std::shared_ptr<MacroActionMacro> entryData = nullptr);
-	~MacroActionMacroEdit();
 	void UpdateEntryData();
 	static QWidget *Create(QWidget *parent,
 			       std::shared_ptr<MacroAction> action)
@@ -82,37 +58,18 @@ private slots:
 	void MacroChanged(const QString &text);
 	void ActionChanged(int value);
 	void ActionIndexChanged(const IntVariable &value);
-	void ConditionMacroChanged(const QString &text);
-	void ConditionBehaviorChanged(int value);
-	void ReevaluateConditionStateChanged(int value);
-	void ActionTypeChanged(int value);
-	void SkipWhenPausedChanged(int value);
-	void SetInputsChanged(int value);
-	void InputsChanged(const StringList &);
-
 signals:
 	void HeaderInfoChanged(const QString &);
 
-private:
-	void SetWidgetVisibility();
-	void SetupMacroInput(Macro *) const;
-
+protected:
 	MacroSelection *_macros;
 	MacroSegmentSelection *_actionIndex;
 	QComboBox *_actions;
-	MacroSelection *_conditionMacros;
-	QComboBox *_conditionBehaviors;
-	QCheckBox *_reevaluateConditionState;
-	QComboBox *_actionTypes;
-	QCheckBox *_skipWhenPaused;
-	QCheckBox *_setInputs;
-	MacroInputEdit *_inputs;
-	QHBoxLayout *_entryLayout;
-	QHBoxLayout *_conditionLayout;
-	QHBoxLayout *_reevaluateConditionStateLayout;
-	QHBoxLayout *_setInputsLayout;
-
 	std::shared_ptr<MacroActionMacro> _entryData;
+
+private:
+	void SetWidgetVisibility();
+
 	bool _loading = true;
 };
 

lib/macro/macro-action-script.cpp

@@ -1,92 +0,0 @@
-#include "macro-action-script.hpp"
-#include "layout-helpers.hpp"
-#include "macro-helpers.hpp"
-#include "properties-view.hpp"
-#include "sync-helpers.hpp"
-
-namespace advss {
-
-MacroActionScript::MacroActionScript(Macro *m, const std::string &id,
-				     const OBSData &defaultSettings,
-				     const std::string &propertiesSignalName,
-				     const std::string &triggerSignal,
-				     const std::string &completionSignal)
-	: MacroAction(m),
-	  MacroSegmentScript(defaultSettings, propertiesSignalName,
-			     triggerSignal, completionSignal),
-	  _id(id)
-{
-}
-
-MacroActionScript::MacroActionScript(const advss::MacroActionScript &other)
-	: MacroAction(other.GetMacro()),
-	  MacroSegmentScript(other),
-	  _id(other._id)
-{
-}
-
-bool MacroActionScript::PerformAction()
-{
-	if (!ScriptHandler::ActionIdIsValid(_id)) {
-		blog(LOG_WARNING, "skipping unknown script action \"%s\"",
-		     _id.c_str());
-		return true;
-	}
-
-	(void)SendTriggerSignal();
-	return true;
-}
-
-void MacroActionScript::LogAction() const
-{
-	ablog(LOG_INFO, "performing script action \"%s\"", GetId().c_str());
-}
-
-bool MacroActionScript::Save(obs_data_t *obj) const
-{
-	MacroAction::Save(obj);
-	MacroSegmentScript::Save(obj);
-	return true;
-}
-
-bool MacroActionScript::Load(obs_data_t *obj)
-{
-	MacroAction::Load(obj);
-	MacroSegmentScript::Load(obj);
-	return true;
-}
-
-std::shared_ptr<MacroAction> MacroActionScript::Copy() const
-{
-	return std::make_shared<MacroActionScript>(*this);
-}
-
-void MacroActionScript::WaitForCompletion() const
-{
-	using namespace std::chrono_literals;
-	auto start = std::chrono::high_resolution_clock::now();
-	auto timePassed = std::chrono::duration_cast<std::chrono::milliseconds>(
-		start - start);
-	const auto timeoutMs = GetTimeoutSeconds() * 1000.0;
-
-	std::unique_lock<std::mutex> lock(*GetMutex());
-	while (!TriggerIsCompleted()) {
-		if (MacroWaitShouldAbort() || MacroIsStopped(GetMacro())) {
-			break;
-		}
-
-		if ((double)timePassed.count() > timeoutMs) {
-			blog(LOG_INFO, "script action timeout (%s)",
-			     _id.c_str());
-			break;
-		}
-
-		GetMacroWaitCV().wait_for(lock, 10ms);
-		const auto now = std::chrono::high_resolution_clock::now();
-		timePassed =
-			std::chrono::duration_cast<std::chrono::milliseconds>(
-				now - start);
-	}
-}
-
-} // namespace advss

lib/macro/macro-action-script.hpp

@@ -1,29 +0,0 @@
-#pragma once
-#include "macro-action-edit.hpp"
-#include "macro-script-handler.hpp"
-#include "macro-segment-script.hpp"
-
-namespace advss {
-
-class MacroActionScript : public MacroAction, public MacroSegmentScript {
-public:
-	MacroActionScript(Macro *m, const std::string &id,
-			  const OBSData &defaultSettings,
-			  const std::string &propertiesSignalName,
-			  const std::string &triggerSignal,
-			  const std::string &signalComplete);
-	MacroActionScript(const advss::MacroActionScript &);
-	bool PerformAction();
-	void LogAction() const;
-	bool Save(obs_data_t *obj) const;
-	bool Load(obs_data_t *obj);
-	std::string GetId() const { return _id; };
-	std::shared_ptr<MacroAction> Copy() const;
-
-private:
-	void WaitForCompletion() const;
-
-	std::string _id = "";
-};
-
-} // namespace advss

lib/macro/macro-action-variable.cpp

@@ -58,23 +58,6 @@ const static std::map<MacroActionVariable::Type, std::string> actionTypes = {
 	 "AdvSceneSwitcher.action.variable.type.padValue"},
 	{MacroActionVariable::Type::TRUNCATE,
 	 "AdvSceneSwitcher.action.variable.type.truncateValue"},
-	{MacroActionVariable::Type::SWAP_VALUES,
-	 "AdvSceneSwitcher.action.variable.type.swapValues"},
-	{MacroActionVariable::Type::TRIM,
-	 "AdvSceneSwitcher.action.variable.type.trim"},
-	{MacroActionVariable::Type::CHANGE_CASE,
-	 "AdvSceneSwitcher.action.variable.type.changeCase"},
-};
-
-const static std::map<MacroActionVariable::CaseType, std::string> caseTypes = {
-	{MacroActionVariable::CaseType::LOWER_CASE,
-	 "AdvSceneSwitcher.action.variable.case.type.lowerCase"},
-	{MacroActionVariable::CaseType::UPPER_CASE,
-	 "AdvSceneSwitcher.action.variable.case.type.upperCase"},
-	{MacroActionVariable::CaseType::CAPITALIZED,
-	 "AdvSceneSwitcher.action.variable.case.type.capitalized"},
-	{MacroActionVariable::CaseType::START_CASE,
-	 "AdvSceneSwitcher.action.variable.case.type.startCase"},
 };
 
 static void apppend(Variable &var, const std::string &value)
@@ -150,12 +133,18 @@ void MacroActionVariable::HandleFindAndReplace(Variable *var)
 		var->SetValue(value);
 		return;
 	}
-
+	QString resultString = QString::fromStdString(value);
 	QString replacement = QString::fromStdString(_replaceStr);
 	auto regex = _findRegex.GetRegularExpression(_findStr);
-	auto result = QString::fromStdString(value);
-	result = result.replace(regex, replacement);
-	var->SetValue(result.toStdString());
+	auto matchIterator = regex.globalMatch(QString::fromStdString(value));
+	int offset = 0;
+	while (matchIterator.hasNext()) {
+		QRegularExpressionMatch match = matchIterator.next();
+		resultString.replace(match.capturedStart() + offset,
+				     match.capturedLength(), replacement);
+		offset += replacement.length() - match.capturedLength();
+	}
+	var->SetValue(resultString.toStdString());
 }
 
 void MacroActionVariable::HandleMathExpression(Variable *var)
@@ -168,43 +157,6 @@ void MacroActionVariable::HandleMathExpression(Variable *var)
 	var->SetValue(std::get<double>(result));
 }
 
-void MacroActionVariable::HandleCaseChange(Variable *var)
-{
-	auto value = QString::fromStdString(var->Value());
-
-	switch (_caseType) {
-	case CaseType::LOWER_CASE:
-		var->SetValue(value.toLower().toStdString());
-		break;
-	case CaseType::UPPER_CASE:
-		var->SetValue(value.toUpper().toStdString());
-		break;
-	case CaseType::CAPITALIZED: {
-		if (value.isEmpty()) {
-			return;
-		}
-
-		value[0] = value[0].toUpper();
-		var->SetValue(value.toStdString());
-		break;
-	}
-	case CaseType::START_CASE: {
-		auto partList = value.split(QRegularExpression("\\b"));
-
-		for (auto &part : partList) {
-			if (part.isEmpty()) {
-				continue;
-			}
-
-			part[0] = part[0].toUpper();
-		}
-
-		var->SetValue(partList.join("").toStdString());
-
-		break;
-	}
-	}
-}
 struct GetSceneItemNameHelper {
 	int curIdx = 0;
 	int targetIdx = 0;
@@ -440,26 +392,6 @@ bool MacroActionVariable::PerformAction()
 		var->SetValue(
 			truncate(var->Value(), _direction, _stringLength));
 		return true;
-	case Type::SWAP_VALUES: {
-		auto var2 = _variable2.lock();
-		if (!var2) {
-			return true;
-		}
-
-		auto tempValue = var->Value();
-		var->SetValue(var2->Value());
-		var2->SetValue(tempValue);
-		return true;
-	}
-	case Type::TRIM: {
-		var->SetValue(QString::fromStdString(var->Value())
-				      .trimmed()
-				      .toStdString());
-		return true;
-	}
-	case Type::CHANGE_CASE:
-		HandleCaseChange(var.get());
-		return true;
 	}
 
 	return true;
@@ -496,8 +428,6 @@ bool MacroActionVariable::Save(obs_data_t *obj) const
 	obs_data_set_int(obj, "direction", static_cast<int>(_direction));
 	_stringLength.Save(obj, "stringLength");
 	obs_data_set_int(obj, "paddingChar", _paddingChar);
-	obs_data_set_int(obj, "caseType", static_cast<int>(_caseType));
-
 	return true;
 }
 
@@ -536,8 +466,6 @@ bool MacroActionVariable::Load(obs_data_t *obj)
 	} else {
 		_paddingChar = ' ';
 	}
-	_caseType = static_cast<CaseType>(obs_data_get_int(obj, "caseType"));
-
 	return true;
 }
 
@@ -656,14 +584,6 @@ static inline void populateTypeSelection(QComboBox *list)
 	}
 }
 
-static inline void populateCaseTypeSelection(QComboBox *list)
-{
-	for (const auto &[type, name] : caseTypes) {
-		list->addItem(obs_module_text(name.c_str()),
-			      static_cast<int>(type));
-	}
-}
-
 static inline void populateDirectionSelection(QComboBox *list)
 {
 	list->addItems(
@@ -710,13 +630,10 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 	  _scenes(new SceneSelectionWidget(this, true, false, true, true,
 					   true)),
 	  _tempVars(new TempVariableSelection(this)),
-	  _tempVarsHelp(new HelpIcon(obs_module_text(
-		  "AdvSceneSwitcher.action.variable.type.setToTempvar.help"))),
 	  _sceneItemIndex(new VariableSpinBox()),
 	  _direction(new QComboBox()),
 	  _stringLength(new VariableSpinBox()),
 	  _paddingCharSelection(new SingleCharSelection()),
-	  _caseType(new FilterComboBox(this)),
 	  _entryLayout(new QHBoxLayout())
 {
 	_numValue->setMinimum(-9999999999);
@@ -733,15 +650,12 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 	_regexMatchIdx->setMinimum(1);
 	_regexMatchIdx->setMaximum(999);
 	_regexMatchIdx->setSuffix(".");
-	_replaceStr->setToolTip(obs_module_text(
-		"AdvSceneSwitcher.action.variable.findAndReplace.replace.tooltip"));
 	_inputPrompt->setSizePolicy(QSizePolicy::MinimumExpanding,
 				    QSizePolicy::Preferred);
 	_sceneItemIndex->setMinimum(1);
 	_stringLength->setMaximum(999);
 	populateTypeSelection(_actions);
 	populateDirectionSelection(_direction);
-	populateCaseTypeSelection(_caseType);
 
 	QWidget::connect(_variables, SIGNAL(SelectionChanged(const QString &)),
 			 this, SLOT(VariableChanged(const QString &)));
@@ -806,8 +720,6 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 	QWidget::connect(_paddingCharSelection,
 			 SIGNAL(CharChanged(const QString &)), this,
 			 SLOT(CharSelectionChanged(const QString &)));
-	QWidget::connect(_caseType, SIGNAL(currentIndexChanged(int)), this,
-			 SLOT(CaseTypeChanged(int)));
 
 	const std::unordered_map<std::string, QWidget *> widgetPlaceholders = {
 		{"{{variables}}", _variables},
@@ -830,12 +742,10 @@ MacroActionVariableEdit::MacroActionVariableEdit(
 		{"{{envVariableName}}", _envVariable},
 		{"{{scenes}}", _scenes},
 		{"{{tempVars}}", _tempVars},
-		{"{{tempVarsHelp}}", _tempVarsHelp},
 		{"{{sceneItemIndex}}", _sceneItemIndex},
 		{"{{direction}}", _direction},
 		{"{{stringLength}}", _stringLength},
 		{"{{paddingCharSelection}}", _paddingCharSelection},
-		{"{{caseType}}", _caseType},
 	};
 	PlaceWidgets(
 		obs_module_text("AdvSceneSwitcher.action.variable.entry.other"),
@@ -936,9 +846,6 @@ void MacroActionVariableEdit::UpdateEntryData()
 	_stringLength->SetValue(_entryData->_stringLength);
 	_paddingCharSelection->setText(
 		QChar::fromLatin1(_entryData->_paddingChar));
-	_caseType->setCurrentIndex(
-		_caseType->findData(static_cast<int>(_entryData->_caseType)));
-
 	SetWidgetVisibility();
 }
 
@@ -1295,7 +1202,6 @@ void MacroActionVariableEdit::SelectionChanged(const TempVariableRef &var)
 
 	auto lock = LockContext();
 	_entryData->_tempVar = var;
-	SetWidgetVisibility();
 }
 
 void MacroActionVariableEdit::SceneItemIndexChanged(
@@ -1345,17 +1251,6 @@ void MacroActionVariableEdit::CharSelectionChanged(const QString &character)
 	}
 }
 
-void MacroActionVariableEdit::CaseTypeChanged(int index)
-{
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	auto lock = LockContext();
-	_entryData->_caseType = static_cast<MacroActionVariable::CaseType>(
-		_caseType->itemData(index).toInt());
-}
-
 void MacroActionVariableEdit::SetWidgetVisibility()
 {
 	if (!_entryData) {
@@ -1373,12 +1268,10 @@ void MacroActionVariableEdit::SetWidgetVisibility()
 		{"{{envVariableName}}", _envVariable},
 		{"{{scenes}}", _scenes},
 		{"{{tempVars}}", _tempVars},
-		{"{{tempVarsHelp}}", _tempVarsHelp},
 		{"{{sceneItemIndex}}", _sceneItemIndex},
 		{"{{direction}}", _direction},
 		{"{{stringLength}}", _stringLength},
 		{"{{paddingCharSelection}}", _paddingCharSelection},
-		{"{{caseType}}", _caseType},
 	};
 
 	const char *layoutString = "";
@@ -1411,9 +1304,8 @@ void MacroActionVariableEdit::SetWidgetVisibility()
 		AddStretchIfNecessary(_entryLayout);
 	}
 
-	_variables2->setVisible(
-		_entryData->_type == MacroActionVariable::Type::APPEND_VAR ||
-		_entryData->_type == MacroActionVariable::Type::SWAP_VALUES);
+	_variables2->setVisible(_entryData->_type ==
+				MacroActionVariable::Type::APPEND_VAR);
 	_strValue->setVisible(
 		_entryData->_type ==
 			MacroActionVariable::Type::SET_FIXED_VALUE ||
@@ -1489,10 +1381,6 @@ void MacroActionVariableEdit::SetWidgetVisibility()
 			MacroActionVariable::Type::SCENE_ITEM_NAME);
 	_tempVars->setVisible(_entryData->_type ==
 			      MacroActionVariable::Type::SET_TO_TEMPVAR);
-	_tempVarsHelp->setVisible(
-		_entryData->_type ==
-			MacroActionVariable::Type::SET_TO_TEMPVAR &&
-		!_entryData->_tempVar.HasValidID());
 	_sceneItemIndex->setVisible(_entryData->_type ==
 				    MacroActionVariable::Type::SCENE_ITEM_NAME);
 	_direction->setVisible(
@@ -1503,9 +1391,6 @@ void MacroActionVariableEdit::SetWidgetVisibility()
 		_entryData->_type == MacroActionVariable::Type::TRUNCATE);
 	_paddingCharSelection->setVisible(_entryData->_type ==
 					  MacroActionVariable::Type::PAD);
-	_caseType->setVisible(_entryData->_type ==
-			      MacroActionVariable::Type::CHANGE_CASE);
-
 	adjustSize();
 	updateGeometry();
 }

lib/macro/macro-action-variable.hpp

@@ -1,6 +1,5 @@
 #pragma once
 #include "macro-action-edit.hpp"
-#include "help-icon.hpp"
 #include "macro-segment-selection.hpp"
 #include "regex-config.hpp"
 #include "resizing-text-edit.hpp"
@@ -49,9 +48,6 @@ public:
 		SCENE_ITEM_NAME,
 		PAD,
 		TRUNCATE,
-		SWAP_VALUES,
-		TRIM,
-		CHANGE_CASE,
 	};
 
 	Type _type = Type::SET_FIXED_VALUE;
@@ -91,22 +87,12 @@ public:
 	IntVariable _stringLength = 1;
 	char _paddingChar = '0';
 
-	enum class CaseType {
-		LOWER_CASE,
-		UPPER_CASE,
-		CAPITALIZED,
-		START_CASE,
-	};
-
-	CaseType _caseType = CaseType::LOWER_CASE;
-
 private:
 	void DecrementCurrentSegmentVariableRef();
 	void HandleIndexSubString(Variable *);
 	void HandleRegexSubString(Variable *);
 	void HandleFindAndReplace(Variable *);
 	void HandleMathExpression(Variable *);
-	void HandleCaseChange(Variable *);
 	void SetToSceneItemName(Variable *);
 
 	std::weak_ptr<MacroSegment> _macroSegment;
@@ -160,7 +146,6 @@ private slots:
 	void DirectionChanged(int);
 	void StringLengthChanged(const NumberVariable<int> &);
 	void CharSelectionChanged(const QString &);
-	void CaseTypeChanged(int index);
 
 signals:
 	void HeaderInfoChanged(const QString &);
@@ -200,12 +185,10 @@ private:
 	VariableLineEdit *_envVariable;
 	SceneSelectionWidget *_scenes;
 	TempVariableSelection *_tempVars;
-	HelpIcon *_tempVarsHelp;
 	VariableSpinBox *_sceneItemIndex;
 	QComboBox *_direction;
 	VariableSpinBox *_stringLength;
 	SingleCharSelection *_paddingCharSelection;
-	FilterComboBox *_caseType;
 	QHBoxLayout *_entryLayout;
 
 	std::shared_ptr<MacroActionVariable> _entryData;

lib/macro/macro-condition-edit.cpp

@@ -1,6 +1,6 @@
 #include "macro-condition-edit.hpp"
 #include "advanced-scene-switcher.hpp"
-#include "macro-settings.hpp"
+#include "macro-properties.hpp"
 #include "macro.hpp"
 #include "path-helpers.hpp"
 #include "plugin-state-helpers.hpp"
@@ -10,6 +10,26 @@
 
 namespace advss {
 
+static inline void populateLogicSelection(QComboBox *list, bool root = false)
+{
+	if (root) {
+		for (const auto &entry : MacroCondition::logicTypes) {
+			if (static_cast<int>(entry.first) < logic_root_offset) {
+				list->addItem(obs_module_text(
+					entry.second._name.c_str()));
+			}
+		}
+	} else {
+		for (const auto &entry : MacroCondition::logicTypes) {
+			if (static_cast<int>(entry.first) >=
+			    logic_root_offset) {
+				list->addItem(obs_module_text(
+					entry.second._name.c_str()));
+			}
+		}
+	}
+}
+
 static inline void populateConditionSelection(QComboBox *list)
 {
 	for (const auto &[_, condition] :
@@ -100,13 +120,14 @@ void DurationModifierEdit::Collapse(bool collapse)
 
 MacroConditionEdit::MacroConditionEdit(
 	QWidget *parent, std::shared_ptr<MacroCondition> *entryData,
-	const std::string &id, bool isRootCondition)
-	: MacroSegmentEdit(parent),
+	const std::string &id, bool root)
+	: MacroSegmentEdit(GetGlobalMacroProperties()._highlightConditions,
+			   parent),
 	  _logicSelection(new QComboBox()),
 	  _conditionSelection(new FilterComboBox()),
 	  _dur(new DurationModifierEdit()),
 	  _entryData(entryData),
-	  _isRoot(isRootCondition)
+	  _isRoot(root)
 {
 	QWidget::connect(_logicSelection, SIGNAL(currentIndexChanged(int)),
 			 this, SLOT(LogicSelectionChanged(int)));
@@ -118,8 +139,10 @@ MacroConditionEdit::MacroConditionEdit(
 	QWidget::connect(_dur, SIGNAL(ModifierChanged(DurationModifier::Type)),
 			 this,
 			 SLOT(DurationModifierChanged(DurationModifier::Type)));
+	QWidget::connect(window(), SIGNAL(HighlightConditionsChanged(bool)),
+			 this, SLOT(EnableHighlight(bool)));
 
-	Logic::PopulateLogicTypeSelection(_logicSelection, isRootCondition);
+	populateLogicSelection(_logicSelection, root);
 	populateConditionSelection(_conditionSelection);
 
 	_section->AddHeaderWidget(_logicSelection);
@@ -148,10 +171,15 @@ void MacroConditionEdit::LogicSelectionChanged(int idx)
 		return;
 	}
 
+	LogicType type;
+	if (IsRootNode()) {
+		type = static_cast<LogicType>(idx);
+	} else {
+		type = static_cast<LogicType>(idx + logic_root_offset);
+	}
+
 	auto lock = LockContext();
-	const auto logic = static_cast<Logic::Type>(
-		_logicSelection->itemData(idx).toInt());
-	(*_entryData)->SetLogicType(logic);
+	(*_entryData)->SetLogicType(type);
 }
 
 bool MacroConditionEdit::IsRootNode()
@@ -161,9 +189,13 @@ bool MacroConditionEdit::IsRootNode()
 
 void MacroConditionEdit::SetLogicSelection()
 {
-	const auto logic = (*_entryData)->GetLogicType();
-	_logicSelection->setCurrentIndex(
-		_logicSelection->findData(static_cast<int>(logic)));
+	auto logic = (*_entryData)->GetLogicType();
+	if (IsRootNode()) {
+		_logicSelection->setCurrentIndex(static_cast<int>(logic));
+	} else {
+		_logicSelection->setCurrentIndex(static_cast<int>(logic) -
+						 logic_root_offset);
+	}
 }
 
 void MacroConditionEdit::SetRootNode(bool root)
@@ -171,7 +203,7 @@ void MacroConditionEdit::SetRootNode(bool root)
 	_isRoot = root;
 	const QSignalBlocker blocker(_logicSelection);
 	_logicSelection->clear();
-	Logic::PopulateLogicTypeSelection(_logicSelection, root);
+	populateLogicSelection(_logicSelection, root);
 	SetLogicSelection();
 }
 
@@ -267,48 +299,32 @@ void AdvSceneSwitcher::AddMacroCondition(int idx)
 	}
 
 	if (idx < 0 || idx > (int)macro->Conditions().size()) {
-		assert(false);
 		return;
 	}
 
 	std::string id;
-	Logic::Type logic;
+	LogicType logic;
 	if (idx >= 1) {
 		id = macro->Conditions().at(idx - 1)->GetId();
 		if (idx == 1) {
-			logic = Logic::Type::OR;
+			logic = LogicType::OR;
 		} else {
 			logic = macro->Conditions().at(idx - 1)->GetLogicType();
 		}
 	} else {
 		id = MacroCondition::GetDefaultID();
-		logic = Logic::Type::ROOT_NONE;
+		logic = LogicType::ROOT_NONE;
 	}
-
-	OBSDataAutoRelease data;
-	if (idx - 1 >= 0) {
-		data = obs_data_create();
-		macro->Conditions().at(idx - 1)->Save(data);
-	}
-	AddMacroCondition(macro.get(), idx, id, data.Get(), logic);
-}
-
-void AdvSceneSwitcher::AddMacroCondition(Macro *macro, int idx,
-					 const std::string &id,
-					 obs_data_t *data, Logic::Type logic)
-{
-	if (idx < 0 || idx > (int)macro->Conditions().size()) {
-		assert(false);
-		return;
-	}
-
 	{
 		auto lock = LockContext();
 		auto cond = macro->Conditions().emplace(
 			macro->Conditions().begin() + idx,
-			MacroConditionFactory::Create(id, macro));
-		if (data) {
+			MacroConditionFactory::Create(id, macro.get()));
+		if (idx - 1 >= 0) {
+			auto data = obs_data_create();
+			macro->Conditions().at(idx - 1)->Save(data);
 			macro->Conditions().at(idx)->Load(data);
+			obs_data_release(data);
 		}
 		macro->Conditions().at(idx)->PostLoad();
 		RunPostLoadSteps();
@@ -321,7 +337,6 @@ void AdvSceneSwitcher::AddMacroCondition(Macro *macro, int idx,
 		SetConditionData(*macro);
 	}
 	HighlightCondition(idx);
-	ui->conditionsList->SetHelpMsgVisible(false);
 	emit(MacroSegmentOrderChanged());
 }
 
@@ -340,6 +355,7 @@ void AdvSceneSwitcher::on_conditionAdd_clicked()
 	if (currentConditionIdx != -1) {
 		MacroConditionSelectionChanged(currentConditionIdx + 1);
 	}
+	ui->conditionsList->SetHelpMsgVisible(false);
 }
 
 void AdvSceneSwitcher::RemoveMacroCondition(int idx)
@@ -360,7 +376,7 @@ void AdvSceneSwitcher::RemoveMacroCondition(int idx)
 		macro->UpdateConditionIndices();
 		if (idx == 0 && macro->Conditions().size() > 0) {
 			auto newRoot = macro->Conditions().at(0);
-			newRoot->SetLogicType(Logic::Type::ROOT_NONE);
+			newRoot->SetLogicType(LogicType::ROOT_NONE);
 			static_cast<MacroConditionEdit *>(
 				ui->conditionsList->WidgetAt(0))
 				->SetRootNode(true);
@@ -511,23 +527,22 @@ void AdvSceneSwitcher::MacroConditionReorder(int to, int from)
 		auto lock = LockContext();
 		auto condition = macro->Conditions().at(from);
 		if (to == 0) {
-			condition->SetLogicType(Logic::Type::ROOT_NONE);
+			condition->SetLogicType(LogicType::ROOT_NONE);
 			static_cast<MacroConditionEdit *>(
 				ui->conditionsList->WidgetAt(from))
 				->SetRootNode(true);
-			macro->Conditions().at(0)->SetLogicType(
-				Logic::Type::AND);
+			macro->Conditions().at(0)->SetLogicType(LogicType::AND);
 			static_cast<MacroConditionEdit *>(
 				ui->conditionsList->WidgetAt(0))
 				->SetRootNode(false);
 		}
 		if (from == 0) {
-			condition->SetLogicType(Logic::Type::AND);
+			condition->SetLogicType(LogicType::AND);
 			static_cast<MacroConditionEdit *>(
 				ui->conditionsList->WidgetAt(from))
 				->SetRootNode(false);
 			macro->Conditions().at(1)->SetLogicType(
-				Logic::Type::ROOT_NONE);
+				LogicType::ROOT_NONE);
 			static_cast<MacroConditionEdit *>(
 				ui->conditionsList->WidgetAt(1))
 				->SetRootNode(true);

lib/macro/macro-condition-edit.hpp

@@ -2,7 +2,6 @@
 #include "macro-condition.hpp"
 #include "macro-condition-factory.hpp"
 #include "filter-combo-box.hpp"
-#include "duration-control.hpp"
 
 #include <memory>
 

lib/macro/macro-condition-factory.cpp

@@ -1,24 +1,7 @@
 #include "macro-condition-factory.hpp"
 
-#include <mutex>
-
 namespace advss {
 
-namespace {
-
-class MacroConditionUnknown : public MacroCondition {
-public:
-	MacroConditionUnknown(Macro *m) : MacroCondition(m) {}
-	bool CheckCondition() { return false; }
-	bool Save(obs_data_t *obj) const { return MacroCondition::Save(obj); };
-	bool Load(obs_data_t *obj) { return MacroCondition::Load(obj); };
-	std::string GetId() const { return "unknown"; }
-};
-
-} // namespace
-
-static std::recursive_mutex mutex;
-
 std::map<std::string, MacroConditionInfo> &MacroConditionFactory::GetMap()
 {
 	static std::map<std::string, MacroConditionInfo> _methods;
@@ -28,7 +11,6 @@ std::map<std::string, MacroConditionInfo> &MacroConditionFactory::GetMap()
 bool MacroConditionFactory::Register(const std::string &id,
 				     MacroConditionInfo info)
 {
-	std::lock_guard<std::recursive_mutex> lock(mutex);
 	if (auto it = GetMap().find(id); it == GetMap().end()) {
 		GetMap()[id] = info;
 		return true;
@@ -36,60 +18,35 @@ bool MacroConditionFactory::Register(const std::string &id,
 	return false;
 }
 
-bool MacroConditionFactory::Deregister(const std::string &id)
-{
-	std::lock_guard<std::recursive_mutex> lock(mutex);
-	if (GetMap().count(id) == 0) {
-		return false;
-	}
-	GetMap().erase(id);
-	return true;
-}
-
-static std::shared_ptr<MacroCondition> createUnknownCondition(Macro *m)
-{
-	return std::make_shared<MacroConditionUnknown>(m);
-}
-
 std::shared_ptr<MacroCondition>
 MacroConditionFactory::Create(const std::string &id, Macro *m)
 {
-	std::lock_guard<std::recursive_mutex> lock(mutex);
 	if (auto it = GetMap().find(id); it != GetMap().end()) {
 		return it->second._create(m);
 	}
-	return createUnknownCondition(m);
-}
-
-static QWidget *createUnknownConditionWidget()
-{
-	return new QLabel(
-		obs_module_text("AdvSceneSwitcher.condition.unknown"));
+	return nullptr;
 }
 
 QWidget *
 MacroConditionFactory::CreateWidget(const std::string &id, QWidget *parent,
 				    std::shared_ptr<MacroCondition> cond)
 {
-	std::lock_guard<std::recursive_mutex> lock(mutex);
 	if (auto it = GetMap().find(id); it != GetMap().end()) {
 		return it->second._createWidget(parent, cond);
 	}
-	return createUnknownConditionWidget();
+	return nullptr;
 }
 
 std::string MacroConditionFactory::GetConditionName(const std::string &id)
 {
-	std::lock_guard<std::recursive_mutex> lock(mutex);
 	if (auto it = GetMap().find(id); it != GetMap().end()) {
 		return it->second._name;
 	}
-	return obs_module_text("AdvSceneSwitcher.condition.unknown");
+	return "unknown condition";
 }
 
 std::string MacroConditionFactory::GetIdByName(const QString &name)
 {
-	std::lock_guard<std::recursive_mutex> lock(mutex);
 	for (auto it : GetMap()) {
 		if (name == obs_module_text(it.second._name.c_str())) {
 			return it.first;
@@ -100,21 +57,10 @@ std::string MacroConditionFactory::GetIdByName(const QString &name)
 
 bool MacroConditionFactory::UsesDurationModifier(const std::string &id)
 {
-	std::lock_guard<std::recursive_mutex> lock(mutex);
 	if (auto it = GetMap().find(id); it != GetMap().end()) {
 		return it->second._useDurationModifier;
 	}
 	return false;
 }
 
-bool CanCreateDefaultCondition()
-{
-	const auto condition = MacroConditionFactory::Create(
-		MacroCondition::GetDefaultID().data(), nullptr);
-	if (!condition) {
-		return false;
-	}
-	return condition->GetId() == MacroCondition::GetDefaultID().data();
-}
-
 } // namespace advss

lib/macro/macro-condition-factory.hpp

@@ -6,11 +6,10 @@
 namespace advss {
 
 struct MacroConditionInfo {
+	using CreateCondition = std::shared_ptr<MacroCondition> (*)(Macro *m);
 	using CreateConditionWidget =
 		QWidget *(*)(QWidget *parent, std::shared_ptr<MacroCondition>);
-
-	std::function<std::shared_ptr<MacroCondition>(Macro *m)> _create =
-		nullptr;
+	CreateCondition _create = nullptr;
 	CreateConditionWidget _createWidget = nullptr;
 	std::string _name;
 	bool _useDurationModifier = true;
@@ -20,7 +19,6 @@ class MacroConditionFactory {
 public:
 	MacroConditionFactory() = delete;
 	EXPORT static bool Register(const std::string &, MacroConditionInfo);
-	static bool Deregister(const std::string &);
 	static std::shared_ptr<MacroCondition> Create(const std::string &,
 						      Macro *m);
 	static QWidget *CreateWidget(const std::string &id, QWidget *parent,
@@ -34,6 +32,4 @@ private:
 	static std::map<std::string, MacroConditionInfo> &GetMap();
 };
 
-bool CanCreateDefaultCondition();
-
 } // namespace advss

lib/macro/macro-condition-macro.cpp

@@ -58,7 +58,7 @@ bool MacroConditionMacro::CheckStateCondition()
 		return false;
 	}
 
-	return macro->ConditionsMatched();
+	return macro->Matched();
 }
 
 bool MacroConditionMacro::CheckMultiStateCondition()
@@ -72,7 +72,7 @@ bool MacroConditionMacro::CheckMultiStateCondition()
 		if (!macro) {
 			continue;
 		}
-		if (macro->ConditionsMatched()) {
+		if (macro->Matched()) {
 			matchedCount++;
 		}
 	}

lib/macro/macro-condition-script.cpp

@@ -1,79 +0,0 @@
-#include "macro-condition-script.hpp"
-#include "layout-helpers.hpp"
-#include "macro-helpers.hpp"
-#include "sync-helpers.hpp"
-
-namespace advss {
-
-MacroConditionScript::MacroConditionScript(
-	Macro *m, const std::string &id, const OBSData &defaultSettings,
-	const std::string &propertiesSignalName,
-	const std::string &triggerSignal, const std::string &completionSignal)
-	: MacroCondition(m),
-	  MacroSegmentScript(defaultSettings, propertiesSignalName,
-			     triggerSignal, completionSignal),
-	  _id(id)
-{
-}
-
-MacroConditionScript::MacroConditionScript(
-	const advss::MacroConditionScript &other)
-	: MacroCondition(other.GetMacro()),
-	  MacroSegmentScript(other),
-	  _id(other._id)
-{
-}
-
-bool MacroConditionScript::CheckCondition()
-{
-	if (!ScriptHandler::ConditionIdIsValid(_id)) {
-		blog(LOG_WARNING, "skipping unknown script condition \"%s\"",
-		     _id.c_str());
-		return false;
-	}
-
-	return SendTriggerSignal();
-}
-
-bool MacroConditionScript::Save(obs_data_t *obj) const
-{
-	MacroCondition::Save(obj);
-	MacroSegmentScript::Save(obj);
-	return true;
-}
-
-bool MacroConditionScript::Load(obs_data_t *obj)
-{
-	MacroCondition::Load(obj);
-	MacroSegmentScript::Load(obj);
-	return true;
-}
-
-void MacroConditionScript::WaitForCompletion() const
-{
-	using namespace std::chrono_literals;
-	auto start = std::chrono::high_resolution_clock::now();
-	auto timePassed = std::chrono::duration_cast<std::chrono::milliseconds>(
-		start - start);
-	const auto timeoutMs = GetTimeoutSeconds() * 1000.0;
-
-	while (!TriggerIsCompleted()) {
-		if (MacroWaitShouldAbort() || MacroIsStopped(GetMacro())) {
-			break;
-		}
-
-		if ((double)timePassed.count() > timeoutMs) {
-			blog(LOG_INFO, "script condition timeout (%s)",
-			     _id.c_str());
-			break;
-		}
-
-		std::this_thread::sleep_for(10ms);
-		const auto now = std::chrono::high_resolution_clock::now();
-		timePassed =
-			std::chrono::duration_cast<std::chrono::milliseconds>(
-				now - start);
-	}
-}
-
-} // namespace advss

lib/macro/macro-condition-script.hpp

@@ -1,27 +0,0 @@
-#pragma once
-#include "macro-condition-edit.hpp"
-#include "macro-script-handler.hpp"
-#include "macro-segment-script.hpp"
-
-namespace advss {
-
-class MacroConditionScript : public MacroCondition, public MacroSegmentScript {
-public:
-	MacroConditionScript(Macro *m, const std::string &id,
-			     const OBSData &defaultSettings,
-			     const std::string &propertiesSignalName,
-			     const std::string &triggerSignal,
-			     const std::string &signalComplete);
-	MacroConditionScript(const advss::MacroConditionScript &);
-	bool CheckCondition();
-	bool Save(obs_data_t *obj) const;
-	bool Load(obs_data_t *obj);
-	std::string GetId() const { return _id; };
-
-private:
-	void WaitForCompletion() const;
-
-	std::string _id = "";
-};
-
-} // namespace advss

lib/macro/macro-condition.cpp

@@ -2,6 +2,79 @@
 
 namespace advss {
 
+const std::map<LogicType, LogicTypeInfo> MacroCondition::logicTypes = {
+	{LogicType::NONE, {"AdvSceneSwitcher.logic.none"}},
+	{LogicType::AND, {"AdvSceneSwitcher.logic.and"}},
+	{LogicType::OR, {"AdvSceneSwitcher.logic.or"}},
+	{LogicType::AND_NOT, {"AdvSceneSwitcher.logic.andNot"}},
+	{LogicType::OR_NOT, {"AdvSceneSwitcher.logic.orNot"}},
+	{LogicType::ROOT_NONE, {"AdvSceneSwitcher.logic.rootNone"}},
+	{LogicType::ROOT_NOT, {"AdvSceneSwitcher.logic.not"}},
+};
+
+void DurationModifier::Save(obs_data_t *obj, const char *condName,
+			    const char *duration) const
+{
+	obs_data_set_int(obj, condName, static_cast<int>(_type));
+	_dur.Save(obj, duration);
+}
+
+void DurationModifier::Load(obs_data_t *obj, const char *condName,
+			    const char *duration)
+{
+	// For backwards compatibility check if duration value exist without
+	// time constraint condition - if so assume DurationCondition::MORE
+	if (!obs_data_has_user_value(obj, condName) &&
+	    obs_data_has_user_value(obj, duration)) {
+		obs_data_set_int(obj, condName, static_cast<int>(Type::MORE));
+	}
+
+	_type = static_cast<Type>(obs_data_get_int(obj, condName));
+	_dur.Load(obj, duration);
+
+	// TODO: remove this fallback
+	if (obs_data_has_user_value(obj, "displayUnit")) {
+		_dur.SetUnit(static_cast<Duration::Unit>(
+			obs_data_get_int(obj, "displayUnit")));
+	}
+}
+
+bool DurationModifier::DurationReached()
+{
+	switch (_type) {
+	case DurationModifier::Type::NONE:
+		return true;
+		break;
+	case DurationModifier::Type::MORE:
+		return _dur.DurationReached();
+		break;
+	case DurationModifier::Type::EQUAL:
+		if (_dur.DurationReached() && !_timeReached) {
+			_timeReached = true;
+			return true;
+		}
+		break;
+	case DurationModifier::Type::LESS:
+		return !_dur.DurationReached();
+		break;
+	case DurationModifier::Type::WITHIN:
+		if (_dur.IsReset()) {
+			return false;
+		}
+		return !_dur.DurationReached();
+		break;
+	default:
+		break;
+	}
+	return false;
+}
+
+void DurationModifier::Reset()
+{
+	_timeReached = false;
+	_dur.Reset();
+}
+
 MacroCondition::MacroCondition(Macro *m, bool supportsVariableValue)
 	: MacroSegment(m, supportsVariableValue)
 {
@@ -11,64 +84,73 @@ bool MacroCondition::Save(obs_data_t *obj) const
 {
 	MacroSegment::Save(obj);
 	obs_data_set_string(obj, "id", GetId().c_str());
-	_logic.Save(obj, "logic");
-	_durationModifier.Save(obj);
+	obs_data_set_int(obj, "logic", static_cast<int>(_logic));
+
+	// To avoid conflicts with conditions which also use the Duration class
+	// save the duration modifier in a separate obj
+	auto durObj = obs_data_create();
+	_duration.Save(durObj);
+	obs_data_set_obj(obj, "durationModifier", durObj);
+	obs_data_release(durObj);
+
 	return true;
 }
 
 bool MacroCondition::Load(obs_data_t *obj)
 {
 	MacroSegment::Load(obj);
-	_logic.Load(obj, "logic");
-	_durationModifier.Load(obj);
+	_logic = static_cast<LogicType>(obs_data_get_int(obj, "logic"));
+	if (obs_data_has_user_value(obj, "durationModifier")) {
+		auto durObj = obs_data_get_obj(obj, "durationModifier");
+		_duration.Load(durObj);
+		obs_data_release(durObj);
+	} else {
+		// For backwards compatibility
+		_duration.Load(obj);
+	}
 	return true;
 }
 
-void MacroCondition::ValidateLogicSelection(bool isRootCondition,
-					    const char *context)
-{
-	if (_logic.IsValidSelection(isRootCondition)) {
-		return;
-	}
-
-	if (_logic.IsRootType()) {
-		_logic.SetType(Logic::Type::ROOT_NONE);
-		blog(LOG_WARNING,
-		     "setting invalid logic selection to 'if' for macro %s",
-		     context);
-		return;
-	}
-
-	_logic.SetType(Logic::Type::NONE);
-	blog(LOG_WARNING,
-	     "setting invalid logic selection to 'ignore' for macro %s",
-	     context);
-}
-
 void MacroCondition::ResetDuration()
 {
-	_durationModifier.ResetDuration();
+	_duration.Reset();
 }
 
-bool MacroCondition::CheckDurationModifier(bool conditionValue)
+void MacroCondition::CheckDurationModifier(bool &val)
 {
-	return _durationModifier.CheckConditionWithDurationModifier(
-		conditionValue);
-}
-
-DurationModifier MacroCondition::GetDurationModifier() const
-{
-	return _durationModifier;
+	if (_duration.GetType() != DurationModifier::Type::WITHIN && !val) {
+		_duration.Reset();
+	}
+	if (_duration.GetType() == DurationModifier::Type::WITHIN && val) {
+		_duration.Reset();
+	}
+	switch (_duration.GetType()) {
+	case DurationModifier::Type::NONE:
+	case DurationModifier::Type::MORE:
+	case DurationModifier::Type::EQUAL:
+	case DurationModifier::Type::LESS:
+		val = val && _duration.DurationReached();
+		return;
+	case DurationModifier::Type::WITHIN:
+		if (val) {
+			_duration.SetTimeRemaining(
+				_duration.GetDuration().Seconds());
+		}
+		val = val || _duration.DurationReached();
+		break;
+	default:
+		break;
+	}
 }
 
 void MacroCondition::SetDurationModifier(DurationModifier::Type m)
 {
-	_durationModifier.SetModifier(m);
+	_duration.SetModifier(m);
 }
 
 void MacroCondition::SetDuration(const Duration &duration)
 {
-	_durationModifier.SetDuration(duration);
+	_duration.SetValue(duration);
 }
 
 std::string_view MacroCondition::GetDefaultID()

lib/macro/macro-condition.hpp

@@ -1,11 +1,63 @@
 #pragma once
 #include "macro-segment.hpp"
-#include "condition-logic.hpp"
-#include "duration-modifier.hpp"
 #include "macro-ref.hpp"
+#include <duration-control.hpp>
 
 namespace advss {
 
+constexpr auto logic_root_offset = 100;
+
+enum class LogicType {
+	ROOT_NONE = 0,
+	ROOT_NOT,
+	ROOT_LAST,
+	// leave some space for potential expansion
+	NONE = 100,
+	AND,
+	OR,
+	AND_NOT,
+	OR_NOT,
+	LAST,
+};
+
+static inline bool isRootLogicType(LogicType l)
+{
+	return static_cast<int>(l) < logic_root_offset;
+}
+
+struct LogicTypeInfo {
+	std::string _name;
+};
+
+class DurationModifier {
+public:
+	enum class Type {
+		NONE,
+		MORE,
+		EQUAL,
+		LESS,
+		WITHIN, // Condition will remain true for a set a amount of time
+			// regardless of current state
+	};
+
+	void Save(obs_data_t *obj, const char *condName = "time_constraint",
+		  const char *duration = "seconds") const;
+	void Load(obs_data_t *obj, const char *condName = "time_constraint",
+		  const char *duration = "seconds");
+	void SetModifier(Type cond) { _type = cond; }
+	void SetTimeRemaining(const double &val) { _dur.SetTimeRemaining(val); }
+	void SetValue(const Duration &value) { _dur = value; }
+	Type GetType() { return _type; }
+	Duration GetDuration() { return _dur; }
+	bool DurationReached();
+	void Reset();
+
+private:
+	Type _type = Type::NONE;
+	Duration _dur;
+	bool _timeReached = false;
+};
+
 class EXPORT MacroCondition : public MacroSegment {
 public:
 	MacroCondition(Macro *m, bool supportsVariableValue = false);
@@ -13,24 +65,20 @@ public:
 	virtual bool CheckCondition() = 0;
 	virtual bool Save(obs_data_t *obj) const = 0;
 	virtual bool Load(obs_data_t *obj) = 0;
-
-	Logic::Type GetLogicType() const { return _logic.GetType(); }
-	void SetLogicType(const Logic::Type &logic) { _logic.SetType(logic); }
-
-	void ValidateLogicSelection(bool isRootCondition, const char *context);
-
-	DurationModifier GetDurationModifier() const;
+	LogicType GetLogicType() { return _logic; }
+	void SetLogicType(LogicType logic) { _logic = logic; }
+	static const std::map<LogicType, LogicTypeInfo> logicTypes;
+	void ResetDuration();
+	void CheckDurationModifier(bool &val);
+	DurationModifier GetDurationModifier() { return _duration; }
 	void SetDurationModifier(DurationModifier::Type m);
 	void SetDuration(const Duration &duration);
 
-	void ResetDuration();
-	bool CheckDurationModifier(bool conditionValue);
-
 	static std::string_view GetDefaultID();
 
 private:
-	Logic _logic = Logic(Logic::Type::ROOT_NONE);
-	DurationModifier _durationModifier;
+	LogicType _logic = LogicType::ROOT_NONE;
+	DurationModifier _duration;
 };
 
 class EXPORT MacroRefCondition : virtual public MacroCondition {

lib/macro/macro-dock.cpp

@@ -6,14 +6,14 @@
 
 namespace advss {
 
-MacroDock::MacroDock(std::weak_ptr<Macro> m,
+MacroDock::MacroDock(std::weak_ptr<Macro> m, QWidget *parent,
 		     const StringVariable &runButtonText,
 		     const StringVariable &pauseButtonText,
 		     const StringVariable &unpauseButtonText,
 		     const StringVariable &conditionsTrueText,
 		     const StringVariable &conditionsFalseText,
 		     bool enableHighlight)
-	: QFrame(),
+	: OBSDock(parent),
 	  _runButtonText(runButtonText),
 	  _pauseButtonText(pauseButtonText),
 	  _unpauseButtonText(unpauseButtonText),
@@ -25,16 +25,19 @@ MacroDock::MacroDock(std::weak_ptr<Macro> m,
 	  _statusText(new QLabel(conditionsFalseText.c_str())),
 	  _macro(m)
 {
-	setFrameShape(QFrame::StyledPanel);
-	setFrameShadow(QFrame::Sunken);
-
 	auto macro = _macro.lock();
 	if (macro) {
+		setWindowTitle(QString::fromStdString(macro->Name()));
 		_run->setVisible(macro->DockHasRunButton());
 		_pauseToggle->setVisible(macro->DockHasPauseButton());
 		_statusText->setVisible(macro->DockHasStatusLabel());
+	} else {
+		setWindowTitle("<deleted macro>");
 	}
 
+	setFeatures(DockWidgetClosable | DockWidgetMovable |
+		    DockWidgetFloatable);
+
 	QWidget::connect(_run, SIGNAL(clicked()), this, SLOT(RunClicked()));
 	QWidget::connect(_pauseToggle, SIGNAL(clicked()), this,
 			 SLOT(PauseToggleClicked()));
@@ -49,7 +52,21 @@ MacroDock::MacroDock(std::weak_ptr<Macro> m,
 	QWidget::connect(&_timer, SIGNAL(timeout()), this, SLOT(Highlight()));
 	_timer.start(500);
 
-	setLayout(layout);
+	// QFrame wrapper is necessary to avoid dock being partially
+	// transparent
+	QFrame *wrapper = new QFrame;
+	wrapper->setFrameShape(QFrame::StyledPanel);
+	wrapper->setFrameShadow(QFrame::Sunken);
+	wrapper->setLayout(layout);
+	setWidget(wrapper);
+
+	setFloating(true);
+	hide();
+}
+
+void MacroDock::SetName(const QString &name)
+{
+	setWindowTitle(name);
 }
 
 void MacroDock::ShowRunButton(bool value)
@@ -138,9 +155,8 @@ void MacroDock::UpdateText()
 
 	_pauseToggle->setText(macro->Paused() ? _unpauseButtonText.c_str()
 					      : _pauseButtonText.c_str());
-	_statusText->setText(macro->ConditionsMatched()
-				     ? _conditionsTrueText.c_str()
-				     : _conditionsFalseText.c_str());
+	_statusText->setText(macro->Matched() ? _conditionsTrueText.c_str()
+					      : _conditionsFalseText.c_str());
 }
 
 void MacroDock::Highlight()
@@ -151,7 +167,7 @@ void MacroDock::Highlight()
 	}
 	if (_lastHighlightCheckTime.time_since_epoch().count() != 0 &&
 	    macro->WasExecutedSince(_lastHighlightCheckTime)) {
-		HighlightWidget(this, Qt::green, QColor(0, 0, 0, 0), true);
+		PulseWidget(this, Qt::green, QColor(0, 0, 0, 0), true);
 	}
 	_lastHighlightCheckTime = std::chrono::high_resolution_clock::now();
 }

lib/macro/macro-dock.hpp

@@ -1,9 +1,10 @@
 #pragma once
+#include "obs-dock.hpp"
 #include "variable-string.hpp"
 
-#include <QLabel>
 #include <QPushButton>
 #include <QTimer>
+#include <QLabel>
 #include <memory>
 #include <chrono>
 
@@ -11,16 +12,18 @@ namespace advss {
 
 class Macro;
 
-class MacroDock : public QFrame {
+class MacroDock : public OBSDock {
 	Q_OBJECT
 
 public:
-	MacroDock(std::weak_ptr<Macro>, const StringVariable &runButtonText,
+	MacroDock(std::weak_ptr<Macro>, QWidget *parent,
+		  const StringVariable &runButtonText,
 		  const StringVariable &pauseButtonText,
 		  const StringVariable &unpauseButtonText,
 		  const StringVariable &conditionsTrueText,
 		  const StringVariable &conditionsFalseText,
 		  bool enableHighlight);
+	void SetName(const QString &);
 	void ShowRunButton(bool);
 	void SetRunButtonText(const StringVariable &);
 	void ShowPauseButton(bool);

lib/macro/macro-helpers.cpp

@@ -85,11 +85,9 @@ std::string GetMacroName(Macro *macro)
 	return macro ? macro->Name() : "";
 }
 
-std::chrono::high_resolution_clock::time_point
-LastMacroConditionCheckTime(Macro *macro)
+int64_t MillisecondsSinceMacroConditionCheck(Macro *macro)
 {
-	return macro ? macro->LastConditionCheckTime()
-		     : std::chrono::high_resolution_clock::time_point{};
+	return macro ? macro->MsSinceLastCheck() : 0;
 }
 
 bool MacroIsStopped(Macro *macro)

lib/macro/macro-helpers.hpp

@@ -43,8 +43,7 @@ EXPORT bool MacroSwitchedScene();
 
 EXPORT std::string GetMacroName(Macro *);
 
-EXPORT std::chrono::high_resolution_clock::time_point
-LastMacroConditionCheckTime(Macro *);
+EXPORT int64_t MillisecondsSinceMacroConditionCheck(Macro *);
 
 EXPORT bool MacroIsStopped(Macro *);
 EXPORT bool MacroIsPaused(Macro *);

lib/macro/macro-input.cpp

@@ -1,241 +0,0 @@
-#include "macro-input.hpp"
-#include "layout-helpers.hpp"
-#include "log-helper.hpp"
-#include "obs-module-helper.hpp"
-#include "variable-line-edit.hpp"
-
-#include <algorithm>
-#include <obs.hpp>
-
-namespace advss {
-
-void MacroInputVariables::Save(obs_data_t *obj) const
-{
-	OBSDataArrayAutoRelease array = obs_data_array_create();
-	for (auto &var : _inputVariables) {
-		OBSDataAutoRelease arrayObj = obs_data_create();
-		auto variable = var.lock();
-		if (variable) {
-			obs_data_set_string(arrayObj, "variableName",
-					    variable->Name().c_str());
-		} else {
-			obs_data_set_bool(arrayObj, "invalidVariable", true);
-		}
-		obs_data_array_push_back(array, arrayObj);
-	}
-	obs_data_set_array(obj, "inputVariables", array);
-}
-
-void MacroInputVariables::Load(obs_data_t *obj)
-{
-	OBSDataArrayAutoRelease array =
-		obs_data_get_array(obj, "inputVariables");
-	const size_t count = obs_data_array_count(array);
-	for (size_t i = 0; i < count; i++) {
-		OBSDataAutoRelease arrayObj = obs_data_array_item(array, i);
-		const bool isInvalid =
-			obs_data_get_bool(arrayObj, "invalidVariable");
-		if (isInvalid) {
-			_inputVariables.emplace_back();
-		} else {
-			const auto name =
-				obs_data_get_string(arrayObj, "variableName");
-			_inputVariables.emplace_back(
-				GetWeakVariableByName(name));
-		}
-	}
-}
-
-void MacroInputVariables::SetValues(const StringList &values)
-{
-	if (_inputVariables.size() != (size_t)values.size()) {
-		blog(LOG_WARNING,
-		     "%s - sizes do not match (variables: %d, values %d)",
-		     __func__, (int)_inputVariables.size(), (int)values.size());
-	}
-
-	for (size_t index = 0;
-	     index < _inputVariables.size() && index < (size_t)values.size();
-	     index++) {
-		auto variable = _inputVariables.at(index).lock();
-		if (!variable) {
-			continue;
-		}
-
-		variable->SetValue(values.at(index));
-	}
-}
-
-MacroInputSelection::MacroInputSelection(QWidget *parent) : ListEditor(parent)
-{
-	_list->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
-}
-
-void MacroInputSelection::SetInputs(const MacroInputVariables &inputs)
-{
-	_currentSelection = inputs;
-	for (const auto &var : inputs._inputVariables) {
-		auto variable = var.lock();
-		const auto name =
-			variable
-				? QString::fromStdString(variable->Name())
-				: obs_module_text(
-					  "AdvSceneSwitcher.macroTab.inputSettings.invalid");
-
-		QVariant v = QVariant::fromValue(name);
-		auto item = new QListWidgetItem(name, _list);
-		item->setData(Qt::UserRole, name);
-	}
-	UpdateListSize();
-}
-
-void MacroInputSelection::Add()
-{
-	std::string varName;
-	bool accepted = VariableSelectionDialog::AskForVariable(varName);
-
-	if (!accepted || varName.empty()) {
-		return;
-	}
-
-	_currentSelection._inputVariables.emplace_back(
-		GetWeakVariableByName(varName));
-
-	QVariant v = QVariant::fromValue(QString::fromStdString(varName));
-	auto item = new QListWidgetItem(QString::fromStdString(varName), _list);
-	item->setData(Qt::UserRole, QString::fromStdString(varName));
-	UpdateListSize();
-}
-
-void MacroInputSelection::Remove()
-{
-	auto item = _list->currentItem();
-	int idx = _list->currentRow();
-	if (!item || idx == -1) {
-		return;
-	}
-
-	_currentSelection._inputVariables.erase(
-		std::next(_currentSelection._inputVariables.begin(), idx));
-
-	delete item;
-	UpdateListSize();
-}
-
-void MacroInputSelection::Up()
-{
-	int idx = _list->currentRow();
-	if (idx < 1) {
-		return;
-	}
-
-	_list->insertItem(idx - 1, _list->takeItem(idx));
-	_list->setCurrentRow(idx - 1);
-
-	std::iter_swap(
-		std::next(_currentSelection._inputVariables.begin(), idx),
-		std::next(_currentSelection._inputVariables.begin(), idx - 1));
-}
-
-void MacroInputSelection::Down()
-{
-	int idx = _list->currentRow();
-	if (idx < 0 || idx >= _list->count()) {
-		return;
-	}
-
-	_list->insertItem(idx + 1, _list->takeItem(idx));
-	_list->setCurrentRow(idx + 1);
-
-	std::iter_swap(
-		std::next(_currentSelection._inputVariables.begin(), idx + 1),
-		std::next(_currentSelection._inputVariables.begin(), idx));
-}
-
-void MacroInputSelection::Clicked(QListWidgetItem *item)
-{
-	std::string varName;
-	bool accepted = VariableSelectionDialog::AskForVariable(varName);
-
-	if (!accepted || varName.empty()) {
-		return;
-	}
-
-	item->setText(QString::fromStdString(varName));
-	int idx = _list->currentRow();
-
-	_currentSelection._inputVariables.at(idx) =
-		GetWeakVariableByName(varName);
-}
-
-MacroInputEdit::MacroInputEdit(QWidget *parent)
-	: QWidget(parent),
-	  _layout(new QGridLayout())
-{
-	setLayout(_layout);
-}
-
-void MacroInputEdit::SetInputVariablesAndValues(
-	const MacroInputVariables &inputs, const StringList &values)
-{
-	_variables = inputs;
-	_values = values;
-	if ((size_t)_values.size() < _variables._inputVariables.size()) {
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-		for (int i = 0;
-		     _variables._inputVariables.size() - (size_t)_values.size();
-		     i++) {
-			_values.push_back({});
-		}
-#else
-		_values.resize(_variables._inputVariables.size());
-#endif
-	}
-	SetupWidgets();
-}
-
-bool MacroInputEdit::HasInputsToSet() const
-{
-	return !_variables._inputVariables.empty();
-}
-
-void HighligthMacroSettingsButton(bool enable);
-
-void MacroInputEdit::SetupWidgets()
-{
-	ClearLayout(_layout);
-
-	auto &vars = _variables._inputVariables;
-	if (vars.empty()) {
-		_layout->addWidget(new QLabel(obs_module_text(
-			"AdvSceneSwitcher.macroTab.inputSettings.noInputs")));
-		adjustSize();
-		updateGeometry();
-		return;
-	}
-
-	for (size_t index = 0; index < vars.size(); index++) {
-		auto variable = vars.at(index).lock();
-		QLabel *label = new QLabel(
-			variable
-				? QString::fromStdString(variable->Name())
-				: obs_module_text(
-					  "AdvSceneSwitcher.macroTab.inputSettings.invalid"));
-		_layout->addWidget(label, index, 0);
-		auto valueEdit = new VariableLineEdit(this);
-		valueEdit->setEnabled(!!variable);
-		valueEdit->setText(_values.at(index));
-		connect(valueEdit, &VariableLineEdit::editingFinished,
-			[this, valueEdit, index]() {
-				_values[index] =
-					valueEdit->text().toStdString();
-				emit MacroInputValuesChanged(_values);
-			});
-		_layout->addWidget(valueEdit, index, 1);
-	}
-
-	adjustSize();
-	updateGeometry();
-}
-
-} // namespace advss

lib/macro/macro-input.hpp

@@ -1,63 +0,0 @@
-#pragma once
-#include "list-editor.hpp"
-#include "string-list.hpp"
-#include "variable.hpp"
-
-#include <QGridLayout>
-#include <memory>
-#include <vector>
-
-namespace advss {
-
-class MacroInputVariables {
-public:
-	void Save(obs_data_t *obj) const;
-	void Load(obs_data_t *obj);
-	void SetValues(const StringList &values);
-
-private:
-	std::vector<std::weak_ptr<Variable>> _inputVariables;
-	friend class MacroInputSelection;
-	friend class MacroInputEdit;
-};
-
-class MacroInputSelection final : public ListEditor {
-	Q_OBJECT
-
-public:
-	MacroInputSelection(QWidget *parent = nullptr);
-	void SetInputs(const MacroInputVariables &inputs);
-	MacroInputVariables GetInputs() const { return _currentSelection; }
-
-private slots:
-	void Add();
-	void Remove();
-	void Up();
-	void Down();
-	void Clicked(QListWidgetItem *);
-
-private:
-	MacroInputVariables _currentSelection;
-};
-
-class MacroInputEdit final : public QWidget {
-	Q_OBJECT
-
-public:
-	MacroInputEdit(QWidget *parent = nullptr);
-	void SetInputVariablesAndValues(const MacroInputVariables &inputs,
-					const StringList &values);
-	bool HasInputsToSet() const;
-
-signals:
-	void MacroInputValuesChanged(const StringList &);
-
-private:
-	void SetupWidgets();
-
-	MacroInputVariables _variables;
-	StringList _values;
-	QGridLayout *_layout;
-};
-
-} // namespace advss

lib/macro/macro-list.cpp

@@ -7,16 +7,68 @@
 namespace advss {
 
 MacroList::MacroList(QWidget *parent, bool allowDuplicates, bool reorder)
-	: ListEditor(parent, reorder),
-	  _allowDuplicates(allowDuplicates)
+	: QWidget(parent),
+	  _list(new QListWidget()),
+	  _add(new QPushButton()),
+	  _remove(new QPushButton()),
+	  _up(new QPushButton()),
+	  _down(new QPushButton()),
+	  _controlsLayout(new QHBoxLayout()),
+	  _allowDuplicates(allowDuplicates),
+	  _reorder(reorder)
 {
+	_add->setMaximumWidth(22);
+	_add->setProperty("themeID",
+			  QVariant(QString::fromUtf8("addIconSmall")));
+	_add->setFlat(true);
+	_remove->setMaximumWidth(22);
+	_remove->setProperty("themeID",
+			     QVariant(QString::fromUtf8("removeIconSmall")));
+	_remove->setFlat(true);
+	_up->setMaximumWidth(22);
+	_up->setProperty("themeID",
+			 QVariant(QString::fromUtf8("upArrowIconSmall")));
+	_up->setFlat(true);
+	_down->setMaximumWidth(22);
+	_down->setProperty("themeID",
+			   QVariant(QString::fromUtf8("downArrowIconSmall")));
+	_down->setFlat(true);
+
+	QWidget::connect(_add, SIGNAL(clicked()), this, SLOT(Add()));
+	QWidget::connect(_remove, SIGNAL(clicked()), this, SLOT(Remove()));
+	QWidget::connect(_up, SIGNAL(clicked()), this, SLOT(Up()));
+	QWidget::connect(_down, SIGNAL(clicked()), this, SLOT(Down()));
+	QWidget::connect(_list, SIGNAL(itemDoubleClicked(QListWidgetItem *)),
+			 this, SLOT(MacroItemClicked(QListWidgetItem *)));
 	QWidget::connect(window(),
 			 SIGNAL(MacroRenamed(const QString &, const QString &)),
 			 this,
 			 SLOT(MacroRename(const QString &, const QString &)));
 	QWidget::connect(window(), SIGNAL(MacroRemoved(const QString &)), this,
 			 SLOT(MacroRemove(const QString &)));
-	UpdateListSize();
+
+	_controlsLayout->addWidget(_add);
+	_controlsLayout->addWidget(_remove);
+	if (reorder) {
+		QFrame *line = new QFrame();
+		line->setFrameShape(QFrame::VLine);
+		line->setFrameShadow(QFrame::Sunken);
+		_controlsLayout->addWidget(line);
+	}
+	_controlsLayout->addWidget(_up);
+	_controlsLayout->addWidget(_down);
+	_controlsLayout->addStretch();
+
+	auto mainLayout = new QVBoxLayout;
+	mainLayout->setContentsMargins(0, 0, 0, 0);
+	mainLayout->addWidget(_list);
+	mainLayout->addLayout(_controlsLayout);
+	setLayout(mainLayout);
+
+	_up->setVisible(reorder);
+	_down->setVisible(reorder);
+
+	SetMacroListSize();
 }
 
 void MacroList::SetContent(const std::vector<MacroRef> &macros)
@@ -37,15 +89,12 @@ void MacroList::SetContent(const std::vector<MacroRef> &macros)
 			new QListWidgetItem(listEntryName, _list);
 		item->setData(Qt::UserRole, listEntryName);
 	}
-	UpdateListSize();
+	SetMacroListSize();
 }
 
-QAction *MacroList::AddControl(QWidget *widget, bool addSeperator)
+void MacroList::AddControl(QWidget *widget)
 {
-	if (addSeperator) {
-		_controls->addSeparator();
-	}
-	return _controls->addWidget(widget);
+	_controlsLayout->insertWidget(_controlsLayout->count() - 1, widget);
 }
 
 int MacroList::CurrentRow()
@@ -73,13 +122,13 @@ void MacroList::MacroRemove(const QString &name)
 		delete _list->item(idx);
 		idx = FindEntry(name.toStdString());
 	}
-	UpdateListSize();
+	SetMacroListSize();
 }
 
 void MacroList::Add()
 {
 	std::string macroName;
-	bool accepted = MacroSelectionDialog::AskForMacro(macroName);
+	bool accepted = MacroSelectionDialog::AskForMacro(this, macroName);
 
 	if (!accepted || macroName.empty()) {
 		return;
@@ -93,7 +142,7 @@ void MacroList::Add()
 	auto item =
 		new QListWidgetItem(QString::fromStdString(macroName), _list);
 	item->setData(Qt::UserRole, QString::fromStdString(macroName));
-	UpdateListSize();
+	SetMacroListSize();
 	emit Added(macroName);
 }
 
@@ -105,7 +154,7 @@ void MacroList::Remove()
 		return;
 	}
 	delete item;
-	UpdateListSize();
+	SetMacroListSize();
 	emit Removed(idx);
 }
 
@@ -129,10 +178,10 @@ void MacroList::Down()
 	}
 }
 
-void MacroList::Clicked(QListWidgetItem *item)
+void MacroList::MacroItemClicked(QListWidgetItem *item)
 {
 	std::string macroName;
-	bool accepted = MacroSelectionDialog::AskForMacro(macroName);
+	bool accepted = MacroSelectionDialog::AskForMacro(this, macroName);
 
 	if (!accepted || macroName.empty()) {
 		return;
@@ -167,4 +216,10 @@ int MacroList::FindEntry(const std::string &macro)
 	return idx;
 }
 
+void MacroList::SetMacroListSize()
+{
+	SetHeightToContentHeight(_list);
+	adjustSize();
+}
+
 } // namespace advss

lib/macro/macro-list.hpp

@@ -1,15 +1,18 @@
 #pragma once
-#include "list-editor.hpp"
 #include "macro-ref.hpp"
 
+#include <QListWidget>
+#include <QPushButton>
+#include <QHBoxLayout>
+
 namespace advss {
 
-class ADVSS_EXPORT MacroList final : public ListEditor {
+class ADVSS_EXPORT MacroList : public QWidget {
 	Q_OBJECT
 public:
 	MacroList(QWidget *parent, bool allowDuplicates, bool reorder);
 	void SetContent(const std::vector<MacroRef> &);
-	QAction *AddControl(QWidget *, bool addSeperator = true);
+	void AddControl(QWidget *);
 	int CurrentRow();
 
 private slots:
@@ -19,7 +22,7 @@ private slots:
 	void Remove();
 	void Up();
 	void Down();
-	void Clicked(QListWidgetItem *);
+	void MacroItemClicked(QListWidgetItem *);
 
 signals:
 	void Added(const std::string &);
@@ -30,8 +33,16 @@ signals:
 
 private:
 	int FindEntry(const std::string &macro);
+	void SetMacroListSize();
 
+	QListWidget *_list;
+	QPushButton *_add;
+	QPushButton *_remove;
+	QPushButton *_up;
+	QPushButton *_down;
+	QHBoxLayout *_controlsLayout;
 	const bool _allowDuplicates;
+	const bool _reorder;
 };
 
 } // namespace advss

lib/macro/macro-properties.cpp

@@ -1,8 +1,7 @@
-#include "macro-settings.hpp"
+#include "macro-properties.hpp"
 #include "layout-helpers.hpp"
-#include "macro.hpp"
 #include "obs-module-helper.hpp"
-#include "plugin-state-helpers.hpp"
+#include "macro.hpp"
 
 #include <QDialogButtonBox>
 #include <QScrollArea>
@@ -11,9 +10,9 @@
 
 namespace advss {
 
-static GlobalMacroSettings macroSettings;
+static MacroProperties macroProperties;
 
-void GlobalMacroSettings::Save(obs_data_t *obj) const
+void MacroProperties::Save(obs_data_t *obj) const
 {
 	auto data = obs_data_create();
 	obs_data_set_bool(data, "highlightExecuted", _highlightExecuted);
@@ -21,20 +20,13 @@ void GlobalMacroSettings::Save(obs_data_t *obj) const
 	obs_data_set_bool(data, "highlightActions", _highlightActions);
 	obs_data_set_bool(data, "newMacroRegisterHotkey",
 			  _newMacroRegisterHotkeys);
-	obs_data_set_bool(data, "newMacroUseShortCircuitEvaluation",
-			  _newMacroUseShortCircuitEvaluation);
-	obs_data_set_bool(data, "saveSettingsOnMacroChange",
-			  _saveSettingsOnMacroChange);
-	obs_data_set_obj(obj, "macroSettings", data);
+	obs_data_set_obj(obj, "macroProperties", data);
 	obs_data_release(data);
 }
 
-void GlobalMacroSettings::Load(obs_data_t *obj)
+void MacroProperties::Load(obs_data_t *obj)
 {
-	auto data = obs_data_get_obj(
-		obj, obs_data_has_user_value(obj, "macroProperties")
-			     ? "macroProperties"
-			     : "macroSettings");
+	auto data = obs_data_get_obj(obj, "macroProperties");
 	obs_data_set_default_bool(data, "highlightExecuted", true);
 	obs_data_set_default_bool(data, "highlightConditions", true);
 	obs_data_set_default_bool(data, "highlightActions", true);
@@ -43,47 +35,27 @@ void GlobalMacroSettings::Load(obs_data_t *obj)
 	_highlightActions = obs_data_get_bool(data, "highlightActions");
 	_newMacroRegisterHotkeys =
 		obs_data_get_bool(data, "newMacroRegisterHotkey");
-	_newMacroUseShortCircuitEvaluation =
-		obs_data_get_bool(data, "newMacroUseShortCircuitEvaluation");
-	_saveSettingsOnMacroChange =
-		obs_data_has_user_value(data, "saveSettingsOnMacroChange")
-			? obs_data_get_bool(data, "saveSettingsOnMacroChange")
-			: true;
 	obs_data_release(data);
 }
 
-MacroSettingsDialog::MacroSettingsDialog(QWidget *parent,
-					 const GlobalMacroSettings &settings,
-					 Macro *macro)
+MacroPropertiesDialog::MacroPropertiesDialog(QWidget *parent,
+					     const MacroProperties &prop,
+					     Macro *macro)
 	: QDialog(parent),
-	  _highlightExecutedMacros(new QCheckBox(obs_module_text(
+	  _executed(new QCheckBox(obs_module_text(
 		  "AdvSceneSwitcher.macroTab.highlightExecutedMacros"))),
-	  _highlightConditions(new QCheckBox(obs_module_text(
+	  _conditions(new QCheckBox(obs_module_text(
 		  "AdvSceneSwitcher.macroTab.highlightTrueConditions"))),
-	  _highlightActions(new QCheckBox(obs_module_text(
+	  _actions(new QCheckBox(obs_module_text(
 		  "AdvSceneSwitcher.macroTab.highlightPerformedActions"))),
 	  _newMacroRegisterHotkeys(new QCheckBox(obs_module_text(
 		  "AdvSceneSwitcher.macroTab.newMacroRegisterHotkey"))),
-	  _newMacroUseShortCircuitEvaluation(new QCheckBox(obs_module_text(
-		  "AdvSceneSwitcher.macroTab.newMacroUseShortCircuitEvaluation"))),
-	  _saveSettingsOnMacroChange(new QCheckBox(obs_module_text(
-		  "AdvSceneSwitcher.macroTab.saveSettingsOnMacroChange"))),
 	  _currentMacroRegisterHotkeys(new QCheckBox(obs_module_text(
-		  "AdvSceneSwitcher.macroTab.currentRegisterHotkeys"))),
-	  _currentUseShortCircuitEvaluation(new QCheckBox(obs_module_text(
-		  "AdvSceneSwitcher.macroTab.currentUseShortCircuitEvaluation"))),
-	  _currentUseCustomConditionCheckInterval(new QCheckBox(obs_module_text(
-		  "AdvSceneSwitcher.macroTab.currentUseCustomConditionCheckInterval"))),
-	  _currentCustomConditionCheckInterval(
-		  new DurationSelection(this, true, 0.01)),
-	  _currentCustomConditionCheckIntervalWarning(new QLabel(obs_module_text(
-		  "AdvSceneSwitcher.macroTab.currentUseCustomConditionCheckIntervalWarning"))),
-	  _currentPauseSaveBehavior(new QComboBox(this)),
+		  "AdvSceneSwitcher.macroTab.currentDisableHotkeys"))),
 	  _currentSkipOnStartup(new QCheckBox(obs_module_text(
 		  "AdvSceneSwitcher.macroTab.currentSkipExecutionOnStartup"))),
 	  _currentStopActionsIfNotDone(new QCheckBox(obs_module_text(
 		  "AdvSceneSwitcher.macroTab.currentStopActionsIfNotDone"))),
-	  _currentInputs(new MacroInputSelection()),
 	  _currentMacroRegisterDock(new QCheckBox(obs_module_text(
 		  "AdvSceneSwitcher.macroTab.currentRegisterDock"))),
 	  _currentMacroDockAddRunButton(new QCheckBox(obs_module_text(
@@ -107,32 +79,12 @@ MacroSettingsDialog::MacroSettingsDialog(QWidget *parent,
 	setWindowModality(Qt::WindowModality::WindowModal);
 	setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
 
-	_newMacroUseShortCircuitEvaluation->setToolTip(obs_module_text(
-		"AdvSceneSwitcher.macroTab.shortCircuit.tooltip"));
-	_saveSettingsOnMacroChange->setToolTip(obs_module_text(
-		"AdvSceneSwitcher.macroTab.saveSettingsOnMacroChange.tooltip"));
-	_currentUseShortCircuitEvaluation->setToolTip(obs_module_text(
-		"AdvSceneSwitcher.macroTab.shortCircuit.tooltip"));
-
-	_currentPauseSaveBehavior->addItem(
-		obs_module_text(
-			"AdvSceneSwitcher.macroTab.pauseStateSaveBehavior.persist"),
-		static_cast<int>(Macro::PauseStateSaveBehavior::PERSIST));
-	_currentPauseSaveBehavior->addItem(
-		obs_module_text(
-			"AdvSceneSwitcher.macroTab.pauseStateSaveBehavior.pause"),
-		static_cast<int>(Macro::PauseStateSaveBehavior::PAUSE));
-	_currentPauseSaveBehavior->addItem(
-		obs_module_text(
-			"AdvSceneSwitcher.macroTab.pauseStateSaveBehavior.unpause"),
-		static_cast<int>(Macro::PauseStateSaveBehavior::UNPAUSE));
-
 	auto highlightOptions = new QGroupBox(
 		obs_module_text("AdvSceneSwitcher.macroTab.highlightSettings"));
 	auto highlightLayout = new QVBoxLayout;
-	highlightLayout->addWidget(_highlightExecutedMacros);
-	highlightLayout->addWidget(_highlightConditions);
-	highlightLayout->addWidget(_highlightActions);
+	highlightLayout->addWidget(_executed);
+	highlightLayout->addWidget(_conditions);
+	highlightLayout->addWidget(_actions);
 	highlightOptions->setLayout(highlightLayout);
 
 	auto hotkeyOptions = new QGroupBox(
@@ -145,41 +97,10 @@ MacroSettingsDialog::MacroSettingsDialog(QWidget *parent,
 	auto generalOptions = new QGroupBox(
 		obs_module_text("AdvSceneSwitcher.macroTab.generalSettings"));
 	auto generalLayout = new QVBoxLayout;
-	generalLayout->addWidget(_saveSettingsOnMacroChange);
 	generalLayout->addWidget(_currentSkipOnStartup);
 	generalLayout->addWidget(_currentStopActionsIfNotDone);
-	generalLayout->addWidget(_currentUseShortCircuitEvaluation);
-	generalLayout->addWidget(_newMacroUseShortCircuitEvaluation);
-
-	auto durationLayout = new QHBoxLayout();
-	durationLayout->addWidget(_currentUseCustomConditionCheckInterval);
-	durationLayout->addWidget(_currentCustomConditionCheckInterval);
-	durationLayout->addStretch();
-	auto customConditionIntervalLayout = new QVBoxLayout();
-	customConditionIntervalLayout->addLayout(durationLayout);
-	customConditionIntervalLayout->addWidget(
-		_currentCustomConditionCheckIntervalWarning);
-	generalLayout->addLayout(customConditionIntervalLayout);
-
-	auto pauseStateSaveBehavorLayout = new QHBoxLayout();
-	pauseStateSaveBehavorLayout->addWidget(new QLabel(obs_module_text(
-		"AdvSceneSwitcher.macroTab.pauseStateSaveBehavior")));
-	pauseStateSaveBehavorLayout->addWidget(_currentPauseSaveBehavior);
-	pauseStateSaveBehavorLayout->addStretch();
-	generalLayout->addLayout(pauseStateSaveBehavorLayout);
-
 	generalOptions->setLayout(generalLayout);
 
-	auto inputOptions = new QGroupBox(
-		obs_module_text("AdvSceneSwitcher.macroTab.inputSettings"));
-	auto description = new QLabel(obs_module_text(
-		"AdvSceneSwitcher.macroTab.inputSettings.description"));
-	description->setWordWrap(true);
-	auto inputLayout = new QVBoxLayout();
-	inputLayout->addWidget(description);
-	inputLayout->addWidget(_currentInputs);
-	inputOptions->setLayout(inputLayout);
-
 	int row = 0;
 	_dockLayout->addWidget(_currentMacroRegisterDock, row, 1, 1, 2);
 	row++;
@@ -236,20 +157,13 @@ MacroSettingsDialog::MacroSettingsDialog(QWidget *parent,
 	connect(buttonbox, &QDialogButtonBox::rejected, this, &QDialog::reject);
 
 	connect(_currentMacroRegisterDock, &QCheckBox::stateChanged, this,
-		&MacroSettingsDialog::DockEnableChanged);
+		&MacroPropertiesDialog::DockEnableChanged);
 	connect(_currentMacroDockAddRunButton, &QCheckBox::stateChanged, this,
-		&MacroSettingsDialog::RunButtonEnableChanged);
+		&MacroPropertiesDialog::RunButtonEnableChanged);
 	connect(_currentMacroDockAddPauseButton, &QCheckBox::stateChanged, this,
-		&MacroSettingsDialog::PauseButtonEnableChanged);
+		&MacroPropertiesDialog::PauseButtonEnableChanged);
 	connect(_currentMacroDockAddStatusLabel, &QCheckBox::stateChanged, this,
-		&MacroSettingsDialog::StatusLabelEnableChanged);
-	connect(_currentUseCustomConditionCheckInterval,
-		&QCheckBox::stateChanged, this, [this](int state) {
-			_currentCustomConditionCheckInterval->setEnabled(state);
-		});
-	connect(_currentCustomConditionCheckInterval,
-		&DurationSelection::DurationChanged, this,
-		[this]() { SetCustomConditionIntervalWarningVisibility(); });
+		&MacroPropertiesDialog::StatusLabelEnableChanged);
 
 	auto scrollArea = new QScrollArea(this);
 	scrollArea->setWidgetResizable(true);
@@ -260,7 +174,6 @@ MacroSettingsDialog::MacroSettingsDialog(QWidget *parent,
 	layout->addWidget(highlightOptions);
 	layout->addWidget(hotkeyOptions);
 	layout->addWidget(generalOptions);
-	layout->addWidget(inputOptions);
 	layout->addWidget(_dockOptions);
 	layout->setContentsMargins(0, 0, 0, 0);
 	scrollArea->setWidget(contentWidget);
@@ -270,46 +183,21 @@ MacroSettingsDialog::MacroSettingsDialog(QWidget *parent,
 	dialogLayout->addWidget(buttonbox);
 	setLayout(dialogLayout);
 
-	_highlightExecutedMacros->setChecked(settings._highlightExecuted);
-	_highlightConditions->setChecked(settings._highlightConditions);
-	_highlightActions->setChecked(settings._highlightActions);
-	_newMacroRegisterHotkeys->setChecked(settings._newMacroRegisterHotkeys);
-	_newMacroUseShortCircuitEvaluation->setChecked(
-		settings._newMacroUseShortCircuitEvaluation);
-	_saveSettingsOnMacroChange->setChecked(
-		settings._saveSettingsOnMacroChange);
+	_executed->setChecked(prop._highlightExecuted);
+	_conditions->setChecked(prop._highlightConditions);
+	_actions->setChecked(prop._highlightActions);
+	_newMacroRegisterHotkeys->setChecked(prop._newMacroRegisterHotkeys);
 
 	if (!macro || macro->IsGroup()) {
 		hotkeyOptions->hide();
-
-		// General group
-		_currentSkipOnStartup->hide();
-		_currentStopActionsIfNotDone->hide();
-		_currentUseShortCircuitEvaluation->hide();
-		SetLayoutVisible(customConditionIntervalLayout, false);
-		SetLayoutVisible(pauseStateSaveBehavorLayout, false);
-
-		inputOptions->hide();
+		generalOptions->hide();
 		_dockOptions->hide();
 		return;
 	}
 
 	_currentMacroRegisterHotkeys->setChecked(macro->PauseHotkeysEnabled());
-	_currentUseShortCircuitEvaluation->setChecked(
-		macro->ShortCircuitEvaluationEnabled());
-	_currentUseCustomConditionCheckInterval->setChecked(
-		macro->CustomConditionCheckIntervalEnabled());
-	_currentCustomConditionCheckInterval->SetDuration(
-		macro->GetCustomConditionCheckInterval());
-	_currentCustomConditionCheckInterval->setEnabled(
-		macro->CustomConditionCheckIntervalEnabled());
-	SetCustomConditionIntervalWarningVisibility();
-	_currentPauseSaveBehavior->setCurrentIndex(
-		_currentPauseSaveBehavior->findData(
-			static_cast<int>(macro->GetPauseStateSaveBehavior())));
 	_currentSkipOnStartup->setChecked(macro->SkipExecOnStart());
 	_currentStopActionsIfNotDone->setChecked(macro->StopActionsIfNotDone());
-	_currentInputs->SetInputs(macro->GetInputVariables());
 	const bool dockEnabled = macro->DockEnabled();
 	_currentMacroRegisterDock->setChecked(dockEnabled);
 	_currentMacroDockAddRunButton->setChecked(macro->DockHasRunButton());
@@ -357,7 +245,7 @@ MacroSettingsDialog::MacroSettingsDialog(QWidget *parent,
 		       20);
 }
 
-void MacroSettingsDialog::DockEnableChanged(int enabled)
+void MacroPropertiesDialog::DockEnableChanged(int enabled)
 {
 	_currentMacroDockAddRunButton->setVisible(enabled);
 	_currentMacroDockAddPauseButton->setVisible(enabled);
@@ -382,77 +270,52 @@ void MacroSettingsDialog::DockEnableChanged(int enabled)
 	Resize();
 }
 
-void MacroSettingsDialog::RunButtonEnableChanged(int enabled)
+void MacroPropertiesDialog::RunButtonEnableChanged(int enabled)
 {
 	SetGridLayoutRowVisible(_dockLayout, _runButtonTextRow, enabled);
 	Resize();
 }
 
-void MacroSettingsDialog::PauseButtonEnableChanged(int enabled)
+void MacroPropertiesDialog::PauseButtonEnableChanged(int enabled)
 {
 	SetGridLayoutRowVisible(_dockLayout, _pauseButtonTextRow, enabled);
 	SetGridLayoutRowVisible(_dockLayout, _unpauseButtonTextRow, enabled);
 	Resize();
 }
 
-void MacroSettingsDialog::StatusLabelEnableChanged(int enabled)
+void MacroPropertiesDialog::StatusLabelEnableChanged(int enabled)
 {
 	SetGridLayoutRowVisible(_dockLayout, _conditionsTrueTextRow, enabled);
 	SetGridLayoutRowVisible(_dockLayout, _conditionsFalseTextRow, enabled);
 	Resize();
 }
 
-void MacroSettingsDialog::Resize()
+void MacroPropertiesDialog::Resize()
 {
 	_dockOptions->adjustSize();
 	_dockOptions->updateGeometry();
 }
 
-void MacroSettingsDialog::SetCustomConditionIntervalWarningVisibility() const
+bool MacroPropertiesDialog::AskForSettings(QWidget *parent,
+					   MacroProperties &userInput,
+					   Macro *macro)
 {
-	_currentCustomConditionCheckIntervalWarning->setVisible(
-		_currentUseCustomConditionCheckInterval->isChecked() &&
-		GetIntervalValue() >
-			_currentCustomConditionCheckInterval->GetDuration()
-				.Milliseconds());
-}
-
-bool MacroSettingsDialog::AskForSettings(QWidget *parent,
-					 GlobalMacroSettings &userInput,
-					 Macro *macro)
-{
-	MacroSettingsDialog dialog(parent, userInput, macro);
+	MacroPropertiesDialog dialog(parent, userInput, macro);
 	dialog.setWindowTitle(obs_module_text("AdvSceneSwitcher.windowTitle"));
 	if (dialog.exec() != DialogCode::Accepted) {
 		return false;
 	}
-	userInput._highlightExecuted =
-		dialog._highlightExecutedMacros->isChecked();
-	userInput._highlightConditions =
-		dialog._highlightConditions->isChecked();
-	userInput._highlightActions = dialog._highlightActions->isChecked();
+	userInput._highlightExecuted = dialog._executed->isChecked();
+	userInput._highlightConditions = dialog._conditions->isChecked();
+	userInput._highlightActions = dialog._actions->isChecked();
 	userInput._newMacroRegisterHotkeys =
 		dialog._newMacroRegisterHotkeys->isChecked();
-	userInput._newMacroUseShortCircuitEvaluation =
-		dialog._newMacroUseShortCircuitEvaluation->isChecked();
-	userInput._saveSettingsOnMacroChange =
-		dialog._saveSettingsOnMacroChange->isChecked();
 	if (!macro) {
 		return true;
 	}
 
 	macro->EnablePauseHotkeys(
 		dialog._currentMacroRegisterHotkeys->isChecked());
-	macro->SetShortCircuitEvaluation(
-		dialog._currentUseShortCircuitEvaluation->isChecked());
-	macro->SetCustomConditionCheckIntervalEnabled(
-		dialog._currentUseCustomConditionCheckInterval->isChecked());
-	macro->SetCustomConditionCheckInterval(
-		dialog._currentCustomConditionCheckInterval->GetDuration());
-	macro->SetPauseStateSaveBehavior(
-		static_cast<Macro::PauseStateSaveBehavior>(
-			dialog._currentPauseSaveBehavior->currentData()
-				.toInt()));
 	macro->SetSkipExecOnStart(dialog._currentSkipOnStartup->isChecked());
 	macro->SetStopActionsIfNotDone(
 		dialog._currentStopActionsIfNotDone->isChecked());
@@ -474,23 +337,23 @@ bool MacroSettingsDialog::AskForSettings(QWidget *parent,
 		dialog._conditionsTrueStatusText->text().toStdString());
 	macro->SetConditionsFalseStatusText(
 		dialog._conditionsFalseStatusText->text().toStdString());
-	macro->SetInputVariables(dialog._currentInputs->GetInputs());
+
 	return true;
 }
 
-GlobalMacroSettings &GetGlobalMacroSettings()
+MacroProperties &GetGlobalMacroProperties()
 {
-	return macroSettings;
+	return macroProperties;
 }
 
-void SaveGlobalMacroSettings(obs_data_t *obj)
+void SaveGlobalMacroProperties(obs_data_t *obj)
 {
-	macroSettings.Save(obj);
+	macroProperties.Save(obj);
 }
 
-void LoadGlobalMacroSettings(obs_data_t *obj)
+void LoadGlobalMacroProperties(obs_data_t *obj)
 {
-	macroSettings.Load(obj);
+	macroProperties.Load(obj);
 }
 
 } // namespace advss

lib/macro/macro-properties.hpp

@@ -1,7 +1,5 @@
 #pragma once
 #include "variable-line-edit.hpp"
-#include "duration-control.hpp"
-#include "macro-input.hpp"
 
 #include <QWidget>
 #include <QDialog>
@@ -15,7 +13,7 @@ namespace advss {
 
 class Macro;
 
-class GlobalMacroSettings {
+class MacroProperties {
 public:
 	void Save(obs_data_t *obj) const;
 	void Load(obs_data_t *obj);
@@ -24,19 +22,16 @@ public:
 	bool _highlightConditions = false;
 	bool _highlightActions = false;
 	bool _newMacroRegisterHotkeys = true;
-	bool _newMacroUseShortCircuitEvaluation = false;
-	bool _saveSettingsOnMacroChange = true;
 };
 
 // Dialog for configuring global and individual macro specific settings
-class MacroSettingsDialog : public QDialog {
+class MacroPropertiesDialog : public QDialog {
 	Q_OBJECT
 
 public:
-	MacroSettingsDialog(QWidget *parent, const GlobalMacroSettings &,
-			    Macro *macro);
-	static bool AskForSettings(QWidget *parent,
-				   GlobalMacroSettings &userInput,
+	MacroPropertiesDialog(QWidget *parent, const MacroProperties &,
+			      Macro *macro);
+	static bool AskForSettings(QWidget *parent, MacroProperties &userInput,
 				   Macro *macro);
 private slots:
 	void DockEnableChanged(int);
@@ -46,25 +41,15 @@ private slots:
 
 private:
 	void Resize();
-	void SetCustomConditionIntervalWarningVisibility() const;
 
-	// Global macro settings
-	QCheckBox *_highlightExecutedMacros;
-	QCheckBox *_highlightConditions;
-	QCheckBox *_highlightActions;
+	QCheckBox *_executed;
+	QCheckBox *_conditions;
+	QCheckBox *_actions;
 	QCheckBox *_newMacroRegisterHotkeys;
-	QCheckBox *_newMacroUseShortCircuitEvaluation;
-	QCheckBox *_saveSettingsOnMacroChange;
 	// Current macro specific settings
 	QCheckBox *_currentMacroRegisterHotkeys;
-	QCheckBox *_currentUseShortCircuitEvaluation;
-	QCheckBox *_currentUseCustomConditionCheckInterval;
-	DurationSelection *_currentCustomConditionCheckInterval;
-	QLabel *_currentCustomConditionCheckIntervalWarning;
-	QComboBox *_currentPauseSaveBehavior;
 	QCheckBox *_currentSkipOnStartup;
 	QCheckBox *_currentStopActionsIfNotDone;
-	MacroInputSelection *_currentInputs;
 	QCheckBox *_currentMacroRegisterDock;
 	QCheckBox *_currentMacroDockAddRunButton;
 	QCheckBox *_currentMacroDockAddPauseButton;
@@ -85,8 +70,8 @@ private:
 	int _conditionsFalseTextRow = -1;
 };
 
-GlobalMacroSettings &GetGlobalMacroSettings();
-void SaveGlobalMacroSettings(obs_data_t *obj);
-void LoadGlobalMacroSettings(obs_data_t *obj);
+MacroProperties &GetGlobalMacroProperties();
+void SaveGlobalMacroProperties(obs_data_t *obj);
+void LoadGlobalMacroProperties(obs_data_t *obj);
 
 } // namespace advss

lib/macro/macro-script-handler.cpp

@@ -1,447 +0,0 @@
-#include "macro-script-handler.hpp"
-#include "macro-action-script.hpp"
-#include "macro-condition-script.hpp"
-#include "plugin-state-helpers.hpp"
-#include "log-helper.hpp"
-#include "variable.hpp"
-
-#include <obs-properties.h>
-
-namespace advss {
-
-std::mutex ScriptHandler::_mutex = {};
-std::unordered_map<std::string, ScriptSegmentType> ScriptHandler::_actions = {};
-std::unordered_map<std::string, ScriptSegmentType> ScriptHandler::_conditions =
-	{};
-
-/* Procedure handler helpers */
-
-#define RETURN_STATUS(status)                               \
-	{                                                   \
-		calldata_set_bool(data, "success", status); \
-		return;                                     \
-	}
-#define RETURN_SUCCESS() RETURN_STATUS(true);
-#define RETURN_FAILURE() RETURN_STATUS(false);
-
-static constexpr std::string_view nameParam = "name";
-static constexpr std::string_view defaultSettingsParam = "default_settings";
-static constexpr std::string_view propertiesSignalParam =
-	"properties_signal_name";
-static constexpr std::string_view triggerSignalParam = "trigger_signal_name";
-
-static std::string getRegisterScriptSegmentDeclString(const char *funcName)
-{
-	return std::string("bool ") + funcName + "(in string " +
-	       nameParam.data() + ", in ptr " + defaultSettingsParam.data() +
-	       ", out string " + propertiesSignalParam.data() +
-	       ", out string " + triggerSignalParam.data() + ")";
-}
-
-static std::string getDeregisterScriptSegmentDeclString(const char *funcName)
-{
-	return std::string("bool ") + funcName + "(in string " +
-	       nameParam.data() + ")";
-}
-
-/* Script actions */
-
-static constexpr std::string_view registerActionFuncName =
-	"advss_register_script_action";
-static constexpr std::string_view deregisterActionFuncName =
-	"advss_deregister_script_action";
-
-static const std::string registerScriptActionDeclString =
-	getRegisterScriptSegmentDeclString(registerActionFuncName.data());
-static const std::string deregisterScriptActionDeclString =
-	getDeregisterScriptSegmentDeclString(deregisterActionFuncName.data());
-
-/* Script conditions */
-
-static constexpr std::string_view registerConditionFuncName =
-	"advss_register_script_condition";
-static constexpr std::string_view deregisterConditionFuncName =
-	"advss_deregister_script_condition";
-
-static const std::string registerScriptConditionDeclString =
-	getRegisterScriptSegmentDeclString(registerConditionFuncName.data());
-static const std::string deregisterScriptConditionDeclString =
-	getDeregisterScriptSegmentDeclString(
-		deregisterConditionFuncName.data());
-
-/* Script variables */
-
-static constexpr std::string_view valueParam = "value";
-static constexpr std::string_view getVariableValueFuncName =
-	"advss_get_variable_value";
-static constexpr std::string_view setVariableValueFuncName =
-	"advss_set_variable_value";
-static const std::string getVariableValueDeclString =
-	std::string("bool ") + getVariableValueFuncName.data() + "(in string " +
-	nameParam.data() + ", out string " + valueParam.data() + ")";
-static const std::string setVariableValueDeclString =
-	std::string("bool ") + setVariableValueFuncName.data() + "(in string " +
-	nameParam.data() + ", in string " + valueParam.data() + ")";
-
-static bool setup();
-static bool setupDone = setup();
-
-static bool setup()
-{
-	proc_handler_t *ph = obs_get_proc_handler();
-	assert(ph != NULL);
-
-	proc_handler_add(ph, registerScriptActionDeclString.c_str(),
-			 &ScriptHandler::RegisterScriptAction, nullptr);
-	proc_handler_add(ph, deregisterScriptActionDeclString.c_str(),
-			 &ScriptHandler::DeregisterScriptAction, nullptr);
-	proc_handler_add(ph, registerScriptConditionDeclString.c_str(),
-			 &ScriptHandler::RegisterScriptCondition, nullptr);
-	proc_handler_add(ph, deregisterScriptConditionDeclString.c_str(),
-			 &ScriptHandler::DeregisterScriptCondition, nullptr);
-	proc_handler_add(ph, getVariableValueDeclString.c_str(),
-			 &ScriptHandler::GetVariableValue, nullptr);
-	proc_handler_add(ph, setVariableValueDeclString.c_str(),
-			 &ScriptHandler::SetVariableValue, nullptr);
-	return true;
-}
-
-static void replaceWhitespace(std::string &string)
-{
-	std::transform(string.begin(), string.end(), string.begin(), [](char c) {
-		return std::isspace(static_cast<unsigned char>(c)) ? '_' : c;
-	});
-}
-
-static std::string nameToScriptID(const std::string &name)
-{
-	return std::string("script_") + name;
-}
-
-static std::string getTriggerSignal(const std::string &name,
-				    const bool isAction)
-{
-	std::string signal = name;
-	replaceWhitespace(signal);
-	signal += "_run";
-	signal += isAction ? "_action" : "_condition";
-	return signal;
-}
-
-static std::string getCompletionSignal(const std::string &name,
-				       const bool isAction)
-{
-	auto signal = getTriggerSignal(name, isAction);
-	signal += "_complete";
-	return signal;
-}
-
-static std::string getPropertiesSignal(const std::string &name,
-				       const bool isAction)
-{
-	std::string signal = name;
-	replaceWhitespace(signal);
-	signal += isAction ? "_action" : "_condition";
-	signal += "_get_properties";
-	return signal;
-}
-
-void ScriptHandler::RegisterScriptAction(void *, calldata_t *data)
-{
-	const char *actionName;
-	if (!calldata_get_string(data, nameParam.data(), &actionName) ||
-	    strlen(actionName) == 0) {
-		blog(LOG_WARNING, "[%s] failed! \"%s\" parameter missing!",
-		     registerScriptActionDeclString.data(), nameParam.data());
-		RETURN_FAILURE();
-	}
-	obs_data_t *defaultSettingsPtr = nullptr;
-	if (!calldata_get_ptr(data, defaultSettingsParam.data(),
-			      &defaultSettingsPtr)) {
-		blog(LOG_WARNING, "[%s] failed! \"%s\" parameter missing!",
-		     registerActionFuncName.data(),
-		     defaultSettingsParam.data());
-		RETURN_FAILURE();
-	}
-	std::lock_guard<std::mutex> lock(_mutex);
-	OBSData defaultSettings(defaultSettingsPtr);
-	obs_data_release(defaultSettingsPtr);
-
-	if (_actions.count(actionName) > 0) {
-		blog(LOG_WARNING, "[%s] failed! Action \"%s\" already exists!",
-		     registerActionFuncName.data(), actionName);
-		RETURN_FAILURE();
-	}
-
-	const std::string id = nameToScriptID(actionName);
-	auto triggerSignalName = getTriggerSignal(actionName, true);
-	auto completionSignalName = getCompletionSignal(actionName, true);
-	auto propertiesSignalName = getPropertiesSignal(actionName, true);
-
-	const auto createScriptAction =
-		[id, defaultSettings, propertiesSignalName, triggerSignalName,
-		 completionSignalName](
-			Macro *m) -> std::shared_ptr<MacroAction> {
-		return std::make_shared<MacroActionScript>(
-			m, id, defaultSettings, propertiesSignalName,
-			triggerSignalName, completionSignalName);
-	};
-	if (!MacroActionFactory::Register(id, {createScriptAction,
-					       MacroSegmentScriptEdit::Create,
-					       actionName})) {
-		blog(LOG_WARNING,
-		     "[%s] failed! Action id \"%s\" already exists!",
-		     registerActionFuncName.data(), id.c_str());
-		RETURN_FAILURE();
-	}
-
-	blog(LOG_INFO, "[%s] successful for \"%s\"",
-	     registerActionFuncName.data(), actionName);
-
-	calldata_set_string(data, triggerSignalParam.data(),
-			    triggerSignalName.c_str());
-	calldata_set_string(data, propertiesSignalParam.data(),
-			    propertiesSignalName.c_str());
-	_actions.emplace(id, ScriptSegmentType(id, propertiesSignalName,
-					       triggerSignalName,
-					       completionSignalName));
-
-	RETURN_SUCCESS();
-}
-
-void ScriptHandler::DeregisterScriptAction(void *, calldata_t *data)
-{
-	const char *actionName;
-	if (!calldata_get_string(data, nameParam.data(), &actionName) ||
-	    strlen(actionName) == 0) {
-		blog(LOG_WARNING, "[%s] failed! \"%s\" parameter missing!",
-		     deregisterActionFuncName.data(), nameParam.data());
-		RETURN_FAILURE();
-	}
-
-	const std::string id = nameToScriptID(actionName);
-	std::lock_guard<std::mutex> lock(_mutex);
-
-	if (_actions.count(id) == 0) {
-		blog(LOG_WARNING,
-		     "[%s] failed! Action \"%s\" was never registered!",
-		     deregisterActionFuncName.data(), id.c_str());
-		RETURN_FAILURE();
-	}
-
-	if (!MacroActionFactory::Deregister(id)) {
-		blog(LOG_WARNING,
-		     "[%s] failed! Action id \"%s\" does not exist!",
-		     deregisterActionFuncName.data(), id.c_str());
-		RETURN_FAILURE();
-	}
-
-	auto it = _actions.find(id);
-	if (it != _actions.end()) {
-		_actions.erase(it);
-	}
-
-	RETURN_SUCCESS();
-}
-
-void ScriptHandler::RegisterScriptCondition(void *, calldata_t *data)
-{
-	const char *conditionName;
-	if (!calldata_get_string(data, nameParam.data(), &conditionName) ||
-	    strlen(conditionName) == 0) {
-		blog(LOG_WARNING, "[%s] failed! \"%s\" parameter missing!",
-		     registerScriptConditionDeclString.data(),
-		     nameParam.data());
-		RETURN_FAILURE();
-	}
-
-	obs_data_t *defaultSettingsPtr = nullptr;
-	if (!calldata_get_ptr(data, defaultSettingsParam.data(),
-			      &defaultSettingsPtr)) {
-		blog(LOG_WARNING, "[%s] failed! \"%s\" parameter missing!",
-		     registerScriptConditionDeclString.data(),
-		     defaultSettingsParam.data());
-		RETURN_FAILURE();
-	}
-
-	std::lock_guard<std::mutex> lock(_mutex);
-	OBSData defaultSettings(defaultSettingsPtr);
-	obs_data_release(defaultSettingsPtr);
-
-	if (_conditions.count(conditionName) > 0) {
-		blog(LOG_WARNING,
-		     "[%s] failed! Condition \"%s\" already exists!",
-		     registerConditionFuncName.data(), conditionName);
-		RETURN_FAILURE();
-	}
-
-	const std::string id = nameToScriptID(conditionName);
-	auto triggerSignalName = getTriggerSignal(conditionName, false);
-	auto completionSignalName = getCompletionSignal(conditionName, false);
-	auto propertiesSignalName = getPropertiesSignal(conditionName, false);
-
-	const auto createScriptCondition =
-		[id, defaultSettings, propertiesSignalName, triggerSignalName,
-		 completionSignalName](
-			Macro *m) -> std::shared_ptr<MacroCondition> {
-		return std::make_shared<MacroConditionScript>(
-			m, id, defaultSettings, propertiesSignalName,
-			triggerSignalName, completionSignalName);
-	};
-	if (!MacroConditionFactory::Register(
-		    id, {createScriptCondition, MacroSegmentScriptEdit::Create,
-			 conditionName})) {
-		blog(LOG_WARNING,
-		     "[%s] failed! Condition id \"%s\" already exists!",
-		     registerConditionFuncName.data(), id.c_str());
-		RETURN_FAILURE();
-	}
-
-	blog(LOG_INFO, "[%s] successful for \"%s\"",
-	     registerConditionFuncName.data(), conditionName);
-
-	calldata_set_string(data, triggerSignalParam.data(),
-			    triggerSignalName.c_str());
-	calldata_set_string(data, propertiesSignalParam.data(),
-			    propertiesSignalName.c_str());
-	_conditions.emplace(id, ScriptSegmentType(id, propertiesSignalName,
-						  triggerSignalName,
-						  completionSignalName));
-
-	RETURN_SUCCESS();
-}
-
-void ScriptHandler::DeregisterScriptCondition(void *, calldata_t *data)
-{
-	const char *conditionName;
-	if (!calldata_get_string(data, nameParam.data(), &conditionName) ||
-	    strlen(conditionName) == 0) {
-		blog(LOG_WARNING, "[%s] failed! \"%s\" parameter missing!",
-		     deregisterConditionFuncName.data(), nameParam.data());
-		RETURN_FAILURE();
-	}
-
-	const std::string id = nameToScriptID(conditionName);
-	std::lock_guard<std::mutex> lock(_mutex);
-
-	if (_conditions.count(id) == 0) {
-		blog(LOG_WARNING,
-		     "[%s] failed! Condition \"%s\" was never registered!",
-		     deregisterConditionFuncName.data(), id.c_str());
-		RETURN_FAILURE();
-	}
-
-	if (!MacroConditionFactory::Deregister(id)) {
-		blog(LOG_WARNING,
-		     "[%s] failed! Condition id \"%s\" does not exist!",
-		     deregisterConditionFuncName.data(), id.c_str());
-		RETURN_FAILURE();
-	}
-
-	auto it = _conditions.find(id);
-	if (it != _conditions.end()) {
-		_conditions.erase(it);
-	}
-
-	RETURN_SUCCESS();
-}
-
-void ScriptHandler::GetVariableValue(void *, calldata_t *data)
-{
-	const char *variableName;
-	if (!calldata_get_string(data, nameParam.data(), &variableName) ||
-	    strlen(variableName) == 0) {
-		blog(LOG_WARNING, "[%s] failed! \"%s\" parameter missing!",
-		     getVariableValueFuncName.data(), nameParam.data());
-		RETURN_FAILURE();
-	}
-
-	auto weakVariable = GetWeakVariableByName(variableName);
-	auto variable = weakVariable.lock();
-	if (!variable) {
-		blog(LOG_WARNING,
-		     "[%s] failed! \"%s\" variable does not exist!",
-		     getVariableValueFuncName.data(), nameParam.data());
-		RETURN_FAILURE();
-	}
-
-	calldata_set_string(data, valueParam.data(), variable->Value().c_str());
-	RETURN_SUCCESS();
-}
-
-void ScriptHandler::SetVariableValue(void *, calldata_t *data)
-{
-	const char *variableName;
-	if (!calldata_get_string(data, nameParam.data(), &variableName) ||
-	    strlen(variableName) == 0) {
-		blog(LOG_WARNING, "[%s] failed! \"%s\" parameter missing!",
-		     getVariableValueFuncName.data(), nameParam.data());
-		RETURN_FAILURE();
-	}
-	const char *variableValue;
-	if (!calldata_get_string(data, valueParam.data(), &variableValue) ||
-	    strlen(variableValue) == 0) {
-		blog(LOG_WARNING, "[%s] failed! \"%s\" parameter missing!",
-		     getVariableValueFuncName.data(), valueParam.data());
-		RETURN_FAILURE();
-	}
-
-	auto weakVariable = GetWeakVariableByName(variableName);
-	auto variable = weakVariable.lock();
-	if (!variable) {
-		blog(LOG_WARNING,
-		     "[%s] failed! \"%s\" variable does not exist!",
-		     getVariableValueFuncName.data(), nameParam.data());
-		RETURN_FAILURE();
-	}
-
-	variable->SetValue(variableValue);
-	RETURN_SUCCESS();
-}
-
-bool ScriptHandler::ActionIdIsValid(const std::string &id)
-{
-	std::lock_guard<std::mutex> lock(_mutex);
-	return _actions.count(id) > 0;
-}
-
-bool ScriptHandler::ConditionIdIsValid(const std::string &id)
-{
-	std::lock_guard<std::mutex> lock(_mutex);
-	return _conditions.count(id) > 0;
-}
-
-static std::string signalNameToTriggerSignalDecl(const std::string &name)
-{
-	return std::string("void ") + name + "()";
-}
-
-static std::string signalNameToPropertiesSignalDecl(const std::string &name)
-{
-	return std::string("void ") + name + "(in ptr " +
-	       GetPropertiesSignalParamName().data() + ")";
-}
-static std::string signalNameToCompletionSignalDecl(const std::string &name)
-{
-	return std::string("bool ") + name + "(in int " +
-	       GeCompletionIdParamName().data() + ")";
-}
-
-ScriptSegmentType::ScriptSegmentType(const std::string &id,
-				     const std::string &propertiesSignal,
-				     const std::string &triggerSignal,
-				     const std::string &completionSignal)
-	: _id(id)
-{
-	signal_handler_add(
-		obs_get_signal_handler(),
-		signalNameToPropertiesSignalDecl(propertiesSignal).c_str());
-	signal_handler_add(
-		obs_get_signal_handler(),
-		signalNameToTriggerSignalDecl(triggerSignal).c_str());
-	signal_handler_add(
-		obs_get_signal_handler(),
-		signalNameToCompletionSignalDecl(completionSignal).c_str());
-}
-
-} // namespace advss

lib/macro/macro-script-handler.hpp

@@ -1,59 +0,0 @@
-#pragma once
-#include <obs.hpp>
-#include <mutex>
-#include <string>
-#include <unordered_map>
-
-namespace advss {
-
-class ScriptSegmentType {
-public:
-	ScriptSegmentType() = delete;
-	ScriptSegmentType(const std::string &id,
-			  const std::string &propertiesSignal,
-			  const std::string &triggerSignal,
-			  const std::string &completionSignal);
-
-private:
-	std::string _id;
-};
-
-class ScriptHandler {
-public:
-	ScriptHandler() = delete;
-	static void RegisterScriptAction(void *ctx, calldata_t *data);
-	static void DeregisterScriptAction(void *ctx, calldata_t *data);
-	static void RegisterScriptCondition(void *ctx, calldata_t *data);
-	static void DeregisterScriptCondition(void *ctx, calldata_t *data);
-	static void GetVariableValue(void *ctx, calldata_t *data);
-	static void SetVariableValue(void *ctx, calldata_t *data);
-	static bool ActionIdIsValid(const std::string &id);
-	static bool ConditionIdIsValid(const std::string &id);
-
-private:
-	static std::mutex _mutex;
-	static std::unordered_map<std::string, ScriptSegmentType> _actions;
-	static std::unordered_map<std::string, ScriptSegmentType> _conditions;
-};
-
-static constexpr std::string_view GetPropertiesSignalParamName()
-{
-	return "properties";
-}
-
-static constexpr std::string_view GetActionCompletionSignalParamName()
-{
-	return "completion_signal_name";
-}
-
-static constexpr std::string_view GeCompletionIdParamName()
-{
-	return "completion_id";
-}
-
-static constexpr std::string_view GeResultSignalParamName()
-{
-	return "result";
-}
-
-} // namespace advss

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

@@ -1,126 +0,0 @@
-#include "macro-segment-copy-paste.hpp"
-#include "advanced-scene-switcher.hpp"
-#include "macro.hpp"
-
-#include <QShortcut>
-
-namespace advss {
-
-struct MacroSegmentCopyInfo {
-	enum class Type { NONE, CONDITION, ACTION, ELSE };
-	Type type = Type::NONE;
-	std::shared_ptr<MacroSegment> segment;
-};
-static MacroSegmentCopyInfo copyInfo;
-
-void AdvSceneSwitcher::CopyMacroSegment()
-{
-	copyInfo.segment.reset();
-	copyInfo.type = MacroSegmentCopyInfo::Type::NONE;
-
-	if (currentConditionIdx == -1 && currentActionIdx == -1 &&
-	    currentElseActionIdx == -1) {
-		return;
-	}
-
-	auto macro = GetSelectedMacro();
-	if (!macro) {
-		return;
-	}
-
-	if (currentConditionIdx != -1) {
-		copyInfo.type = MacroSegmentCopyInfo::Type::CONDITION;
-		copyInfo.segment = macro->Conditions().at(currentConditionIdx);
-	} else if (currentActionIdx != -1) {
-		copyInfo.type = MacroSegmentCopyInfo::Type::ACTION;
-		copyInfo.segment = macro->Actions().at(currentActionIdx);
-	} else if (currentElseActionIdx != -1) {
-		copyInfo.type = MacroSegmentCopyInfo::Type::ELSE;
-		copyInfo.segment =
-			macro->ElseActions().at(currentElseActionIdx);
-	} else {
-		assert(false);
-	}
-}
-
-void AdvSceneSwitcher::PasteMacroSegment()
-{
-	if (copyInfo.type == MacroSegmentCopyInfo::Type::NONE) {
-		return;
-	}
-
-	auto macro = GetSelectedMacro();
-	if (!macro || !copyInfo.segment) {
-		return;
-	}
-
-	OBSDataAutoRelease data = obs_data_create();
-	copyInfo.segment->Save(data);
-
-	switch (copyInfo.type) {
-	case MacroSegmentCopyInfo::Type::CONDITION: {
-		const auto condition = std::static_pointer_cast<MacroCondition>(
-			copyInfo.segment);
-		auto logic = condition->GetLogicType();
-		if (logic > Logic::Type::ROOT_LAST &&
-		    macro->Conditions().empty()) {
-			logic = Logic::Type::ROOT_NONE;
-		}
-		if (logic < Logic::Type::ROOT_LAST &&
-		    !macro->Conditions().empty()) {
-			logic = Logic::Type::OR;
-		}
-		AddMacroCondition(macro.get(), macro->Conditions().size(),
-				  copyInfo.segment->GetId(), data.Get(), logic);
-		break;
-	}
-	case MacroSegmentCopyInfo::Type::ACTION:
-		AddMacroAction(macro.get(), macro->Actions().size(),
-			       copyInfo.segment->GetId(), data.Get());
-		break;
-	case MacroSegmentCopyInfo::Type::ELSE:
-		AddMacroElseAction(macro.get(), macro->ElseActions().size(),
-				   copyInfo.segment->GetId(), data.Get());
-		break;
-	default:
-		break;
-	}
-}
-
-bool MacroSegmentIsInClipboard()
-{
-	return copyInfo.type != MacroSegmentCopyInfo::Type::NONE;
-}
-
-bool MacroActionIsInClipboard()
-{
-	return copyInfo.type == MacroSegmentCopyInfo::Type::ACTION ||
-	       copyInfo.type == MacroSegmentCopyInfo::Type::ELSE;
-}
-
-void SetCopySegmentTargetActionType(bool setToElseAction)
-{
-	if (copyInfo.type == MacroSegmentCopyInfo::Type::ACTION &&
-	    setToElseAction) {
-		copyInfo.type = MacroSegmentCopyInfo::Type::ELSE;
-		return;
-	}
-
-	if (copyInfo.type == MacroSegmentCopyInfo::Type::ELSE &&
-	    !setToElseAction) {
-		copyInfo.type = MacroSegmentCopyInfo::Type::ACTION;
-		return;
-	}
-}
-
-void SetupSegmentCopyPasteShortcutHandlers(AdvSceneSwitcher *window)
-{
-	auto copyShortcut = new QShortcut(QKeySequence("Ctrl+C"), window);
-	QWidget::connect(copyShortcut, &QShortcut::activated, window,
-			 &AdvSceneSwitcher::CopyMacroSegment);
-	auto pasteShortcut = new QShortcut(QKeySequence("Ctrl+V"), window);
-	QWidget::connect(pasteShortcut, &QShortcut::activated, window,
-			 &AdvSceneSwitcher::PasteMacroSegment);
-}
-
-} // namespace advss

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

@@ -1,10 +0,0 @@
-namespace advss {
-
-class AdvSceneSwitcher;
-
-bool MacroSegmentIsInClipboard();
-bool MacroActionIsInClipboard();
-void SetCopySegmentTargetActionType(bool setToElseAction);
-void SetupSegmentCopyPasteShortcutHandlers(AdvSceneSwitcher *window);
-
-} // namespace advss

lib/macro/macro-segment-list.cpp

@@ -59,7 +59,7 @@ static bool posIsInScrollbar(const QScrollBar *scrollbar, const QPoint &pos)
 	return globalGeo.contains(pos);
 }
 
-int MacroSegmentList::GetDragIndex(const QPoint &pos) const
+int MacroSegmentList::GetDragIndex(const QPoint &pos)
 {
 	// Don't drag widget when interacting with the scrollbars
 	if (posIsInScrollbar(horizontalScrollBar(), mapTo(this, pos)) ||
@@ -88,12 +88,12 @@ int MacroSegmentList::GetDragIndex(const QPoint &pos) const
 	return -1;
 }
 
-void MacroSegmentList::SetHelpMsg(const QString &msg) const
+void MacroSegmentList::SetHelpMsg(const QString &msg)
 {
 	_helpMsg->setText(msg);
 }
 
-void MacroSegmentList::SetHelpMsgVisible(bool visible) const
+void MacroSegmentList::SetHelpMsgVisible(bool visible)
 {
 	_helpMsg->setVisible(visible);
 }
@@ -110,12 +110,12 @@ void MacroSegmentList::Add(QWidget *widget)
 	_contentLayout->addWidget(widget);
 }
 
-void MacroSegmentList::Remove(int idx) const
+void MacroSegmentList::Remove(int idx)
 {
 	DeleteLayoutItemWidget(_contentLayout->takeAt(idx));
 }
 
-void MacroSegmentList::Clear(int idx) const
+void MacroSegmentList::Clear(int idx)
 {
 	ClearLayout(_contentLayout, idx);
 }
@@ -130,10 +130,10 @@ void MacroSegmentList::Highlight(int idx, QColor color)
 	if (!widget) {
 		return;
 	}
-	HighlightWidget(widget, color, QColor(0, 0, 0, 0), true);
+	PulseWidget(widget, color, QColor(0, 0, 0, 0), true);
 }
 
-void MacroSegmentList::SetCollapsed(bool collapse) const
+void MacroSegmentList::SetCollapsed(bool collapse)
 {
 	QLayoutItem *item = nullptr;
 	for (int i = 0; i < _contentLayout->count(); i++) {
@@ -145,7 +145,7 @@ void MacroSegmentList::SetCollapsed(bool collapse) const
 	}
 }
 
-void MacroSegmentList::SetSelection(int idx) const
+void MacroSegmentList::SetSelection(int idx)
 {
 	for (int i = 0; i < _contentLayout->count(); ++i) {
 		auto widget = static_cast<MacroSegmentEdit *>(
@@ -176,8 +176,7 @@ bool MacroSegmentList::eventFilter(QObject *object, QEvent *event)
 
 void MacroSegmentList::mousePressEvent(QMouseEvent *event)
 {
-	if (event->button() == Qt::LeftButton ||
-	    event->button() == Qt::RightButton) {
+	if (event->button() == Qt::LeftButton) {
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 		_dragPosition = GetDragIndex(event->globalPos());
 #else
@@ -235,7 +234,7 @@ void MacroSegmentList::dragEnterEvent(QDragEnterEvent *event)
 	}
 }
 
-MacroSegmentEdit *MacroSegmentList::WidgetAt(int idx) const
+MacroSegmentEdit *MacroSegmentList::WidgetAt(int idx)
 {
 	if (idx < 0 || idx >= _contentLayout->count()) {
 		return nullptr;
@@ -247,16 +246,11 @@ MacroSegmentEdit *MacroSegmentList::WidgetAt(int idx) const
 	return static_cast<MacroSegmentEdit *>(item->widget());
 }
 
-MacroSegmentEdit *MacroSegmentList::WidgetAt(const QPoint &pos) const
+MacroSegmentEdit *MacroSegmentList::WidgetAt(const QPoint &pos)
 {
 	return WidgetAt(GetSegmentIndexFromPos(mapToGlobal(pos)));
 }
 
-int MacroSegmentList::IndexAt(const QPoint &pos) const
-{
-	return GetSegmentIndexFromPos(mapToGlobal(pos));
-}
-
 void MacroSegmentList::HideLastDropLine()
 {
 	if (_dropLineIdx >= 0 && _dropLineIdx < _contentLayout->count()) {
@@ -308,7 +302,7 @@ void MacroSegmentList::dragMoveEvent(QDragMoveEvent *event)
 	CheckDropLine(_dragCursorPos);
 }
 
-QRect MacroSegmentList::GetContentItemRectWithPadding(int idx) const
+QRect MacroSegmentList::GetContentItemRectWithPadding(int idx)
 {
 	auto item = _contentLayout->itemAt(idx);
 	if (!item) {
@@ -330,7 +324,7 @@ QRect MacroSegmentList::GetContentItemRectWithPadding(int idx) const
 	return rect;
 }
 
-int MacroSegmentList::GetSegmentIndexFromPos(const QPoint &pos) const
+int MacroSegmentList::GetSegmentIndexFromPos(const QPoint &pos)
 {
 	int idx = -1;
 	for (int i = 0; i < _contentLayout->count(); ++i) {
@@ -342,7 +336,7 @@ int MacroSegmentList::GetSegmentIndexFromPos(const QPoint &pos) const
 	return idx;
 }
 
-void MacroSegmentList::CheckScroll() const
+void MacroSegmentList::CheckScroll()
 {
 	while (_autoScroll) {
 		const int scrollTrigger = 15;
@@ -412,14 +406,14 @@ void MacroSegmentList::CheckDropLine(const QPoint &pos)
 	}
 }
 
-bool MacroSegmentList::IsInListArea(const QPoint &pos) const
+bool MacroSegmentList::IsInListArea(const QPoint &pos)
 {
 	const QRect layoutRect(mapToGlobal(_layout->contentsRect().topLeft()),
 			       _layout->contentsRect().size());
 	return layoutRect.contains(pos);
 }
 
-int MacroSegmentList::GetDropIndex(const QPoint &pos) const
+int MacroSegmentList::GetDropIndex(const QPoint &pos)
 {
 	int idx = GetSegmentIndexFromPos(pos);
 	if (idx == _dragPosition) {

lib/macro/macro-segment-list.hpp

@@ -15,19 +15,18 @@ class MacroSegmentList : public QScrollArea {
 public:
 	MacroSegmentList(QWidget *parent = nullptr);
 	virtual ~MacroSegmentList();
-	void SetHelpMsg(const QString &msg) const;
-	void SetHelpMsgVisible(bool visible) const;
-	MacroSegmentEdit *WidgetAt(int idx) const;
-	MacroSegmentEdit *WidgetAt(const QPoint &) const;
-	int IndexAt(const QPoint &) const;
+	void SetHelpMsg(const QString &msg);
+	void SetHelpMsgVisible(bool visible);
+	MacroSegmentEdit *WidgetAt(int idx);
+	MacroSegmentEdit *WidgetAt(const QPoint &);
 	void Insert(int idx, MacroSegmentEdit *widget);
 	void Add(QWidget *widget);
-	void Remove(int idx) const;
-	void Clear(int idx = 0) const; // Clear all elements >= idx
+	void Remove(int idx);
+	void Clear(int idx = 0); // Clear all elements >= idx
 	void Highlight(int idx, QColor color = QColor(Qt::green));
-	void SetCollapsed(bool) const;
-	void SetSelection(int idx) const;
-	QVBoxLayout *ContentLayout() const { return _contentLayout; }
+	void SetCollapsed(bool);
+	void SetSelection(int idx);
+	QVBoxLayout *ContentLayout() { return _contentLayout; }
 
 signals:
 	void SelectionChanged(int idx);
@@ -44,13 +43,13 @@ protected:
 	void dropEvent(QDropEvent *event);
 
 private:
-	int GetSegmentIndexFromPos(const QPoint &) const;
-	int GetDragIndex(const QPoint &) const;
-	int GetDropIndex(const QPoint &) const;
-	void CheckScroll() const;
+	int GetDragIndex(const QPoint &);
+	int GetDropIndex(const QPoint &);
+	int GetSegmentIndexFromPos(const QPoint &);
+	void CheckScroll();
 	void CheckDropLine(const QPoint &);
-	bool IsInListArea(const QPoint &) const;
-	QRect GetContentItemRectWithPadding(int idx) const;
+	bool IsInListArea(const QPoint &);
+	QRect GetContentItemRectWithPadding(int idx);
 	void HideLastDropLine();
 
 	int _dragPosition = -1;

lib/macro/macro-segment-script.cpp

@@ -1,219 +0,0 @@
-#include "macro-segment-script.hpp"
-#include "layout-helpers.hpp"
-#include "macro-action.hpp"
-#include "macro-condition.hpp"
-#include "macro-helpers.hpp"
-#include "macro-script-handler.hpp"
-#include "obs-module-helper.hpp"
-#include "properties-view.hpp"
-#include "sync-helpers.hpp"
-
-namespace advss {
-
-static std::atomic_int completionIdCounter = 0;
-
-MacroSegmentScript::MacroSegmentScript(obs_data_t *defaultSettings,
-				       const std::string &propertiesSignalName,
-				       const std::string &triggerSignal,
-				       const std::string &completionSignal)
-	: _settings(obs_data_get_defaults(defaultSettings)),
-	  _propertiesSignal(propertiesSignalName),
-	  _triggerSignal(triggerSignal),
-	  _completionSignal(completionSignal)
-{
-	signal_handler_connect(obs_get_signal_handler(),
-			       completionSignal.c_str(),
-			       &MacroSegmentScript::CompletionSignalReceived,
-			       this);
-}
-
-MacroSegmentScript::MacroSegmentScript(const MacroSegmentScript &other)
-	: _settings(obs_data_create()),
-	  _propertiesSignal(other._propertiesSignal),
-	  _triggerSignal(other._triggerSignal),
-	  _completionSignal(other._completionSignal)
-{
-	signal_handler_connect(obs_get_signal_handler(),
-			       _completionSignal.c_str(),
-			       &MacroSegmentScript::CompletionSignalReceived,
-			       this);
-	obs_data_apply(_settings.Get(), other._settings.Get());
-}
-
-bool MacroSegmentScript::Save(obs_data_t *obj) const
-{
-	obs_data_set_obj(obj, "settings", _settings.Get());
-	_timeout.Save(obj);
-	return true;
-}
-
-bool MacroSegmentScript::Load(obs_data_t *obj)
-{
-	OBSDataAutoRelease settings = obs_data_get_obj(obj, "settings");
-	obs_data_apply(_settings.Get(), settings);
-	_timeout.Load(obj);
-	return true;
-}
-
-obs_properties_t *MacroSegmentScript::GetProperties() const
-{
-	auto data = calldata_create();
-	signal_handler_signal(obs_get_signal_handler(),
-			      _propertiesSignal.c_str(), data);
-	obs_properties_t *properties = nullptr;
-	if (!calldata_get_ptr(data, GetPropertiesSignalParamName().data(),
-			      &properties)) {
-		calldata_destroy(data);
-		return nullptr;
-	}
-	calldata_destroy(data);
-	return properties;
-}
-
-void MacroSegmentScript::UpdateSettings(obs_data_t *newSettings) const
-{
-	obs_data_clear(_settings.Get());
-	obs_data_apply(_settings.Get(), newSettings);
-}
-
-bool MacroSegmentScript::SendTriggerSignal()
-{
-	_completionId = ++completionIdCounter;
-	_triggerIsComplete = false;
-	_triggerResult = false;
-
-	auto data = calldata_create();
-	calldata_set_string(data, GetActionCompletionSignalParamName().data(),
-			    _completionSignal.c_str());
-	calldata_set_int(data, GeCompletionIdParamName().data(), _completionId);
-	calldata_set_string(data, "settings", obs_data_get_json(GetSettings()));
-	signal_handler_signal(obs_get_signal_handler(), _triggerSignal.c_str(),
-			      data);
-	calldata_destroy(data);
-
-	SetMacroAbortWait(false);
-	WaitForCompletion();
-
-	return _triggerResult;
-}
-
-void MacroSegmentScript::CompletionSignalReceived(void *param, calldata_t *data)
-{
-	auto segment = static_cast<MacroSegmentScript *>(param);
-	long long int id;
-	if (!calldata_get_int(data, GeCompletionIdParamName().data(), &id)) {
-		blog(LOG_WARNING,
-		     "received completion signal without \"%s\" parameter",
-		     GeCompletionIdParamName().data());
-		return;
-	}
-	bool result;
-	if (!calldata_get_bool(data, GeResultSignalParamName().data(),
-			       &result)) {
-		blog(LOG_WARNING,
-		     "received completion signal without \"%s\" parameter",
-		     GeResultSignalParamName().data());
-		return;
-	}
-	if (id != segment->_completionId) {
-		return;
-	}
-	segment->_triggerIsComplete = true;
-	segment->_triggerResult = result;
-}
-
-obs_properties_t *MacroSegmentScriptEdit::GetProperties(void *obj)
-{
-	auto segmentEdit = reinterpret_cast<MacroSegmentScriptEdit *>(obj);
-	if (!segmentEdit) {
-		return nullptr;
-	}
-	return segmentEdit->_entryData->GetProperties();
-}
-
-void MacroSegmentScriptEdit::UpdateSettings(void *obj, obs_data_t *settings)
-{
-	auto segmentEdit = reinterpret_cast<MacroSegmentScriptEdit *>(obj);
-	if (!segmentEdit || segmentEdit->_loading || !segmentEdit->_entryData) {
-		return;
-	}
-	auto lock = LockContext();
-	segmentEdit->_entryData->UpdateSettings(settings);
-}
-
-MacroSegmentScriptEdit::MacroSegmentScriptEdit(
-	QWidget *parent, std::shared_ptr<MacroSegmentScript> entryData)
-	: QWidget(parent),
-	  _timeout(new DurationSelection(this))
-{
-	QWidget::connect(_timeout, &DurationSelection::DurationChanged, this,
-			 &MacroSegmentScriptEdit::TimeoutChanged);
-
-	auto timeoutLayout = new QHBoxLayout();
-	PlaceWidgets(obs_module_text("AdvSceneSwitcher.script.timeout"),
-		     timeoutLayout, {{"{{timeout}}", _timeout}});
-
-	auto layout = new QVBoxLayout();
-
-	auto properties = entryData->GetProperties();
-	if (!!properties) {
-		obs_properties_destroy(properties);
-
-		// We need a separate OBSData object here as we can't risk
-		// entryData->_settings being modified while it is currently used
-		OBSDataAutoRelease data = obs_data_create();
-		obs_data_apply(data, entryData->GetSettings());
-
-#if LIBOBS_API_VER >= MAKE_SEMANTIC_VERSION(30, 0, 0)
-		auto propertiesView =
-			new OBSPropertiesView(data.Get(), this, GetProperties,
-					      nullptr, UpdateSettings);
-		layout->addWidget(propertiesView);
-		connect(propertiesView, &OBSPropertiesView::PropertiesResized,
-			this, [this]() {
-				adjustSize();
-				updateGeometry();
-			});
-#else
-		layout->addWidget(new QLabel(
-			"Displaying script properties not supported when compiled for OBS 29!"));
-#endif
-	}
-
-	layout->addLayout(timeoutLayout);
-	setLayout(layout);
-
-	_entryData = entryData;
-	UpdateEntryData();
-	_loading = false;
-
-	adjustSize();
-	updateGeometry();
-}
-
-void MacroSegmentScriptEdit::UpdateEntryData()
-{
-	_timeout->SetDuration(_entryData->_timeout);
-}
-
-QWidget *MacroSegmentScriptEdit::Create(QWidget *parent,
-					std::shared_ptr<MacroAction> segment)
-{
-	return new MacroSegmentScriptEdit(
-		parent, std::dynamic_pointer_cast<MacroSegmentScript>(segment));
-}
-
-QWidget *MacroSegmentScriptEdit::Create(QWidget *parent,
-					std::shared_ptr<MacroCondition> segment)
-{
-	return new MacroSegmentScriptEdit(
-		parent, std::dynamic_pointer_cast<MacroSegmentScript>(segment));
-}
-
-void MacroSegmentScriptEdit::TimeoutChanged(const Duration &timeout)
-{
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_timeout = timeout;
-}
-
-} // namespace advss

lib/macro/macro-segment-script.hpp

@@ -1,78 +0,0 @@
-#pragma once
-#include "duration-control.hpp"
-#include "macro-script-handler.hpp"
-
-#include <atomic>
-#include <obs-data.h>
-
-namespace advss {
-
-class Macro;
-class MacroAction;
-class MacroCondition;
-
-class MacroSegmentScript {
-public:
-	MacroSegmentScript(obs_data_t *defaultSettings,
-			   const std::string &propertiesSignalName,
-			   const std::string &triggerSignal,
-			   const std::string &completionSignal);
-	MacroSegmentScript(const advss::MacroSegmentScript &);
-
-protected:
-	bool Save(obs_data_t *obj) const;
-	bool Load(obs_data_t *obj);
-
-	obs_properties_t *GetProperties() const;
-	OBSData GetSettings() const { return _settings.Get(); }
-	void UpdateSettings(obs_data_t *newSettings) const;
-
-	bool SendTriggerSignal();
-	double GetTimeoutSeconds() const { return _timeout.Seconds(); };
-	bool TriggerIsCompleted() const { return _triggerIsComplete; }
-
-private:
-	virtual void WaitForCompletion() const = 0;
-	static void CompletionSignalReceived(void *param, calldata_t *data);
-
-	OBSDataAutoRelease _settings;
-	std::string _propertiesSignal = "";
-
-	std::string _triggerSignal = "";
-	std::string _completionSignal = "";
-	std::atomic_bool _triggerIsComplete = {false};
-	bool _triggerResult = false;
-	int64_t _completionId = 0;
-
-	Duration _timeout = Duration(10.0);
-
-	friend class MacroSegmentScriptEdit;
-};
-
-class MacroSegmentScriptEdit : public QWidget {
-	Q_OBJECT
-
-public:
-	MacroSegmentScriptEdit(
-		QWidget *parent,
-		std::shared_ptr<MacroSegmentScript> entryData = nullptr);
-	void UpdateEntryData();
-	static QWidget *Create(QWidget *parent,
-			       std::shared_ptr<MacroAction> segment);
-	static QWidget *Create(QWidget *parent,
-			       std::shared_ptr<MacroCondition> segment);
-
-private slots:
-	void TimeoutChanged(const Duration &);
-
-private:
-	static obs_properties_t *GetProperties(void *obj);
-	static void UpdateSettings(void *obj, obs_data_t *settings);
-
-	DurationSelection *_timeout;
-
-	std::shared_ptr<MacroSegmentScript> _entryData;
-	bool _loading = true;
-};
-
-} // namespace advss

lib/macro/macro-segment-selection.cpp

@@ -70,8 +70,7 @@ void MacroSegmentSelection::MacroSegmentOrderChanged()
 	SetupDescription();
 }
 
-static QString GetMacroSegmentDescription(Macro *macro, int idx,
-					  bool isCondition)
+QString GetMacroSegmentDescription(Macro *macro, int idx, bool isCondition)
 {
 	if (!macro) {
 		return "";
@@ -176,7 +175,7 @@ void MacroSegmentSelection::MarkSelectedSegment()
 			index - 1, QColor(Qt::lightGray));
 	}
 
-	HighlightWidget(this, QColor(Qt::lightGray), QColor(0, 0, 0, 0), true);
+	PulseWidget(this, QColor(Qt::lightGray), QColor(0, 0, 0, 0), true);
 }
 
 } // namespace advss

lib/macro/macro-segment.cpp

@@ -59,12 +59,12 @@ std::string MacroSegment::GetShortDesc() const
 	return "";
 }
 
-void MacroSegment::EnableHighlight()
+void MacroSegment::SetHighlight()
 {
 	_highlight = true;
 }
 
-bool MacroSegment::GetHighlightAndReset()
+bool MacroSegment::Highlight()
 {
 	if (_highlight) {
 		_highlight = false;
@@ -194,7 +194,7 @@ void DecrementVariableRef(MacroSegment *segment)
 	segment->_variableRefs--;
 }
 
-MacroSegmentEdit::MacroSegmentEdit(QWidget *parent)
+MacroSegmentEdit::MacroSegmentEdit(bool highlight, QWidget *parent)
 	: QWidget(parent),
 	  _section(new Section(300)),
 	  _headerInfo(new QLabel()),
@@ -203,7 +203,8 @@ MacroSegmentEdit::MacroSegmentEdit(QWidget *parent)
 	  _noBorderframe(new QFrame),
 	  _borderFrame(new QFrame),
 	  _dropLineAbove(new QFrame),
-	  _dropLineBelow(new QFrame)
+	  _dropLineBelow(new QFrame),
+	  _showHighlight(highlight)
 {
 	_dropLineAbove->setLineWidth(3);
 	_dropLineAbove->setFixedHeight(11);
@@ -281,6 +282,10 @@ MacroSegmentEdit::MacroSegmentEdit(QWidget *parent)
 
 	// Enable dragging while clicking on the header text
 	_headerInfo->installEventFilter(this);
+
+	_timer.setInterval(1500);
+	connect(&_timer, SIGNAL(timeout()), this, SLOT(Highlight()));
+	_timer.start();
 }
 
 bool MacroSegmentEdit::eventFilter(QObject *obj, QEvent *ev)
@@ -325,6 +330,22 @@ void MacroSegmentEdit::Collapsed(bool collapsed)
 	}
 }
 
+void MacroSegmentEdit::Highlight()
+{
+	if (!Data()) {
+		return;
+	}
+
+	if (_showHighlight && Data()->Highlight()) {
+		PulseWidget(this, Qt::green, QColor(0, 0, 0, 0), true);
+	}
+}
+
+void MacroSegmentEdit::EnableHighlight(bool value)
+{
+	_showHighlight = value;
+}
+
 void MacroSegmentEdit::SetFocusPolicyOfWidgets()
 {
 	QList<QWidget *> widgets = this->findChildren<QWidget *>();

lib/macro/macro-segment.hpp

@@ -37,8 +37,8 @@ public:
 	virtual bool PostLoad();
 	virtual std::string GetShortDesc() const;
 	virtual std::string GetId() const = 0;
-	void EnableHighlight();
-	bool GetHighlightAndReset();
+	void SetHighlight();
+	bool Highlight();
 	virtual std::string GetVariableValue() const;
 
 protected:
@@ -87,7 +87,7 @@ class MacroSegmentEdit : public QWidget {
 	Q_OBJECT
 
 public:
-	MacroSegmentEdit(QWidget *parent = nullptr);
+	MacroSegmentEdit(bool highlight, QWidget *parent = nullptr);
 	// Use this function to avoid accidental edits when scrolling through
 	// list of actions and conditions
 	void SetFocusPolicyOfWidgets();
@@ -100,6 +100,8 @@ public slots:
 
 protected slots:
 	void Collapsed(bool);
+	void Highlight();
+	void EnableHighlight(bool);
 signals:
 	void MacroAdded(const QString &name);
 	void MacroRemoved(const QString &name);
@@ -141,6 +143,9 @@ private:
 	QFrame *_dropLineAbove;
 	QFrame *_dropLineBelow;
 
+	bool _showHighlight;
+	QTimer _timer;
+
 	friend class MacroSegmentList;
 };
 

lib/macro/macro-selection.cpp

@@ -2,7 +2,6 @@
 #include "advanced-scene-switcher.hpp"
 #include "layout-helpers.hpp"
 #include "macro.hpp"
-#include "ui-helpers.hpp"
 
 #include <QDialogButtonBox>
 #include <QStandardItemModel>
@@ -20,13 +19,11 @@ MacroSelection::MacroSelection(QWidget *parent)
 		addItem(QString::fromStdString(m->Name()));
 	}
 
-	QWidget::connect(GetSettingsWindow(),
-			 SIGNAL(MacroAdded(const QString &)), this,
+	QWidget::connect(parent, SIGNAL(MacroAdded(const QString &)), this,
 			 SLOT(MacroAdd(const QString &)));
-	QWidget::connect(GetSettingsWindow(),
-			 SIGNAL(MacroRemoved(const QString &)), this,
+	QWidget::connect(parent, SIGNAL(MacroRemoved(const QString &)), this,
 			 SLOT(MacroRemove(const QString &)));
-	QWidget::connect(GetSettingsWindow(),
+	QWidget::connect(parent,
 			 SIGNAL(MacroRenamed(const QString &, const QString &)),
 			 this,
 			 SLOT(MacroRename(const QString &, const QString &)));
@@ -69,7 +66,7 @@ void MacroSelection::HideSelectedMacro()
 void MacroSelection::ShowAllMacros()
 {
 	auto v = qobject_cast<QListView *>(view());
-	for (int i = count() - 1; i >= 0; i--) {
+	for (int i = count(); i > 0; i--) {
 		v->setRowHidden(i, false);
 	}
 }
@@ -127,7 +124,7 @@ MacroSelectionDialog::MacroSelectionDialog(QWidget *parent)
 	setLayout(layout);
 }
 
-bool MacroSelectionDialog::AskForMacro(std::string &macroName)
+bool MacroSelectionDialog::AskForMacro(QWidget *parent, std::string &macroName)
 {
 	MacroSelectionDialog dialog(GetSettingsWindow());
 	dialog.setWindowTitle(obs_module_text("AdvSceneSwitcher.windowTitle"));

lib/macro/macro-selection.hpp

@@ -28,7 +28,7 @@ class MacroSelectionDialog : public QDialog {
 
 public:
 	MacroSelectionDialog(QWidget *parent);
-	static bool AskForMacro(std::string &macroName);
+	static bool AskForMacro(QWidget *parent, std::string &macroName);
 
 private:
 	MacroSelection *_macroSelection;

lib/macro/macro-tab.cpp

@@ -1,11 +1,9 @@
 #include "advanced-scene-switcher.hpp"
 #include "action-queue.hpp"
-#include "cursor-shape-changer.hpp"
 #include "macro-action-edit.hpp"
 #include "macro-condition-edit.hpp"
 #include "macro-export-import-dialog.hpp"
-#include "macro-settings.hpp"
-#include "macro-segment-copy-paste.hpp"
+#include "macro-properties.hpp"
 #include "macro-tree.hpp"
 #include "macro.hpp"
 #include "math-helpers.hpp"
@@ -24,7 +22,7 @@
 
 namespace advss {
 
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;
 static QTimer onChangeHighlightTimer;
 
 static bool macroNameExists(const std::string &name)
@@ -87,8 +85,7 @@ bool AdvSceneSwitcher::AddNewMacro(std::shared_ptr<Macro> &res,
 	}
 
 	res = std::make_shared<Macro>(
-		name, GetGlobalMacroSettings()._newMacroRegisterHotkeys,
-		GetGlobalMacroSettings()._newMacroUseShortCircuitEvaluation);
+		name, GetGlobalMacroProperties()._newMacroRegisterHotkeys);
 	return true;
 }
 
@@ -100,33 +97,8 @@ void AdvSceneSwitcher::on_macroAdd_clicked()
 		return;
 	}
 
-	if (addPulse) {
-		addPulse->deleteLater();
-		addPulse = nullptr;
-	}
-
-	auto selectedMacro = GetSelectedMacro();
-	if (!selectedMacro) {
-		ui->macros->Add(newMacro);
-		emit MacroAdded(QString::fromStdString(name));
-		return;
-	}
-
-	if (selectedMacro->IsGroup()) {
-		ui->macros->Add(newMacro, selectedMacro);
-		emit MacroAdded(QString::fromStdString(name));
-		return;
-	}
-
-	auto selectedMacroGroup = selectedMacro->Parent();
-	if (!selectedMacroGroup) {
-		ui->macros->Add(newMacro, selectedMacro);
-		emit MacroAdded(QString::fromStdString(name));
-		return;
-	}
-
-	Macro::PrepareMoveToGroup(selectedMacroGroup, newMacro);
-	ui->macros->Add(newMacro, selectedMacro);
+	ui->macros->Add(newMacro);
+	ui->macroAdd->disconnect(addPulse);
 	emit MacroAdded(QString::fromStdString(name));
 }
 
@@ -489,7 +461,7 @@ void AdvSceneSwitcher::ImportMacros()
 	RunPostLoadSteps();
 
 	ui->macros->Reset(GetMacros(),
-			  GetGlobalMacroSettings()._highlightExecuted);
+			  GetGlobalMacroProperties()._highlightExecuted);
 }
 
 void AdvSceneSwitcher::on_macroName_editingFinished()
@@ -764,16 +736,13 @@ void AdvSceneSwitcher::MacroSelectionChanged()
 		return;
 	}
 	SetEditMacro(*macro);
-
-	if (GetGlobalMacroSettings()._saveSettingsOnMacroChange) {
-		obs_frontend_save();
-	}
+	obs_frontend_save();
 }
 
 void AdvSceneSwitcher::HighlightOnChange()
 {
-	if (!GetGlobalMacroSettings()._highlightActions &&
-	    !GetGlobalMacroSettings()._highlightExecuted) {
+	if (!GetGlobalMacroProperties()._highlightActions &&
+	    !GetGlobalMacroProperties()._highlightExecuted) {
 		return;
 	}
 
@@ -783,62 +752,38 @@ void AdvSceneSwitcher::HighlightOnChange()
 	}
 
 	if (macro->OnChangePreventedActionsRecently()) {
-		HighlightWidget(ui->runMacroOnChange, Qt::yellow,
-				Qt::transparent, true);
+		PulseWidget(ui->runMacroOnChange, Qt::yellow, Qt::transparent,
+			    true);
 	}
 }
 
-static void resetSegmentHighlights(MacroSegmentList *list)
+void AdvSceneSwitcher::on_macroProperties_clicked()
 {
-	MacroSegmentEdit *widget = nullptr;
-	for (int i = 0; (widget = list->WidgetAt(i)); i++) {
-		if (widget && widget->Data()) {
-			(void)widget->Data()->GetHighlightAndReset();
-		}
-	}
-}
-
-void AdvSceneSwitcher::on_macroSettings_clicked()
-{
-	GlobalMacroSettings prop = GetGlobalMacroSettings();
-	bool accepted = MacroSettingsDialog::AskForSettings(
+	MacroProperties prop = GetGlobalMacroProperties();
+	bool accepted = MacroPropertiesDialog::AskForSettings(
 		this, prop, GetSelectedMacro().get());
 	if (!accepted) {
 		return;
 	}
-
-	GetGlobalMacroSettings() = prop;
+	GetGlobalMacroProperties() = prop;
 	emit HighlightMacrosChanged(prop._highlightExecuted);
-
-	// Reset highlights to avoid all macro segments being highlighted, which
-	// would have been highlighted at least once since the moment the
-	// highlighting was disabled
-	if (prop._highlightConditions) {
-		resetSegmentHighlights(ui->conditionsList);
-	}
-	if (prop._highlightActions) {
-		resetSegmentHighlights(ui->actionsList);
-		resetSegmentHighlights(ui->elseActionsList);
-	}
-
-	SetCheckIntervalTooLowVisibility();
+	emit HighlightActionsChanged(prop._highlightActions);
+	emit HighlightConditionsChanged(prop._highlightConditions);
 }
 
 static void moveControlsToSplitter(QSplitter *splitter, int idx,
 				   QLayoutItem *item)
 {
-	static int splitterHandleWidth = 32;
+	static int splitterHandleWidth = 38;
 	auto handle = splitter->handle(idx);
 	auto layout = item->layout();
-	int leftMargin, rightMargin;
-	layout->getContentsMargins(&leftMargin, nullptr, &rightMargin, nullptr);
-	layout->setContentsMargins(leftMargin, 0, rightMargin, 0);
+	layout->setContentsMargins(7, 7, 7, 7);
 	handle->setLayout(layout);
 	splitter->setHandleWidth(splitterHandleWidth);
 	splitter->setStyleSheet("QSplitter::handle {background: transparent;}");
 }
 
-static bool shouldRestoreSplitter(const QList<int> &pos)
+bool shouldRestoreSplitter(const QList<int> &pos)
 {
 	if (pos.size() == 0) {
 		return false;
@@ -852,77 +797,16 @@ static bool shouldRestoreSplitter(const QList<int> &pos)
 	return true;
 }
 
-static void runSegmentHighligtChecksHelper(MacroSegmentList *list)
-{
-	MacroSegmentEdit *widget = nullptr;
-	for (int i = 0; (widget = list->WidgetAt(i)); i++) {
-		if (widget->Data() && widget->Data()->GetHighlightAndReset()) {
-			list->Highlight(i);
-		}
-	}
-}
-
-static void runSegmentHighligtChecks(AdvSceneSwitcher *ss)
-{
-	if (!ss || !HighlightUIElementsEnabled()) {
-		return;
-	}
-	auto macro = ss->GetSelectedMacro();
-	if (!macro) {
-		return;
-	}
-
-	const auto &settings = GetGlobalMacroSettings();
-	if (settings._highlightConditions) {
-		runSegmentHighligtChecksHelper(ss->ui->conditionsList);
-	}
-	if (settings._highlightActions) {
-		runSegmentHighligtChecksHelper(ss->ui->actionsList);
-		runSegmentHighligtChecksHelper(ss->ui->elseActionsList);
-	}
-}
-
-static QToolBar *
-setupToolBar(const std::initializer_list<std::initializer_list<QWidget *>>
-		     &widgetGroups)
-{
-	auto toolbar = new QToolBar();
-	toolbar->setIconSize({16, 16});
-
-	QAction *lastSeperator = nullptr;
-
-	for (const auto &widgetGroup : widgetGroups) {
-		for (const auto &widget : widgetGroup) {
-			toolbar->addWidget(widget);
-		}
-		lastSeperator = toolbar->addSeparator();
-	}
-
-	if (lastSeperator) {
-		toolbar->removeAction(lastSeperator);
-	}
-
-	// Prevent "extension" button from showing up
-	toolbar->setSizePolicy(QSizePolicy::MinimumExpanding,
-			       QSizePolicy::Preferred);
-	return toolbar;
-}
-
 void AdvSceneSwitcher::SetupMacroTab()
 {
 	ui->macroElseActions->installEventFilter(this);
 	ui->macros->installEventFilter(this);
 
 	if (GetMacros().size() == 0 && !switcher->disableHints) {
-		addPulse = HighlightWidget(ui->macroAdd, QColor(Qt::green));
+		addPulse = PulseWidget(ui->macroAdd, QColor(Qt::green));
 	}
-
-	auto macroControls = setupToolBar({{ui->macroAdd, ui->macroRemove},
-					   {ui->macroUp, ui->macroDown}});
-	ui->macroControlLayout->addWidget(macroControls);
-
 	ui->macros->Reset(GetMacros(),
-			  GetGlobalMacroSettings()._highlightExecuted);
+			  GetGlobalMacroProperties()._highlightExecuted);
 	connect(ui->macros, SIGNAL(MacroSelectionAboutToChange()), this,
 		SLOT(MacroSelectionAboutToChange()));
 	connect(ui->macros, SIGNAL(MacroSelectionChanged()), this,
@@ -972,7 +856,13 @@ void AdvSceneSwitcher::SetupMacroTab()
 		SLOT(HighlightOnChange()));
 	onChangeHighlightTimer.start();
 
-	// Set action and condition toolbars
+	// Move condition controls into splitter handle layout
+	moveControlsToSplitter(ui->macroActionConditionSplitter, 1,
+			       ui->macroConditionsLayout->takeAt(1));
+	moveControlsToSplitter(ui->macroElseActionSplitter, 1,
+			       ui->macroActionsLayout->takeAt(1));
+
+	// Set action and condition control icons
 	const std::string pathPrefix =
 		GetDataFilePath("res/images/" + GetThemeTypeName());
 	SetButtonIcon(ui->actionTop, (pathPrefix + "DoubleUp.svg").c_str());
@@ -987,44 +877,6 @@ void AdvSceneSwitcher::SetupMacroTab()
 	SetButtonIcon(ui->toggleElseActions,
 		      (pathPrefix + "NotEqual.svg").c_str());
 
-	auto conditionToolbar =
-		setupToolBar({{ui->conditionAdd, ui->conditionRemove},
-			      {ui->conditionTop, ui->conditionUp,
-			       ui->conditionDown, ui->conditionBottom}});
-	auto actionToolbar = setupToolBar({{ui->actionAdd, ui->actionRemove},
-					   {ui->actionTop, ui->actionUp,
-					    ui->actionDown, ui->actionBottom}});
-	auto elseActionToolbar =
-		setupToolBar({{ui->elseActionAdd, ui->elseActionRemove},
-			      {ui->elseActionTop, ui->elseActionUp,
-			       ui->elseActionDown, ui->elseActionBottom}});
-
-	ui->conditionControlsLayout->addWidget(conditionToolbar);
-	ui->actionControlsLayout->insertWidget(0, actionToolbar);
-	ui->elseActionControlsLayout->addWidget(elseActionToolbar);
-
-	// Move condition controls into splitter handle layout
-	moveControlsToSplitter(ui->macroActionConditionSplitter, 1,
-			       ui->macroConditionsLayout->takeAt(1));
-	moveControlsToSplitter(ui->macroElseActionSplitter, 1,
-			       ui->macroActionsLayout->takeAt(1));
-
-	// Override splitter cursor icon when hovering over controls in splitter
-	SetCursorOnWidgetHover(ui->conditionAdd, Qt::CursorShape::ArrowCursor);
-	SetCursorOnWidgetHover(ui->conditionRemove,
-			       Qt::CursorShape::ArrowCursor);
-	SetCursorOnWidgetHover(ui->conditionTop, Qt::CursorShape::ArrowCursor);
-	SetCursorOnWidgetHover(ui->conditionUp, Qt::CursorShape::ArrowCursor);
-	SetCursorOnWidgetHover(ui->conditionDown, Qt::CursorShape::ArrowCursor);
-	SetCursorOnWidgetHover(ui->conditionBottom,
-			       Qt::CursorShape::ArrowCursor);
-	SetCursorOnWidgetHover(ui->actionAdd, Qt::CursorShape::ArrowCursor);
-	SetCursorOnWidgetHover(ui->actionRemove, Qt::CursorShape::ArrowCursor);
-	SetCursorOnWidgetHover(ui->actionTop, Qt::CursorShape::ArrowCursor);
-	SetCursorOnWidgetHover(ui->actionUp, Qt::CursorShape::ArrowCursor);
-	SetCursorOnWidgetHover(ui->actionDown, Qt::CursorShape::ArrowCursor);
-	SetCursorOnWidgetHover(ui->actionBottom, Qt::CursorShape::ArrowCursor);
-
 	// Reserve more space for macro edit area than for the macro list
 	ui->macroListMacroEditSplitter->setStretchFactor(0, 1);
 	ui->macroListMacroEditSplitter->setStretchFactor(1, 4);
@@ -1039,14 +891,6 @@ void AdvSceneSwitcher::SetupMacroTab()
 				switcher->macroListMacroEditSplitterPosition);
 		}
 	}
-
-	SetupSegmentCopyPasteShortcutHandlers(this);
-
-	// Macro segment highlight
-	auto timer = new QTimer(this);
-	connect(timer, &QTimer::timeout,
-		[this]() { runSegmentHighligtChecks(this); });
-	timer->start(1500);
 }
 
 void AdvSceneSwitcher::ShowMacroContextMenu(const QPoint &pos)
@@ -1099,30 +943,8 @@ void AdvSceneSwitcher::ShowMacroContextMenu(const QPoint &pos)
 	menu.exec(globalPos);
 }
 
-static bool handleCustomLabelRename(MacroSegmentEdit *segmentEdit)
-{
-	std::string label;
-	auto segment = segmentEdit->Data();
-	if (!segment) {
-		return false;
-	}
-
-	bool accepted = NameDialog::AskForName(
-		GetSettingsWindow(),
-		obs_module_text(
-			"AdvSceneSwitcher.macroTab.segment.setCustomLabel"),
-		"", label, QString::fromStdString(segment->GetCustomLabel()));
-	if (!accepted) {
-		return false;
-	}
-
-	segment->SetCustomLabel(label);
-	segmentEdit->HeaderInfoChanged("");
-	return true;
-}
-
-static void handleCustomLabelEnableChange(MacroSegmentEdit *segmentEdit,
-					  QAction *contextMenuOption)
+static void handleCustomLabelChange(MacroSegmentEdit *segmentEdit,
+				    QAction *contextMenuOption)
 {
 	bool enable = contextMenuOption->isChecked();
 	auto segment = segmentEdit->Data();
@@ -1133,93 +955,22 @@ static void handleCustomLabelEnableChange(MacroSegmentEdit *segmentEdit,
 		return;
 	}
 
-	if (!handleCustomLabelRename(segmentEdit)) {
+	std::string label;
+	bool accepted = NameDialog::AskForName(
+		GetSettingsWindow(),
+		obs_module_text(
+			"AdvSceneSwitcher.macroTab.segment.setCustomLabel"),
+		"", label, QString::fromStdString(segment->GetCustomLabel()));
+	if (!accepted) {
 		segment->SetUseCustomLabel(false);
-	}
-}
-
-static void setupSegmentLabelContextMenuEntries(MacroSegmentEdit *segmentEdit,
-						QMenu &menu)
-{
-	if (!segmentEdit) {
 		return;
 	}
 
-	auto segment = segmentEdit ? segmentEdit->Data() : nullptr;
-	const bool customLabelIsEnabled = segment &&
-					  segment->GetUseCustomLabel();
-
-	auto enableCustomLabel = menu.addAction(obs_module_text(
-		"AdvSceneSwitcher.macroTab.segment.useCustomLabel"));
-	enableCustomLabel->setCheckable(true);
-	enableCustomLabel->setChecked(customLabelIsEnabled);
-	QWidget::connect(enableCustomLabel, &QAction::triggered,
-			 [segmentEdit, enableCustomLabel]() {
-				 handleCustomLabelEnableChange(
-					 segmentEdit, enableCustomLabel);
-			 });
-
-	if (!customLabelIsEnabled) {
-		return;
-	}
-
-	auto customLabelRename = menu.addAction(obs_module_text(
-		"AdvSceneSwitcher.macroTab.segment.customLabelRename"));
-	QWidget::connect(customLabelRename, &QAction::triggered,
-			 [segmentEdit]() {
-				 handleCustomLabelRename(segmentEdit);
-			 });
-}
-
-static void setupCopyPasteContextMenuEnry(AdvSceneSwitcher *ss,
-					  MacroSegmentEdit *segmentEdit,
-					  QMenu &menu)
-{
-	auto copy = menu.addAction(
-		obs_module_text("AdvSceneSwitcher.macroTab.segment.copy"), ss,
-		[ss]() { ss->CopyMacroSegment(); });
-	copy->setEnabled(!!segmentEdit);
-
-	bool pasteAsElseAction = true;
-	const char *pasteText = "AdvSceneSwitcher.macroTab.segment.paste";
-	if (MacroActionIsInClipboard()) {
-		if (IsCursorInWidgetArea(ss->ui->macroActions)) {
-			pasteAsElseAction = false;
-			pasteText =
-				"AdvSceneSwitcher.macroTab.segment.pasteAction";
-		} else if (IsCursorInWidgetArea(ss->ui->macroElseActions)) {
-			pasteAsElseAction = true;
-			pasteText =
-				"AdvSceneSwitcher.macroTab.segment.pasteElseAction";
-		}
-	}
-	auto paste = menu.addAction(
-		obs_module_text(pasteText), ss, [ss, pasteAsElseAction]() {
-			SetCopySegmentTargetActionType(pasteAsElseAction);
-			ss->PasteMacroSegment();
-		});
-	paste->setEnabled(MacroSegmentIsInClipboard());
-}
-
-static void setupRemoveContextMenuEnry(
-	AdvSceneSwitcher *ss,
-	const std::function<void(AdvSceneSwitcher *, int)> &remove,
-	const QPoint &pos, MacroSegmentList *list, QMenu &menu)
-{
-	const auto segmentEditIndex = list->IndexAt(pos);
-	if (segmentEditIndex == -1) {
-		return;
-	}
-
-	menu.addAction(
-		obs_module_text("AdvSceneSwitcher.macroTab.segment.remove"), ss,
-		[ss, remove, segmentEditIndex]() {
-			remove(ss, segmentEditIndex);
-		});
+	segment->SetCustomLabel(label);
+	segmentEdit->HeaderInfoChanged("");
 }
 
 static void setupConextMenu(AdvSceneSwitcher *ss, const QPoint &pos,
-			    std::function<void(AdvSceneSwitcher *, int)> remove,
 			    std::function<void(AdvSceneSwitcher *)> expand,
 			    std::function<void(AdvSceneSwitcher *)> collapse,
 			    std::function<void(AdvSceneSwitcher *)> maximize,
@@ -1227,30 +978,33 @@ static void setupConextMenu(AdvSceneSwitcher *ss, const QPoint &pos,
 			    MacroSegmentList *list)
 {
 	QMenu menu;
-	auto segmentEdit = list->WidgetAt(pos);
-
-	setupCopyPasteContextMenuEnry(ss, segmentEdit, menu);
-	menu.addSeparator();
-	setupRemoveContextMenuEnry(ss, remove, pos, list, menu);
-	menu.addSeparator();
-	setupSegmentLabelContextMenuEntries(segmentEdit, menu);
-	menu.addSeparator();
 	menu.addAction(obs_module_text("AdvSceneSwitcher.macroTab.expandAll"),
 		       ss, [ss, expand]() { expand(ss); });
 	menu.addAction(obs_module_text("AdvSceneSwitcher.macroTab.collapseAll"),
 		       ss, [ss, collapse]() { collapse(ss); });
-	menu.addSeparator();
 	menu.addAction(obs_module_text("AdvSceneSwitcher.macroTab.maximize"),
 		       ss, [ss, maximize]() { maximize(ss); });
 	menu.addAction(obs_module_text("AdvSceneSwitcher.macroTab.minimize"),
 		       ss, [ss, minimize]() { minimize(ss); });
+
+	auto segmentEdit = list->WidgetAt(pos);
+	if (segmentEdit) {
+		auto customLabel = menu.addAction(obs_module_text(
+			"AdvSceneSwitcher.macroTab.segment.useCustomLabel"));
+		customLabel->setCheckable(true);
+		auto segment = segmentEdit ? segmentEdit->Data() : nullptr;
+		customLabel->setChecked(segment &&
+					segment->GetUseCustomLabel());
+		QWidget::connect(customLabel, &QAction::triggered,
+				 std::bind(handleCustomLabelChange, segmentEdit,
+					   customLabel));
+	}
 	menu.exec(list->mapToGlobal(pos));
 }
 
 void AdvSceneSwitcher::ShowMacroActionsContextMenu(const QPoint &pos)
 {
-	setupConextMenu(this, pos, &AdvSceneSwitcher::RemoveMacroAction,
-			&AdvSceneSwitcher::ExpandAllActions,
+	setupConextMenu(this, pos, &AdvSceneSwitcher::ExpandAllActions,
 			&AdvSceneSwitcher::CollapseAllActions,
 			&AdvSceneSwitcher::MaximizeActions,
 			&AdvSceneSwitcher::MinimizeActions, ui->actionsList);
@@ -1258,8 +1012,7 @@ void AdvSceneSwitcher::ShowMacroActionsContextMenu(const QPoint &pos)
 
 void AdvSceneSwitcher::ShowMacroElseActionsContextMenu(const QPoint &pos)
 {
-	setupConextMenu(this, pos, &AdvSceneSwitcher::RemoveMacroElseAction,
-			&AdvSceneSwitcher::ExpandAllElseActions,
+	setupConextMenu(this, pos, &AdvSceneSwitcher::ExpandAllElseActions,
 			&AdvSceneSwitcher::CollapseAllElseActions,
 			&AdvSceneSwitcher::MaximizeElseActions,
 			&AdvSceneSwitcher::MinimizeElseActions,
@@ -1268,8 +1021,7 @@ void AdvSceneSwitcher::ShowMacroElseActionsContextMenu(const QPoint &pos)
 
 void AdvSceneSwitcher::ShowMacroConditionsContextMenu(const QPoint &pos)
 {
-	setupConextMenu(this, pos, &AdvSceneSwitcher::RemoveMacroCondition,
-			&AdvSceneSwitcher::ExpandAllConditions,
+	setupConextMenu(this, pos, &AdvSceneSwitcher::ExpandAllConditions,
 			&AdvSceneSwitcher::CollapseAllConditions,
 			&AdvSceneSwitcher::MaximizeConditions,
 			&AdvSceneSwitcher::MinimizeConditions,
@@ -1291,7 +1043,7 @@ void AdvSceneSwitcher::CopyMacro()
 	}
 
 	OBSDataAutoRelease data = obs_data_create();
-	macro->Save(data, true);
+	macro->Save(data);
 	newMacro->Load(data);
 	newMacro->PostLoad();
 	newMacro->SetName(name);
@@ -1299,10 +1051,7 @@ void AdvSceneSwitcher::CopyMacro()
 	Macro::PrepareMoveToGroup(macro->Parent(), newMacro);
 
 	ui->macros->Add(newMacro, macro);
-	if (addPulse) {
-		addPulse->deleteLater();
-		addPulse = nullptr;
-	}
+	ui->macroAdd->disconnect(addPulse);
 	emit MacroAdded(QString::fromStdString(name));
 }
 
@@ -1594,47 +1343,58 @@ static void fade(QWidget *widget, bool fadeOut)
 	animation->start(QPropertyAnimation::DeleteWhenStopped);
 }
 
-static void fadeWidgets(const std::vector<QWidget *> &widgets, bool fadeOut)
+void AdvSceneSwitcher::FadeOutActionControls()
 {
-	for (const auto &widget : widgets) {
-		fade(widget, fadeOut);
-	}
+	fade(ui->actionAdd, true);
+	fade(ui->actionRemove, true);
+	fade(ui->actionTop, true);
+	fade(ui->actionUp, true);
+	fade(ui->actionDown, true);
+	fade(ui->actionBottom, true);
+}
+
+void AdvSceneSwitcher::FadeOutConditionControls()
+{
+	fade(ui->conditionAdd, true);
+	fade(ui->conditionRemove, true);
+	fade(ui->conditionTop, true);
+	fade(ui->conditionUp, true);
+	fade(ui->conditionDown, true);
+	fade(ui->conditionBottom, true);
+}
+
+void AdvSceneSwitcher::ResetOpacityActionControls()
+{
+	fade(ui->actionAdd, false);
+	fade(ui->actionRemove, false);
+	fade(ui->actionTop, false);
+	fade(ui->actionUp, false);
+	fade(ui->actionDown, false);
+	fade(ui->actionBottom, false);
+}
+
+void AdvSceneSwitcher::ResetOpacityConditionControls()
+{
+	fade(ui->conditionAdd, false);
+	fade(ui->conditionRemove, false);
+	fade(ui->conditionTop, false);
+	fade(ui->conditionUp, false);
+	fade(ui->conditionDown, false);
+	fade(ui->conditionBottom, false);
 }
 
 void AdvSceneSwitcher::HighlightControls()
 {
-	const std::vector<QWidget *> conditionControls{
-		ui->conditionAdd, ui->conditionRemove, ui->conditionTop,
-		ui->conditionUp,  ui->conditionDown,   ui->conditionBottom,
-	};
-	const std::vector<QWidget *> actionControls{
-		ui->actionAdd, ui->actionRemove, ui->actionTop,
-		ui->actionUp,  ui->actionDown,   ui->actionBottom,
-	};
-	const std::vector<QWidget *> elseActionControls{
-		ui->elseActionAdd, ui->elseActionRemove, ui->elseActionTop,
-		ui->elseActionUp,  ui->elseActionDown,   ui->elseActionBottom,
-	};
-
-	if ((currentActionIdx == -1 && currentConditionIdx == -1 &&
-	     currentElseActionIdx == -1)) {
-		fadeWidgets(conditionControls, false);
-		fadeWidgets(actionControls, false);
-		fadeWidgets(elseActionControls, false);
-	} else if (currentConditionIdx != -1) {
-		fadeWidgets(conditionControls, false);
-		fadeWidgets(actionControls, true);
-		fadeWidgets(elseActionControls, true);
+	if ((currentActionIdx == -1 && currentConditionIdx == -1) ||
+	    (currentActionIdx != -1 && currentConditionIdx != -1)) {
+		ResetOpacityActionControls();
+		ResetOpacityConditionControls();
 	} else if (currentActionIdx != -1) {
-		fadeWidgets(conditionControls, true);
-		fadeWidgets(actionControls, false);
-		fadeWidgets(elseActionControls, true);
-	} else if (currentElseActionIdx != -1) {
-		fadeWidgets(conditionControls, true);
-		fadeWidgets(actionControls, true);
-		fadeWidgets(elseActionControls, false);
+		FadeOutConditionControls();
+		ResetOpacityActionControls();
 	} else {
-		assert(false);
+		FadeOutActionControls();
+		ResetOpacityConditionControls();
 	}
 }
 

lib/macro/macro-tree.cpp

@@ -108,7 +108,7 @@ void MacroTreeItem::HighlightIfExecuted()
 
 	if (_lastHighlightCheckTime.time_since_epoch().count() != 0 &&
 	    _macro->WasExecutedSince(_lastHighlightCheckTime)) {
-		HighlightWidget(this, Qt::green, QColor(0, 0, 0, 0), true);
+		PulseWidget(this, Qt::green, QColor(0, 0, 0, 0), true);
 	}
 	_lastHighlightCheckTime = std::chrono::high_resolution_clock::now();
 }
@@ -160,7 +160,7 @@ void MacroTreeItem::Update(bool force)
 		_spacer = nullptr;
 	}
 
-	if (_type == Type::Group && _expand) {
+	if (_type == Type::Group) {
 		_boxLayout->removeWidget(_expand);
 		_expand->deleteLater();
 		_expand = nullptr;

lib/macro/macro.cpp

@@ -14,77 +14,19 @@
 #include <QAction>
 #include <QMainWindow>
 #include <unordered_map>
-#include <util/platform.h>
-
-#if LIBOBS_API_VER < MAKE_SEMANTIC_VERSION(30, 0, 0)
-#include <QDockWidget>
-
-namespace {
-
-struct DockMapEntry {
-	QAction *action = nullptr;
-	QWidget *dock = nullptr;
-};
-
-} // namespace
-
-static std::unordered_map<const char *, DockMapEntry> dockIds;
-static std::mutex dockMutex;
-
-static bool obs_frontend_add_dock_by_id(const char *id, const char *title,
-					QWidget *widget)
-{
-	std::lock_guard<std::mutex> lock(dockMutex);
-	if (dockIds.count(id) > 0) {
-		return false;
-	}
-
-	widget->setObjectName(id);
-
-	auto dock = new QDockWidget();
-	dock->setWindowTitle(title);
-	dock->setWidget(widget);
-	dock->setFloating(true);
-	dock->setVisible(false);
-	dock->setFeatures(QDockWidget::DockWidgetClosable |
-			  QDockWidget::DockWidgetMovable |
-			  QDockWidget::DockWidgetFloatable);
-
-	auto action = static_cast<QAction *>(obs_frontend_add_dock(dock));
-	if (!action) {
-		return false;
-	}
-	dockIds[id] = {action, dock};
-	return true;
-}
-
-static void obs_frontend_remove_dock(const char *id)
-{
-	std::lock_guard<std::mutex> lock(dockMutex);
-	auto it = dockIds.find(id);
-	if (it == dockIds.end()) {
-		return;
-	}
-	it->second.action->deleteLater();
-	it->second.dock->deleteLater();
-	dockIds.erase(it);
-}
-
-#endif
 
 namespace advss {
 
+static constexpr int perfLogThreshold = 300;
 static std::deque<std::shared_ptr<Macro>> macros;
 
-Macro::Macro(const std::string &name, const bool addHotkey,
-	     const bool shortCircuitEvaluation)
+Macro::Macro(const std::string &name, const bool addHotkey)
 {
 	SetName(name);
 	if (addHotkey) {
 		SetupHotkeys();
 	}
 	_registerHotkeys = addHotkey;
-	_useShortCircuitEvaluation = shortCircuitEvaluation;
 }
 
 Macro::~Macro()
@@ -159,108 +101,90 @@ void Macro::PrepareMoveToGroup(std::shared_ptr<Macro> group,
 	}
 }
 
-static bool checkCondition(const std::shared_ptr<MacroCondition> &condition)
-{
-	using namespace std::chrono_literals;
-	static constexpr auto perfLogThreshold = 300ms;
-
-	const auto startTime = std::chrono::high_resolution_clock::now();
-	const bool conditionMatched = condition->CheckCondition();
-	const auto endTime = std::chrono::high_resolution_clock::now();
-	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,
-		     condition->GetId().c_str(),
-		     condition->GetMacro()->Name().c_str());
-	}
-
-	return conditionMatched;
-}
-
-bool Macro::CheckConditionHelper(
-	const std::shared_ptr<MacroCondition> &condition) const
-{
-	bool conditionMatched = false;
-	bool wasEvaluated = false;
-
-	const auto evaluateCondition = [&condition, &conditionMatched,
-					&wasEvaluated]() -> bool {
-		conditionMatched = checkCondition(condition);
-		conditionMatched =
-			condition->CheckDurationModifier(conditionMatched);
-		wasEvaluated = true;
-		return conditionMatched;
-	};
-
-	const auto logicType = condition->GetLogicType();
-	if (logicType == Logic::Type::NONE) {
-		vblog(LOG_INFO, "ignoring condition '%s' for '%s'",
-		      condition->GetId().c_str(), _name.c_str());
-		if (!_useShortCircuitEvaluation) {
-			(void)evaluateCondition();
-		}
-		return _matched;
-	}
-
-	bool result = _useShortCircuitEvaluation
-			      // Evaluate the condition result if needed
-			      ? Logic::ApplyConditionLogic(logicType, _matched,
-							   evaluateCondition,
-							   _name.c_str())
-			      // Evaluate the condition result right away
-			      : Logic::ApplyConditionLogic(logicType, _matched,
-							   evaluateCondition(),
-							   _name.c_str());
-
-	const bool isNegativeLogicType = Logic::IsNegationType(logicType);
-	if (wasEvaluated && ((conditionMatched && !isNegativeLogicType) ||
-			     (!conditionMatched && isNegativeLogicType))) {
-		condition->EnableHighlight();
-	}
-
-	if (VerboseLoggingEnabled()) {
-		if (wasEvaluated) {
-			blog(LOG_INFO, "condition %s returned %d",
-			     condition->GetId().c_str(), conditionMatched);
-		} else {
-			blog(LOG_INFO,
-			     "condition %s evaluation skipped (short circuit)",
-			     condition->GetId().c_str());
-		}
-	}
-
-	return result;
-}
-
-bool Macro::CheckConditions(bool ignorePause)
+bool Macro::CeckMatch()
 {
 	if (_isGroup) {
 		return false;
 	}
 
 	_matched = false;
-	for (auto &condition : _conditions) {
-		if (_paused && !ignorePause) {
+	for (auto &c : _conditions) {
+		if (_paused) {
 			vblog(LOG_INFO, "Macro %s is paused", _name.c_str());
 			return false;
 		}
 
-		_matched = CheckConditionHelper(condition);
-	}
+		auto startTime = std::chrono::high_resolution_clock::now();
+		bool cond = c->CheckCondition();
+		auto endTime = std::chrono::high_resolution_clock::now();
+		auto ms = std::chrono::duration_cast<std::chrono::milliseconds>(
+			endTime - startTime);
+		if (ms.count() >= perfLogThreshold) {
+			blog(LOG_WARNING,
+			     "spent %ld ms in %s condition check of macro '%s'!",
+			     (long int)ms.count(), c->GetId().c_str(),
+			     Name().c_str());
+		}
 
+		c->CheckDurationModifier(cond);
+
+		switch (c->GetLogicType()) {
+		case LogicType::NONE:
+			vblog(LOG_INFO,
+			      "ignoring condition check 'none' for '%s'",
+			      _name.c_str());
+			continue;
+		case LogicType::AND:
+			_matched = _matched && cond;
+			if (cond) {
+				c->SetHighlight();
+			}
+			break;
+		case LogicType::OR:
+			_matched = _matched || cond;
+			if (cond) {
+				c->SetHighlight();
+			}
+			break;
+		case LogicType::AND_NOT:
+			_matched = _matched && !cond;
+			if (!cond) {
+				c->SetHighlight();
+			}
+			break;
+		case LogicType::OR_NOT:
+			_matched = _matched || !cond;
+			if (!cond) {
+				c->SetHighlight();
+			}
+			break;
+		case LogicType::ROOT_NONE:
+			_matched = cond;
+			if (cond) {
+				c->SetHighlight();
+			}
+			break;
+		case LogicType::ROOT_NOT:
+			_matched = !cond;
+			if (!cond) {
+				c->SetHighlight();
+			}
+			break;
+		default:
+			blog(LOG_WARNING,
+			     "ignoring unknown condition check for '%s'",
+			     _name.c_str());
+			break;
+		}
+		vblog(LOG_INFO, "condition %s returned %d", c->GetId().c_str(),
+		      cond);
+	}
 	vblog(LOG_INFO, "Macro %s returned %d", _name.c_str(), _matched);
 
 	_conditionSateChanged = _lastMatched != _matched;
 	if (!_conditionSateChanged && _performActionsOnChange) {
 		_onPreventedActionExecution = true;
 	}
-
 	_lastMatched = _matched;
 	_lastCheckTime = std::chrono::high_resolution_clock::now();
 	return _matched;
@@ -309,26 +233,12 @@ bool Macro::PerformActions(bool match, bool forceParallel, bool ignorePause)
 	return ret;
 }
 
-bool Macro::WasExecutedSince(const TimePoint &time) const
+bool Macro::WasExecutedSince(
+	const std::chrono::high_resolution_clock::time_point &time) const
 {
 	return _lastExecutionTime > time;
 }
 
-bool Macro::ConditionsShouldBeChecked() const
-{
-	if (!_useCustomConditionCheckInterval) {
-		return true;
-	}
-
-	const auto timePassed = std::chrono::high_resolution_clock::now() -
-				LastConditionCheckTime();
-	const auto timePassedMs =
-		std::chrono::duration_cast<std::chrono::milliseconds>(
-			timePassed);
-	return timePassedMs.count() >=
-	       _customConditionCheckInterval.Milliseconds();
-}
-
 bool Macro::ShouldRunActions() const
 {
 	const bool hasActionsToExecute =
@@ -351,17 +261,23 @@ bool Macro::ShouldRunActions() const
 	return hasActionsToExecute;
 }
 
+int64_t Macro::MsSinceLastCheck() const
+{
+	if (_lastCheckTime.time_since_epoch().count() == 0) {
+		return 0;
+	}
+	const auto timePassed =
+		std::chrono::high_resolution_clock::now() - _lastCheckTime;
+	return std::chrono::duration_cast<std::chrono::milliseconds>(timePassed)
+		       .count() +
+	       1;
+}
+
 void Macro::SetName(const std::string &name)
 {
-	const bool nameChanged = _name == name;
 	_name = name;
-
 	SetHotkeysDesc();
-
-	if (nameChanged) {
-		_dockId = GenerateDockId();
-	}
-	EnableDock(_registerDock);
+	SetDockWidgetName();
 }
 
 void Macro::ResetTimers()
@@ -397,7 +313,7 @@ bool Macro::RunActionsHelper(
 			break;
 		}
 		if (action->Enabled()) {
-			action->EnableHighlight();
+			action->SetHighlight();
 		}
 	}
 	_done = true;
@@ -406,17 +322,23 @@ bool Macro::RunActionsHelper(
 
 bool Macro::RunActions(bool ignorePause)
 {
-	mblog(LOG_INFO, "running actions of %s", _name.c_str());
+	vblog(LOG_INFO, "running actions of %s", _name.c_str());
 	return RunActionsHelper(_actions, ignorePause);
 }
 
 bool Macro::RunElseActions(bool ignorePause)
 {
-	mblog(LOG_INFO, "running else actions of %s", _name.c_str());
+	vblog(LOG_INFO, "running else actions of %s", _name.c_str());
 	return RunActionsHelper(_elseActions, ignorePause);
 }
 
-bool Macro::WasPausedSince(const TimePoint &time) const
+bool Macro::DockIsVisible() const
+{
+	return _dock && _dockAction && _dock->isVisible();
+}
+
+bool Macro::WasPausedSince(
+	const std::chrono::high_resolution_clock::time_point &time) const
 {
 	return _lastUnpauseTime > time;
 }
@@ -426,41 +348,6 @@ void Macro::SetMatchOnChange(bool onChange)
 	_performActionsOnChange = onChange;
 }
 
-void Macro::SetStopActionsIfNotDone(bool stopActionsIfNotDone)
-{
-	_stopActionsIfNotDone = stopActionsIfNotDone;
-}
-
-void Macro::SetShortCircuitEvaluation(bool useShortCircuitEvaluation)
-{
-	_useShortCircuitEvaluation = useShortCircuitEvaluation;
-}
-
-bool Macro::ShortCircuitEvaluationEnabled() const
-{
-	return _useShortCircuitEvaluation;
-}
-
-void Macro::SetCustomConditionCheckIntervalEnabled(bool enable)
-{
-	_useCustomConditionCheckInterval = enable;
-}
-
-bool Macro::CustomConditionCheckIntervalEnabled() const
-{
-	return _useCustomConditionCheckInterval;
-}
-
-void Macro::SetCustomConditionCheckInterval(const Duration &duration)
-{
-	_customConditionCheckInterval = duration;
-}
-
-Duration Macro::GetCustomConditionCheckInterval() const
-{
-	return _customConditionCheckInterval;
-}
-
 void Macro::SetPaused(bool pause)
 {
 	if (_paused && !pause) {
@@ -481,16 +368,6 @@ void Macro::AddHelperThread(std::thread &&newThread)
 	_helperThreads.push_back(std::move(newThread));
 }
 
-void Macro::SetPauseStateSaveBehavior(PauseStateSaveBehavior behavior)
-{
-	_pauseSaveBehavior = behavior;
-}
-
-Macro::PauseStateSaveBehavior Macro::GetPauseStateSaveBehavior() const
-{
-	return _pauseSaveBehavior;
-}
-
 void Macro::Stop()
 {
 	_stop = true;
@@ -505,16 +382,6 @@ void Macro::Stop()
 	}
 }
 
-MacroInputVariables Macro::GetInputVariables() const
-{
-	return _inputVariables;
-}
-
-void Macro::SetInputVariables(const MacroInputVariables &inputVariables)
-{
-	_inputVariables = inputVariables;
-}
-
 std::vector<TempVariable> Macro::GetTempVars(MacroSegment *filter) const
 {
 	std::vector<TempVariable> res;
@@ -685,11 +552,14 @@ std::shared_ptr<Macro> Macro::Parent() const
 	return _parent.lock();
 }
 
-bool Macro::Save(obs_data_t *obj, bool saveForCopy) const
+bool Macro::Save(obs_data_t *obj) const
 {
-	if (!saveForCopy) {
-		obs_data_set_string(obj, "name", _name.c_str());
-	}
+	obs_data_set_string(obj, "name", _name.c_str());
+	obs_data_set_bool(obj, "pause", _paused);
+	obs_data_set_bool(obj, "parallel", _runInParallel);
+	obs_data_set_bool(obj, "onChange", _performActionsOnChange);
+	obs_data_set_bool(obj, "skipExecOnStart", _skipExecOnStart);
+	obs_data_set_bool(obj, "stopActionsIfNotDone", _stopActionsIfNotDone);
 
 	obs_data_set_bool(obj, "group", _isGroup);
 	if (_isGroup) {
@@ -700,20 +570,7 @@ bool Macro::Save(obs_data_t *obj, bool saveForCopy) const
 		return true;
 	}
 
-	obs_data_set_int(obj, "pauseSaveBehavior",
-			 static_cast<int>(_pauseSaveBehavior));
-	obs_data_set_bool(obj, "pause", _paused);
-	obs_data_set_bool(obj, "parallel", _runInParallel);
-	obs_data_set_bool(obj, "onChange", _performActionsOnChange);
-	obs_data_set_bool(obj, "skipExecOnStart", _skipExecOnStart);
-	obs_data_set_bool(obj, "stopActionsIfNotDone", _stopActionsIfNotDone);
-	obs_data_set_bool(obj, "useShortCircuitEvaluation",
-			  _useShortCircuitEvaluation);
-	obs_data_set_bool(obj, "useCustomConditionCheckInterval",
-			  _useCustomConditionCheckInterval);
-	_customConditionCheckInterval.Save(obj, "customConditionCheckInterval");
-
-	SaveDockSettings(obj, saveForCopy);
+	SaveDockSettings(obj);
 
 	SaveSplitterPos(_actionConditionSplitterPosition, obj,
 			"macroActionConditionSplitterPosition");
@@ -753,14 +610,51 @@ bool Macro::Save(obs_data_t *obj, bool saveForCopy) const
 	}
 	obs_data_set_array(obj, "elseActions", elseActions);
 
-	_inputVariables.Save(obj);
-
 	return true;
 }
 
+bool isValidLogic(LogicType t, bool root)
+{
+	bool isRoot = isRootLogicType(t);
+	if (!isRoot == root) {
+		return false;
+	}
+	if (isRoot) {
+		if (t >= LogicType::ROOT_LAST) {
+			return false;
+		}
+	} else if (t >= LogicType::LAST) {
+		return false;
+	}
+	return true;
+}
+
+void setValidLogic(MacroCondition *c, bool root, std::string name)
+{
+	if (isValidLogic(c->GetLogicType(), root)) {
+		return;
+	}
+	if (root) {
+		c->SetLogicType(LogicType::ROOT_NONE);
+		blog(LOG_WARNING,
+		     "setting invalid logic selection to 'if' for macro %s",
+		     name.c_str());
+	} else {
+		c->SetLogicType(LogicType::NONE);
+		blog(LOG_WARNING,
+		     "setting invalid logic selection to 'ignore' for macro %s",
+		     name.c_str());
+	}
+}
+
 bool Macro::Load(obs_data_t *obj)
 {
 	_name = obs_data_get_string(obj, "name");
+	_paused = obs_data_get_bool(obj, "pause");
+	_runInParallel = obs_data_get_bool(obj, "parallel");
+	_performActionsOnChange = obs_data_get_bool(obj, "onChange");
+	_skipExecOnStart = obs_data_get_bool(obj, "skipExecOnStart");
+	_stopActionsIfNotDone = obs_data_get_bool(obj, "stopActionsIfNotDone");
 
 	_isGroup = obs_data_get_bool(obj, "group");
 	if (_isGroup) {
@@ -772,32 +666,6 @@ bool Macro::Load(obs_data_t *obj)
 		return true;
 	}
 
-	_pauseSaveBehavior = static_cast<PauseStateSaveBehavior>(
-		obs_data_get_int(obj, "pauseSaveBehavior"));
-	switch (_pauseSaveBehavior) {
-	case PauseStateSaveBehavior::PERSIST:
-		_paused = obs_data_get_bool(obj, "pause");
-		break;
-	case PauseStateSaveBehavior::PAUSE:
-		_paused = true;
-		break;
-	case PauseStateSaveBehavior::UNPAUSE:
-		_paused = false;
-		break;
-	default:
-		_paused = obs_data_get_bool(obj, "pause");
-		break;
-	}
-	_runInParallel = obs_data_get_bool(obj, "parallel");
-	_performActionsOnChange = obs_data_get_bool(obj, "onChange");
-	_skipExecOnStart = obs_data_get_bool(obj, "skipExecOnStart");
-	_stopActionsIfNotDone = obs_data_get_bool(obj, "stopActionsIfNotDone");
-	_useShortCircuitEvaluation =
-		obs_data_get_bool(obj, "useShortCircuitEvaluation");
-	_useCustomConditionCheckInterval =
-		obs_data_get_bool(obj, "useCustomConditionCheckInterval");
-	_customConditionCheckInterval.Load(obj, "customConditionCheckInterval");
-
 	LoadDockSettings(obj);
 
 	LoadSplitterPos(_actionConditionSplitterPosition, obj,
@@ -834,7 +702,7 @@ bool Macro::Load(obs_data_t *obj)
 			_conditions.emplace_back(newEntry);
 			auto c = _conditions.back().get();
 			c->Load(arrayObj);
-			c->ValidateLogicSelection(root, Name().c_str());
+			setValidLogic(c, root, _name);
 		} else {
 			blog(LOG_WARNING,
 			     "discarding condition entry with unknown id (%s) for macro %s",
@@ -880,8 +748,6 @@ bool Macro::Load(obs_data_t *obj)
 	}
 	UpdateElseActionIndices();
 
-	_inputVariables.Load(obj);
-
 	return true;
 }
 
@@ -953,10 +819,10 @@ void Macro::ResetUIHelpers()
 {
 	_onPreventedActionExecution = false;
 	for (auto c : _conditions) {
-		c->GetHighlightAndReset();
+		c->Highlight();
 	}
 	for (auto a : _actions) {
-		a->GetHighlightAndReset();
+		a->Highlight();
 	}
 }
 
@@ -979,10 +845,14 @@ bool Macro::PauseHotkeysEnabled() const
 	return _registerHotkeys;
 }
 
-void Macro::SaveDockSettings(obs_data_t *obj, bool saveForCopy) const
+void Macro::SaveDockSettings(obs_data_t *obj) const
 {
 	auto dockSettings = obs_data_create();
 	obs_data_set_bool(dockSettings, "register", _registerDock);
+	// The object name is used to restore the position of the dock
+	if (_registerDock) {
+		SetDockWidgetName();
+	}
 	obs_data_set_bool(dockSettings, "hasRunButton", _dockHasRunButton);
 	obs_data_set_bool(dockSettings, "hasPauseButton", _dockHasPauseButton);
 	obs_data_set_bool(dockSettings, "hasStatusLabel", _dockHasStatusLabel);
@@ -995,14 +865,18 @@ void Macro::SaveDockSettings(obs_data_t *obj, bool saveForCopy) const
 				       "conditionsTrueStatusText");
 	_conditionsFalseStatusText.Save(dockSettings,
 					"conditionsFalseStatusText");
-	if (saveForCopy) {
-		auto uuid = GenerateDockId();
-		obs_data_set_string(dockSettings, "dockId", uuid.c_str());
-
-	} else {
-		obs_data_set_string(dockSettings, "dockId", _dockId.c_str());
+	if (_dock) {
+		auto window = static_cast<QMainWindow *>(
+			obs_frontend_get_main_window());
+		obs_data_set_bool(dockSettings, "isFloating",
+				  _dock->isFloating());
+		obs_data_set_bool(dockSettings, "isVisible", DockIsVisible());
+		obs_data_set_int(dockSettings, "area",
+				 window->dockWidgetArea(_dock));
+		obs_data_set_string(
+			dockSettings, "geometry",
+			_dock->saveGeometry().toBase64().constData());
 	}
-	obs_data_set_int(dockSettings, "version", 1);
 	obs_data_set_obj(obj, "dockSettings", dockSettings);
 	obs_data_release(dockSettings);
 }
@@ -1019,13 +893,8 @@ void Macro::LoadDockSettings(obs_data_t *obj)
 		return;
 	}
 
-	if (!obs_data_has_user_value(dockSettings, "version")) {
-		_dockId = std::string("ADVSS-") + _name;
-	} else {
-		_dockId = obs_data_get_string(dockSettings, "dockId");
-	}
-
 	const bool dockEnabled = obs_data_get_bool(dockSettings, "register");
+	_dockIsVisible = obs_data_get_bool(dockSettings, "isVisible");
 
 	// TODO: remove these default settings in a future version
 	obs_data_set_default_string(
@@ -1053,6 +922,15 @@ void Macro::LoadDockSettings(obs_data_t *obj)
 			obs_data_get_bool(dockSettings, "hasStatusLabel");
 		_dockHighlight = obs_data_get_bool(dockSettings,
 						   "highlightIfConditionsTrue");
+		_dockIsFloating = obs_data_get_bool(dockSettings, "isFloating");
+		_dockArea = static_cast<Qt::DockWidgetArea>(
+			obs_data_get_int(dockSettings, "area"));
+		auto geometryStr =
+			obs_data_get_string(dockSettings, "geometry");
+		if (geometryStr && strlen(geometryStr)) {
+			_dockGeo =
+				QByteArray::fromBase64(QByteArray(geometryStr));
+		}
 	}
 	EnableDock(dockEnabled);
 	obs_data_release(dockSettings);
@@ -1060,29 +938,47 @@ void Macro::LoadDockSettings(obs_data_t *obj)
 
 void Macro::EnableDock(bool value)
 {
+	if (_registerDock == value) {
+		return;
+	}
+
 	// Reset dock regardless
 	RemoveDock();
 
-	if (!value) {
+	// Unregister dock
+	if (_registerDock) {
+		_dockIsFloating = true;
+		_dockGeo = QByteArray();
 		_registerDock = value;
 		return;
 	}
 
-	_dock = new MacroDock(GetWeakMacroByName(_name.c_str()), _runButtonText,
-			      _pauseButtonText, _unpauseButtonText,
-			      _conditionsTrueStatusText,
+	// Create new dock widget
+	auto window =
+		static_cast<QMainWindow *>(obs_frontend_get_main_window());
+	_dock = new MacroDock(GetWeakMacroByName(_name.c_str()), window,
+			      _runButtonText, _pauseButtonText,
+			      _unpauseButtonText, _conditionsTrueStatusText,
 			      _conditionsFalseStatusText, _dockHighlight);
+	SetDockWidgetName(); // Used by OBS to restore position
 
-	if (!obs_frontend_add_dock_by_id(_dockId.c_str(), _name.c_str(),
-					 _dock)) {
-		blog(LOG_INFO, "failed to add macro dock for macro %s",
-		     _name.c_str());
-		_dock->deleteLater();
-		_dock = nullptr;
-		_registerDock = false;
-		return;
+	// Register new dock
+	_dockAction = static_cast<QAction *>(obs_frontend_add_dock(_dock));
+
+	// Note that OBSBasic::OBSInit() has precedence over the visibility and
+	// geometry set here.
+	// The function calls here are only intended to attempt to restore the
+	// dock status when switching scene collections.
+	if (InitialLoadIsComplete()) {
+		_dock->setVisible(_dockIsVisible);
+		if (window->dockWidgetArea(_dock) != _dockArea) {
+			window->addDockWidget(_dockArea, _dock);
+		}
+		if (_dock->isFloating() != _dockIsFloating) {
+			_dock->setFloating(_dockIsFloating);
+		}
+		_dock->restoreGeometry(_dockGeo);
 	}
-
 	_registerDock = value;
 }
 
@@ -1179,22 +1075,28 @@ StringVariable Macro::ConditionsFalseStatusText() const
 
 void Macro::RemoveDock()
 {
-	obs_frontend_remove_dock(_dockId.c_str());
-	_dock = nullptr;
+	if (_dock) {
+		_dock->close();
+		_dock->deleteLater();
+		_dockAction->deleteLater();
+		_dock = nullptr;
+		_dockAction = nullptr;
+	}
 }
 
-std::string Macro::GenerateDockId()
+void Macro::SetDockWidgetName() const
 {
-#if LIBOBS_API_VER > MAKE_SEMANTIC_VERSION(30, 0, 0)
-	auto uuid = os_generate_uuid();
-	auto id = std::string("advss-macro-dock-") + std::string(uuid);
-	bfree(uuid);
-	return id;
+	if (!_dock) {
+		return;
+	}
+	// Set prefix to avoid dock name conflict
+	_dock->setObjectName("ADVSS-" + QString::fromStdString(_name));
+	_dock->SetName(QString::fromStdString(_name));
 
-#else
-	static std::atomic_int16_t idCounter = 0;
-	return std::to_string(++idCounter);
-#endif
+	if (!_dockAction) {
+		return;
+	}
+	_dockAction->setText(QString::fromStdString(_name));
 }
 
 static void pauseCB(void *data, obs_hotkey_id, obs_hotkey_t *, bool pressed)
@@ -1359,15 +1261,7 @@ bool CheckMacros()
 {
 	bool matchFound = false;
 	for (const auto &m : macros) {
-		if (!m->ConditionsShouldBeChecked()) {
-			vblog(LOG_INFO,
-			      "skipping condition check for macro \"%s\" "
-			      "(custom check interval)",
-			      m->Name().c_str());
-			continue;
-		}
-
-		if (m->CheckConditions() || m->ElseActions().size() > 0) {
+		if (m->CeckMatch() || m->ElseActions().size() > 0) {
 			matchFound = true;
 			// This has to be performed here for now as actions are
 			// not performed immediately after checking conditions.
@@ -1413,7 +1307,7 @@ bool RunMacros()
 			continue;
 		}
 		vblog(LOG_INFO, "running macro: %s", m->Name().c_str());
-		if (!m->PerformActions(m->ConditionsMatched())) {
+		if (!m->PerformActions(m->Matched())) {
 			blog(LOG_WARNING, "abort macro: %s", m->Name().c_str());
 		}
 	}
@@ -1464,27 +1358,4 @@ void InvalidateMacroTempVarValues()
 	}
 }
 
-std::shared_ptr<Macro> GetMacroWithInvalidConditionInterval()
-{
-	if (macros.empty()) {
-		return {};
-	}
-
-	for (const auto &macro : macros) {
-		if (!macro) {
-			continue;
-		}
-		if (!macro->CustomConditionCheckIntervalEnabled()) {
-			continue;
-		}
-
-		if (macro->GetCustomConditionCheckInterval().Milliseconds() <
-		    GetIntervalValue()) {
-			return macro;
-		}
-	}
-
-	return {};
-}
-
 } // namespace advss

lib/macro/macro.hpp

@@ -2,7 +2,6 @@
 #include "macro-action.hpp"
 #include "macro-condition.hpp"
 #include "macro-helpers.hpp"
-#include "macro-input.hpp"
 #include "macro-ref.hpp"
 #include "variable-string.hpp"
 #include "temp-variable.hpp"
@@ -22,65 +21,39 @@ namespace advss {
 class MacroDock;
 
 class Macro {
-	using TimePoint = std::chrono::high_resolution_clock::time_point;
-
 public:
-	enum class PauseStateSaveBehavior { PERSIST, PAUSE, UNPAUSE };
+	Macro(const std::string &name = "", const bool addHotkey = false);
+	virtual ~Macro();
 
-	Macro(const std::string &name = "", const bool addHotkey = false,
-	      const bool shortCircuitEvaluation = false);
-	~Macro();
-
-	std::string Name() const { return _name; }
-	void SetName(const std::string &name);
-
-	bool CheckConditions(bool ignorePause = false);
-	bool ConditionsMatched() const { return _matched; }
-	TimePoint LastConditionCheckTime() const { return _lastCheckTime; }
-	bool ConditionsShouldBeChecked() const;
-
-	bool ShouldRunActions() const;
+	bool CeckMatch();
 	bool PerformActions(bool match, bool forceParallel = false,
 			    bool ignorePause = false);
-
-	void SetPaused(bool pause = true);
-	bool Paused() const { return _paused; }
-	bool WasPausedSince(const TimePoint &) const;
-
-	void SetPauseStateSaveBehavior(PauseStateSaveBehavior);
-	PauseStateSaveBehavior GetPauseStateSaveBehavior() const;
-
-	void Stop();
-	bool GetStop() const { return _stop; }
-	void ResetTimers();
-
-	void SetMatchOnChange(bool onChange);
-	bool MatchOnChange() const { return _performActionsOnChange; }
-
-	void SetSkipExecOnStart(bool skip) { _skipExecOnStart = skip; }
-	bool SkipExecOnStart() const { return _skipExecOnStart; }
-
-	void SetStopActionsIfNotDone(bool stopActionsIfNotDone);
-	bool StopActionsIfNotDone() const { return _stopActionsIfNotDone; }
-
-	void SetShortCircuitEvaluation(bool useShortCircuitEvaluation);
-	bool ShortCircuitEvaluationEnabled() const;
-
-	void SetCustomConditionCheckIntervalEnabled(bool enable);
-	bool CustomConditionCheckIntervalEnabled() const;
-	void SetCustomConditionCheckInterval(const Duration &);
-	Duration GetCustomConditionCheckInterval() const;
-
-	int RunCount() const { return _runCount; };
-	void ResetRunCount() { _runCount = 0; };
-
-	void AddHelperThread(std::thread &&);
+	bool Matched() const { return _matched; }
+	bool ShouldRunActions() const;
+	int64_t MsSinceLastCheck() const;
+	std::string Name() const { return _name; }
+	void SetName(const std::string &name);
 	void SetRunInParallel(bool parallel) { _runInParallel = parallel; }
 	bool RunInParallel() const { return _runInParallel; }
-
-	// Input variables
-	MacroInputVariables GetInputVariables() const;
-	void SetInputVariables(const MacroInputVariables &);
+	void SetPaused(bool pause = true);
+	bool Paused() const { return _paused; }
+	bool WasPausedSince(
+		const std::chrono::high_resolution_clock::time_point &) const;
+	void SetMatchOnChange(bool onChange);
+	bool MatchOnChange() const { return _performActionsOnChange; }
+	void SetSkipExecOnStart(bool skip) { _skipExecOnStart = skip; }
+	bool SkipExecOnStart() const { return _skipExecOnStart; }
+	void SetStopActionsIfNotDone(bool stopActionsIfNotDone)
+	{
+		_stopActionsIfNotDone = stopActionsIfNotDone;
+	}
+	bool StopActionsIfNotDone() const { return _stopActionsIfNotDone; }
+	int RunCount() const { return _runCount; };
+	void ResetRunCount() { _runCount = 0; };
+	void ResetTimers();
+	void AddHelperThread(std::thread &&);
+	bool GetStop() const { return _stop; }
+	void Stop();
 
 	// Temporary variable helpers
 	std::vector<TempVariable> GetTempVars(MacroSegment *filter) const;
@@ -115,7 +88,7 @@ public:
 	std::shared_ptr<Macro> Parent() const;
 
 	// Saving and loading
-	bool Save(obs_data_t *obj, bool saveForCopy = false) const;
+	bool Save(obs_data_t *obj) const;
 	bool Load(obs_data_t *obj);
 	// Some macros can refer to other macros, which are not yet loaded.
 	// Use this function to set these references after loading is complete.
@@ -125,20 +98,19 @@ public:
 	bool SwitchesScene() const;
 
 	// UI helpers
-	void SetActionConditionSplitterPosition(const QList<int>);
 	const QList<int> &GetActionConditionSplitterPosition() const;
-	void SetElseActionSplitterPosition(const QList<int>);
+	void SetActionConditionSplitterPosition(const QList<int>);
 	const QList<int> &GetElseActionSplitterPosition() const;
+	void SetElseActionSplitterPosition(const QList<int>);
 	bool HasValidSplitterPositions() const;
-	bool WasExecutedSince(const TimePoint &) const;
+	bool WasExecutedSince(
+		const std::chrono::high_resolution_clock::time_point &) const;
 	bool OnChangePreventedActionsRecently();
 	void ResetUIHelpers();
 
-	// Hotkeys
 	void EnablePauseHotkeys(bool);
 	bool PauseHotkeysEnabled() const;
 
-	// Docks
 	void EnableDock(bool);
 	bool DockEnabled() const { return _registerDock; }
 	void SetDockHasRunButton(bool value);
@@ -165,27 +137,25 @@ private:
 	void ClearHotkeys() const;
 	void SetHotkeysDesc() const;
 
-	bool
-	CheckConditionHelper(const std::shared_ptr<MacroCondition> &) const;
-
 	bool RunActionsHelper(
 		const std::deque<std::shared_ptr<MacroAction>> &actions,
 		bool ignorePause);
 	bool RunActions(bool ignorePause);
 	bool RunElseActions(bool ignorePause);
 
-	void SaveDockSettings(obs_data_t *obj, bool saveForCopy) const;
+	bool DockIsVisible() const;
+	void SetDockWidgetName() const;
+	void SaveDockSettings(obs_data_t *obj) const;
 	void LoadDockSettings(obs_data_t *obj);
 	void RemoveDock();
-	static std::string GenerateDockId();
 
 	std::string _name = "";
 	bool _die = false;
 	bool _stop = false;
 	bool _done = true;
-	TimePoint _lastCheckTime{};
-	TimePoint _lastUnpauseTime{};
-	TimePoint _lastExecutionTime{};
+	std::chrono::high_resolution_clock::time_point _lastCheckTime{};
+	std::chrono::high_resolution_clock::time_point _lastUnpauseTime{};
+	std::chrono::high_resolution_clock::time_point _lastExecutionTime{};
 	std::thread _backgroundThread;
 	std::vector<std::thread> _helperThreads;
 
@@ -198,14 +168,10 @@ private:
 	bool _isGroup = false;
 	bool _isCollapsed = false;
 
-	bool _useShortCircuitEvaluation = false;
-	bool _useCustomConditionCheckInterval = false;
-	Duration _customConditionCheckInterval = 0.3;
-	bool _conditionSateChanged = false;
-
 	bool _runInParallel = false;
 	bool _matched = false;
 	bool _lastMatched = false;
+	bool _conditionSateChanged = false;
 	bool _performActionsOnChange = true;
 	bool _skipExecOnStart = false;
 	bool _stopActionsIfNotDone = false;
@@ -216,11 +182,6 @@ private:
 	obs_hotkey_id _unpauseHotkey = OBS_INVALID_HOTKEY_ID;
 	obs_hotkey_id _togglePauseHotkey = OBS_INVALID_HOTKEY_ID;
 
-	PauseStateSaveBehavior _pauseSaveBehavior =
-		PauseStateSaveBehavior::PERSIST;
-
-	MacroInputVariables _inputVariables;
-
 	// UI helpers
 	bool _onPreventedActionExecution = false;
 
@@ -242,8 +203,12 @@ private:
 		obs_module_text("AdvSceneSwitcher.macroDock.statusLabel.true");
 	StringVariable _conditionsFalseStatusText =
 		obs_module_text("AdvSceneSwitcher.macroDock.statusLabel.false");
+	bool _dockIsFloating = true;
+	bool _dockIsVisible = false;
+	Qt::DockWidgetArea _dockArea;
+	QByteArray _dockGeo;
 	MacroDock *_dock = nullptr;
-	std::string _dockId = GenerateDockId();
+	QAction *_dockAction = nullptr;
 };
 
 void LoadMacros(obs_data_t *obj);
@@ -256,6 +221,5 @@ Macro *GetMacroByName(const char *name);
 Macro *GetMacroByQString(const QString &name);
 std::weak_ptr<Macro> GetWeakMacroByName(const char *name);
 void InvalidateMacroTempVarValues();
-std::shared_ptr<Macro> GetMacroWithInvalidConditionInterval();
 
 } // namespace advss

lib/queue/action-queue-tab.cpp

@@ -11,16 +11,19 @@
 
 namespace advss {
 
+static bool registerTab();
 static void setupTab(QTabWidget *);
+static bool registerTabDone = registerTab();
 
 static ActionQueueTable *tabWidget = nullptr;
 
-void RegisterActionQueueTab()
+static bool registerTab()
 {
 	AddPluginInitStep([]() {
 		AddSetupTabCallback("actionQueueTab", ActionQueueTable::Create,
 				    setupTab);
 	});
+	return true;
 }
 
 static void setTabVisible(QTabWidget *tabWidget, bool visible)
@@ -67,11 +70,11 @@ static QStringList getCellLabels(ActionQueue *queue, bool addName = true)
 	       << QString::fromStdString(obs_module_text(
 			  queue->IsRunning()
 				  ? "AdvSceneSwitcher.actionQueueTab.yes"
-				  : "AdvSceneSwitcher.actionQueueTab.no"))
+				  : "AdvSceneSwitcher.actionQueueTab.yes"))
 	       << QString::fromStdString(obs_module_text(
 			  queue->RunsOnStartup()
 				  ? "AdvSceneSwitcher.actionQueueTab.yes"
-				  : "AdvSceneSwitcher.actionQueueTab.no"));
+				  : "AdvSceneSwitcher.actionQueueTab.yes"));
 	return result;
 }
 
@@ -220,15 +223,14 @@ static void setupTab(QTabWidget *tab)
 	}
 
 	QWidget::connect(ActionQueueSignalManager::Instance(),
-			 &ActionQueueSignalManager::Rename, tab,
+			 &ActionQueueSignalManager::Rename,
 			 [](const QString &oldName, const QString &newName) {
 				 RenameItemTableRow(tabWidget->Table(), oldName,
 						    newName);
 			 });
 	QWidget::connect(
 		ActionQueueSignalManager::Instance(),
-		&ActionQueueSignalManager::Add, tab,
-		[tab](const QString &name) {
+		&ActionQueueSignalManager::Add, [tab](const QString &name) {
 			AddItemTableRow(
 				tabWidget->Table(),
 				getCellLabels(GetWeakActionQueueByQString(name)
@@ -239,7 +241,7 @@ static void setupTab(QTabWidget *tab)
 			setTabVisible(tab, true);
 		});
 	QWidget::connect(ActionQueueSignalManager::Instance(),
-			 &ActionQueueSignalManager::Remove, tab,
+			 &ActionQueueSignalManager::Remove,
 			 [](const QString &name) {
 				 RemoveItemTableRow(tabWidget->Table(), name);
 				 if (tabWidget->Table()->rowCount() == 0) {