Update locale of "cooldown" and "no match" behaviour

New users will be confused if their macros are not executed,
if they are "blocked" by other scene switching methods.

.github/workflows/build-debian.yml

@@ -0,0 +1,49 @@
+name: debian-build
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
+    - name: check_libobs_revision
+      run: |
+           sudo apt update
+           sudo apt install libobs-dev
+           mkdir source
+           cd source
+           dpkg -l libobs-dev | tr -s " "| grep libobs | cut -d" " -f3 > libobs.rev
+    - name: install_frontend_header
+      run: |
+           [ -e /usr/include/obs/obs-frontend-api.h ] && { echo "ERROR: obs-frontend-api.h already in system. Maybe the package libobs-dev is installing it."; exit 1; }
+           cd source
+           LIBOBSREV=$(cat libobs.rev)
+           sudo apt update
+           sudo apt install devscripts
+           dget -u http://archive.ubuntu.com/ubuntu/pool/universe/o/obs-studio/obs-studio_$LIBOBSREV.dsc
+           cd ..
+           sudo find -name obs-frontend-api.h -exec cp {} /usr/include/obs/ \;
+           egrep '#include <obs.h>' /usr/include/obs/obs-frontend-api.h || { echo "ERROR: check if the sed commands are needed from now."; exit 1; }
+           sudo sed -i 's/#include <obs.h>/#include <obs\/obs.h>/' /usr/include/obs/obs-frontend-api.h
+           sudo sed -i 's/#include <util\/darray.h>/#include <obs\/util\/darray.h>/' /usr/include/obs/obs-frontend-api.h
+    - name: create_tarball
+      run: |
+           cd ..
+           tar --exclude=.git -cvzf obs-scene-switcher_0.1+testonly.orig.tar.gz SceneSwitcher
+    - name: create_debian_dir
+      run: |
+           cp -a CI/linux/debian .
+    - name: install_dependencies
+      run: |
+           # devscripts and libobs-dev are needed but they were already installed
+           # from check_libobs_revision and install_frontend_header sections.
+           sudo apt update
+           sudo apt install cmake debhelper libcurl4-openssl-dev libxss-dev libxtst-dev qtbase5-dev libopencv-dev libprocps-dev
+    - name: build
+      run: |
+           debuild --no-lintian --no-sign

.github/workflows/build.yml

@@ -1,14 +1,11 @@
 name: build obs plugin
 
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+on: [push, pull_request, workflow_dispatch]
 
 env:
   PLUGIN_NAME: SceneSwitcher
   LIB_NAME: advanced-scene-switcher
+  OBS_TAG: 27.1.3
 
 jobs:
   macos64:
@@ -23,6 +20,7 @@ jobs:
         with:
           repository: obsproject/obs-studio
           submodules: 'recursive'
+          ref: 'refs/tags/${{ env.OBS_TAG }}'
       - name: "Checkout plugin"
         uses: actions/checkout@v2.3.4
         with:
@@ -57,6 +55,15 @@ jobs:
           curl -L -O https://github.com/obsproject/obs-deps/releases/download/${{ env.MACOS_DEPS_VERSION }}/macos-qt-${{ env.QT_VERSION }}-${{ env.MACOS_DEPS_VERSION }}.tar.gz
           tar -xf ./macos-qt-${{ env.QT_VERSION }}-${{ env.MACOS_DEPS_VERSION }}.tar.gz -C "/tmp"
           xattr -r -d com.apple.quarantine /tmp/obsdeps
+      - name: 'Build prerequisite: OpenCV'
+        shell: bash
+        run: |
+          cd UI/frontend-plugins/${{ env.PLUGIN_NAME }}/deps/opencv
+          mkdir build
+          cd build
+          cmake -DBUILD_LIST="core,imgproc,objdetect" ..
+          make -j4
+          make install
       - name: Configure
         shell: bash
         run: |
@@ -104,13 +111,14 @@ jobs:
           path: ./nightly/*.pkg
   ubuntu64:
     name: 'Linux/Ubuntu 64-bit'
-    runs-on: [ubuntu-18.04]
+    runs-on: [ubuntu-latest]
     steps:
       - name: Checkout
         uses: actions/checkout@v2.3.4
         with:
           repository: obsproject/obs-studio
           submodules: 'recursive'
+          ref: 'refs/tags/${{ env.OBS_TAG }}'
       - name: "Checkout plugin"
         uses: actions/checkout@v2.3.4
         with:
@@ -168,7 +176,11 @@ jobs:
            qtbase5-private-dev \
            libqt5svg5-dev \
            swig \
-           libxss-dev
+           libxss-dev \
+           libx11-xcb-dev \
+           libxcb-xfixes0-dev \
+           libopencv-dev \
+           libprocps-dev
       - name: 'Configure'
         shell: bash
         run: |
@@ -186,6 +198,7 @@ jobs:
           FILE_NAME=${{ env.PLUGIN_NAME }}-$FILE_DATE-${{ github.sha }}-linux64.tar.gz
           echo "FILE_NAME=${FILE_NAME}" >> $GITHUB_ENV
           mkdir -p ./${{ env.LIB_NAME }}/bin/64bit/
+          strip -d ./build/UI/frontend-plugins/${{ env.PLUGIN_NAME }}/${{ env.LIB_NAME }}.so
           mv ./build/UI/frontend-plugins/${{ env.PLUGIN_NAME }}/${{ env.LIB_NAME }}.so ./${{ env.LIB_NAME }}/bin/64bit/${{ env.LIB_NAME }}.so
           mv ./UI/frontend-plugins/${{ env.PLUGIN_NAME }}/data ./${{ env.LIB_NAME }}/data
           tar -cvzf "${FILE_NAME}" ${{ env.LIB_NAME }}
@@ -197,6 +210,9 @@ jobs:
   windows:
     name: Windows
     runs-on: [windows-latest]
+    strategy:
+      matrix:
+        arch: [32, 64]
     env:
       QT_VERSION: 5.10.1
       CMAKE_GENERATOR: "Visual Studio 16 2019"
@@ -210,6 +226,7 @@ jobs:
         with:
           repository: obsproject/obs-studio
           submodules: 'recursive'
+          ref: 'refs/tags/${{ env.OBS_TAG }}'
       - name: Checkout plugin
         uses: actions/checkout@v2.3.4
         with:
@@ -228,53 +245,97 @@ jobs:
         run: |
           curl -kLO https://cdn-fastly.obsproject.com/downloads/dependencies${{ env.WINDOWS_DEPS_VERSION }}.zip -f --retry 5 -C -
           7z x dependencies${{ env.WINDOWS_DEPS_VERSION }}.zip -o"${{ github.workspace }}/cmbuild/deps"
+      - name: 'Build prerequisite: OpenCV'
+        run: |
+          cd UI/frontend-plugins/${{ env.PLUGIN_NAME }}/deps/opencv
+          mkdir build
+          cd build
+          if ( ${{ matrix.arch }} -eq 32 )
+          {
+            cmake -G"${{ env.CMAKE_GENERATOR }}" -A"Win32" -DBUILD_LIST="core,imgproc,objdetect" ..
+          }
+          else
+          {
+            cmake -G"${{ env.CMAKE_GENERATOR }}" -A"x64" -DBUILD_LIST="core,imgproc,objdetect" ..
+          }
+          msbuild /m /p:Configuration=Release OpenCV.sln
+          msbuild INSTALL.vcxproj
       - name: Configure
         run: |
           mkdir ./package
-          mkdir ./build32
-          cd ./build32
-          cmake -G"${{ env.CMAKE_GENERATOR }}" -A"Win32" -DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" -DBUILD_BROWSER=false -DBUILD_CAPTIONS=false -DCOMPILE_D3D12_HOOK=false -DDepsPath="${{ github.workspace }}/cmbuild/deps/win32" -DQTDIR="${{ github.workspace }}/cmbuild/QT/${{ env.QT_VERSION }}/msvc2017" -DCOPIED_DEPENDENCIES=FALSE -DCOPY_DEPENDENCIES=TRUE ..
-          cd ..
-          mkdir ./build64
-          cd ./build64
-          cmake -G"${{ env.CMAKE_GENERATOR }}" -A"x64" -DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" -DBUILD_BROWSER=false -DBUILD_CAPTIONS=false -DCOMPILE_D3D12_HOOK=false -DDepsPath="${{ github.workspace }}/cmbuild/deps/win64" -DQTDIR="${{ github.workspace }}/cmbuild/QT/${{ env.QT_VERSION }}/msvc2017_64" -DCOPIED_DEPENDENCIES=FALSE -DCOPY_DEPENDENCIES=TRUE ..
+          mkdir ./build${{ matrix.arch }}
+          cd ./build${{ matrix.arch }}
+          Get-Location
+          if ( ${{ matrix.arch }} -eq 32 )
+          {
+            cmake -G"${{ env.CMAKE_GENERATOR }}" -A"Win32" -DOpenCV_DIR="${{ github.workspace }}/UI/frontend-plugins/SceneSwitcher/deps/opencv/build/" -DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" -DBUILD_BROWSER=false -DBUILD_CAPTIONS=false -DCOMPILE_D3D12_HOOK=false -DDepsPath="${{ github.workspace }}/cmbuild/deps/win32" -DQTDIR="${{ github.workspace }}/cmbuild/QT/${{ env.QT_VERSION }}/msvc2017" -DCOPIED_DEPENDENCIES=FALSE -DCOPY_DEPENDENCIES=TRUE ..
+          }
+          else
+          {
+            cmake -G"${{ env.CMAKE_GENERATOR }}" -A"x64" -DOpenCV_DIR="${{ github.workspace }}/UI/frontend-plugins/SceneSwitcher/deps/opencv/build/" -DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" -DBUILD_BROWSER=false -DBUILD_CAPTIONS=false -DCOMPILE_D3D12_HOOK=false -DDepsPath="${{ github.workspace }}/cmbuild/deps/win64" -DQTDIR="${{ github.workspace }}/cmbuild/QT/${{ env.QT_VERSION }}/msvc2017_64" -DCOPIED_DEPENDENCIES=FALSE -DCOPY_DEPENDENCIES=TRUE ..
+          }
       - name: Build
         run: |
-          msbuild /m /p:Configuration=RelWithDebInfo .\build32\obs-studio.sln
-          msbuild /m /p:Configuration=RelWithDebInfo .\build64\obs-studio.sln
+          msbuild /m /p:Configuration=RelWithDebInfo .\build${{ matrix.arch }}\obs-studio.sln
       - name: Package
         if: success()
         run: |
           $env:FILE_DATE=(Get-Date -UFormat "%F")
           $env:FILE_NAME="${{ env.PLUGIN_NAME }}-${env:FILE_DATE}-${{ github.sha }}-windows"
           echo "FILE_NAME=${env:FILE_NAME}" >> ${env:GITHUB_ENV}
-          robocopy .\build32\rundir\RelWithDebInfo\obs-plugins\32bit\ .\package\obs-plugins\32bit ${{ env.LIB_NAME }}.* /E /XF .gitignore
-          robocopy .\build64\rundir\RelWithDebInfo\obs-plugins\64bit\ .\package\obs-plugins\64bit ${{ env.LIB_NAME }}.* /E /XF .gitignore
-          robocopy .\build64\rundir\RelWithDebInfo\data\obs-plugins\${{ env.LIB_NAME }}\ .\package\data\obs-plugins\${{ env.LIB_NAME }}\ /E /XF .gitignore
+          robocopy .\build${{ matrix.arch }}\rundir\RelWithDebInfo\obs-plugins\${{ matrix.arch }}bit\ .\package\obs-plugins\${{ matrix.arch }}bit ${{ env.LIB_NAME }}.* /E /XF .gitignore
+          robocopy .\build${{ matrix.arch }}\rundir\RelWithDebInfo\data\obs-plugins\${{ env.LIB_NAME }}\ .\package\data\obs-plugins\${{ env.LIB_NAME }}\ /E /XF .gitignore
+          cp UI/frontend-plugins/${{ env.PLUGIN_NAME }}/deps/opencv/build/bin/Release/*dll package/obs-plugins/${{ matrix.arch }}bit
           exit 0
       - name: Publish zip
         if: success()
         uses: actions/upload-artifact@v2.2.1
         with:
-          name: '${{ env.FILE_NAME }}'
+          name: '${{ env.FILE_NAME }}-${{ matrix.arch }}bit'
           path: package/*
-      - name: "Package Installer (Prereqs)"
+  windows-installer:
+    needs: [windows]
+    name: 'Create Windows Installer'
+    runs-on: [windows-latest]
+    steps:
+      - name: "Checkout plugin"
+        uses: actions/checkout@v2.3.4
+      - name: Add msbuild to PATH
+        uses: microsoft/setup-msbuild@v1.0.2
+      - name: "Prepare innosetup"
+        run: |
+          curl "-kL" "https://files.jrsoftware.org/is/6/innosetup-6.0.3.exe" "-f" "--retry" "5" "-o" "inno.exe"
+          .\inno.exe /VERYSILENT /SP- /SUPPRESSMSGBOXES /NORESTART
+          mkdir build
+          cd build
+          cmake ..
+        continue-on-error: true
+      - name: Download artifacts
+        uses: actions/download-artifact@v2
+        with:
+          path: artifacts
+      - name: "Prepare package dir"
         run: |
           curl "-kL" "https://github.com/Xaymar/msvc-redist-helper/releases/download/0.1/msvc-redist-helper-64.exe" "-f" "--retry" "5" "-o" "msvc-redist-helper-64.exe"
           curl "-kL" "https://github.com/Xaymar/msvc-redist-helper/releases/download/0.1/msvc-redist-helper-32.exe" "-f" "--retry" "5" "-o" "msvc-redist-helper-32.exe"
-          curl "-kL" "https://files.jrsoftware.org/is/6/innosetup-6.0.3.exe" "-f" "--retry" "5" "-o" "inno.exe"
-          .\inno.exe /VERYSILENT /SP- /SUPPRESSMSGBOXES /NORESTART
-      - name: "Package Installer (Compile)"
+          $env:FILE_DATE=(Get-Date -UFormat "%F")
+          $env:FILE_NAME="${{ env.PLUGIN_NAME }}-${env:FILE_DATE}-${{ github.sha }}-windows"
+          echo "FILE_NAME=${env:FILE_NAME}" >> ${env:GITHUB_ENV}
+          mkdir package
+          cd package
+          cp -r ../artifacts/${env:FILE_NAME}-32bit/* .
+          cp -r ../artifacts/${env:FILE_NAME}-64bit/obs-plugins/* obs-plugins
+      - name: "Compile"
         run: |
-          & 'C:\Program Files (x86)\Inno Setup 6\ISCC.exe' /Qp ".\build64\UI\frontend-plugins\${{ env.PLUGIN_NAME }}\CI\windows\setup.iss"
-      - name: Publish installer
+          & 'C:\Program Files (x86)\Inno Setup 6\ISCC.exe' /Qp ".\build\CI\windows\setup.iss"
+      - name: "Publish"
         if: success()
         uses: actions/upload-artifact@v2.2.0
         with:
           name: '${{ env.FILE_NAME }}-installer'
-          path: build64/UI/frontend-plugins/SceneSwitcher/CI/windows/Output/*.exe
+          path: build/CI/windows/Output/*.exe
   release:
-    needs: [macos64, ubuntu64, windows]
+    needs: [macos64, ubuntu64, windows, windows-installer]
     name: 'Create Release'
     runs-on: [ubuntu-18.04]
     steps:
@@ -292,7 +353,8 @@ jobs:
           mkdir -p ${{ env.PLUGIN_NAME }}/Linux ${{ env.PLUGIN_NAME }}/MacOs ${{ env.PLUGIN_NAME }}/Windows
           tar xf artifacts/${{ env.PLUGIN_NAME }}*-linux64.tar.gz/${{ env.PLUGIN_NAME }}*-linux64.tar.gz -C ${{ env.PLUGIN_NAME }}/Linux/
           mv artifacts/${{ env.PLUGIN_NAME }}*-macos.pkg/${{ env.PLUGIN_NAME }}*-macos.pkg ${{ env.PLUGIN_NAME }}/MacOs/${{ env.PLUGIN_NAME }}.pkg
-          mv ./artifacts/${{ env.PLUGIN_NAME }}*-windows/* ${{ env.PLUGIN_NAME }}/Windows/
+          mv ./artifacts/${{ env.PLUGIN_NAME }}*-windows-32bit/* ${{ env.PLUGIN_NAME }}/Windows/
+          mv ./artifacts/${{ env.PLUGIN_NAME }}*-windows-64bit/obs-plugins/* ${{ env.PLUGIN_NAME }}/Windows/obs-plugins
           mv ./artifacts/${{ env.PLUGIN_NAME }}*-windows-installer/*.exe ${{ env.PLUGIN_NAME }}/Windows/
           rm ${{ env.PLUGIN_NAME }}/Windows/obs-plugins/32bit/advanced-scene-switcher.pdb
           rm ${{ env.PLUGIN_NAME }}/Windows/obs-plugins/64bit/advanced-scene-switcher.pdb

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "deps/websocketpp"]
 	path = deps/websocketpp
 	url = https://github.com/zaphoyd/websocketpp.git
+[submodule "deps/opencv"]
+	path = deps/opencv
+	url = https://github.com/opencv/opencv.git

BUILDING.md

@@ -16,7 +16,20 @@ git clone --recursive https://github.com/WarmUpTill/SceneSwitcher.git
 ```
 
 Then modify the obs-studio/UI/frontend-plugins/CMakeLists.txt file and add an entry for the scene switcher:
+```
 add_subdirectory(SceneSwitcher)
+```
+
+Now follow the [build instructions for obs-studio](https://obsproject.com/wiki/install-instructions) for your particular platform.
+
+Note that on Linux systems it might be necessary to additionally install the following packages to fulfill the dependencies to `XTest`, `XScreensaver` and `OpenCV` - exact command may differ:
+```
+sudo apt-get install \
+    libxtst-dev \
+    libxss-dev \
+    libopencv-dev
+```
+
 
 ## Compiling out of tree
 ### Prerequisites
@@ -41,7 +54,7 @@ code of OBS Studio, located at [source_directory]/libobs/.
 - **LIBOBS_FRONTEND_INCLUDE_DIR** (path) : location of the obs-frontend-api
 subfolder in the source code of OBS Studio, located at [source_directory]/UI/obs-frontend-api.
 
-- **CURL_LIB** (filepath) : location of the libcurl.lib file
+- **CURL_LIBRARY** (filepath) : location of the libcurl.lib file
 (part of the dependencies2019/win64/bin folder used to build OBS)
 - **CURL_INCLUDE_DIR** (path) : location of the curl
 subfolder in OBS dependencies folder: ".../dependencies2019/win64/include/"
@@ -55,6 +68,14 @@ Assuming that you set up Qt via QT installer:
 Just keep hitting configure until all the vars are filled out. Then hit generate.
 
 ### Linux
+Install dependencies `XTest`, `XScreensaver` and `OpenCV` - exact command may differ:
+```
+sudo apt-get install \
+    libxtst-dev \
+    libxss-dev \
+    libopencv-dev
+```
+
 Most versions of Linux you can use cmake-gui or the command line.
 
 **For the command line:**  

CI/linux/debian/changelog

@@ -0,0 +1,5 @@
+obs-scene-switcher (0.1+testonly) focal; urgency=medium
+
+  * Initial release (Closes: #123456)
+
+ -- Joao Eriberto Mota Filho <eriberto@debian.org>  Fri, 03 Sep 2021 11:39:52 -0300

CI/linux/debian/control

@@ -0,0 +1,22 @@
+Source: obs-scene-switcher
+Section: video
+Priority: optional
+Maintainer: Joao Eriberto Mota Filho <eriberto@debian.org>
+Build-Depends: cmake,
+               debhelper-compat (= 12),
+               libcurl4-openssl-dev,
+               libobs-dev,
+               libxtst-dev,
+               qtbase5-dev,
+               libxss-dev,
+               libopencv-dev
+Standards-Version: 4.6.0
+Homepage: https://obsproject.com/forum/resources/advanced-scene-switcher.395/
+Rules-Requires-Root: no
+
+Package: obs-scene-switcher
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: automated scene switcher for OBS Studio (plugin)
+ Advanced Scene Switcher is based on the built in scene switcher. It extends
+ its functionality by adding several features.

CI/linux/debian/copyright

@@ -0,0 +1,60 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: SceneSwitcher
+Upstream-Contact: https://github.com/WarmUpTill/SceneSwitcher/issues
+Source: https://github.com/WarmUpTill/SceneSwitcher
+
+Files: *
+Copyright: 2016-2021 WarmUpTill <WarmUpTill@web.de>
+License: GPL-2
+
+Files: cmake/GetGitRevisionDescription.cmake
+       cmake/GetGitRevisionDescription.cmake.in
+Copyright: 2009-2013 Iowa State University
+           2013-2020 Contributors
+           2013-2020 Ryan Pavlik
+License: BSL-1.0
+
+Files: debian/*
+Copyright: 2021 Joao Eriberto Mota Filho <eriberto@debian.org>
+License: BSL-1.0
+
+License: GPL-2
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+License: BSL-1.0
+ Boost Software License - Version 1.0 - August 17th, 2003
+ .
+ Permission is hereby granted, free of charge, to any person or organization
+ obtaining a copy of the software and accompanying documentation covered by
+ this license (the "Software") to use, reproduce, display, distribute,
+ execute, and transmit the Software, and to prepare derivative works of the
+ Software, and to permit third-parties to whom the Software is furnished to
+ do so, all subject to the following:
+ .
+ The copyright notices in the Software and this entire statement, including
+ the above license grant, this restriction and the following disclaimer,
+ must be included in all copies of the Software, in whole or in part, and
+ all derivative works of the Software, unless such copies or derivative
+ works are solely in the form of machine-executable object code generated by
+ a source language processor.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.

CI/linux/debian/rules

@@ -0,0 +1,16 @@
+#!/usr/bin/make -f
+#export DH_VERBOSE = 1
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+export QT_SELECT = qt5
+
+%:
+	dh $@
+
+
+	dh_auto_configure -- -DBUILD_OUT_OF_TREE=1 \
+                             -DLIBOBS_INCLUDE_DIR=/usr/include/obs \
+                             -DLIBOBS_LIB=/usr/lib/${DEB_TARGET_MULTIARCH}/libobs.so \
+                             -DLIBOBS_FRONTEND_INCLUDE_DIR=/usr/include/obs \
+                             -DLIBOBS_FRONTEND_API_LIB=/usr/lib/${DEB_TARGET_MULTIARCH}/libobs-frontend-api.so

CI/linux/debian/source/format

@@ -0,0 +1 @@
+3.0 (native)

CI/macos/SceneSwitcher.pkgproj

@@ -46,6 +46,294 @@
 																		<key>UID</key>
 																		<integer>0</integer>
 																	</dict>
+																	<dict>
+																		<key>CHILDREN</key>
+																		<array/>
+																		<key>GID</key>
+																		<integer>80</integer>
+																		<key>PATH</key>
+																		<string>../../deps/opencv/build/lib/libopencv_objdetect.4.5.3.dylib</string>
+																		<key>PATH_TYPE</key>
+																		<integer>3</integer>
+																		<key>PERMISSIONS</key>
+																		<integer>493</integer>
+																		<key>TYPE</key>
+																		<integer>3</integer>
+																		<key>UID</key>
+																		<integer>0</integer>
+																	</dict>
+																	<dict>
+																		<key>CHILDREN</key>
+																		<array/>
+																		<key>GID</key>
+																		<integer>80</integer>
+																		<key>PATH</key>
+																		<string>../../deps/opencv/build/lib/libopencv_features2d.4.5.dylib</string>
+																		<key>PATH_TYPE</key>
+																		<integer>3</integer>
+																		<key>PERMISSIONS</key>
+																		<integer>493</integer>
+																		<key>TYPE</key>
+																		<integer>3</integer>
+																		<key>UID</key>
+																		<integer>0</integer>
+																	</dict>
+																	<dict>
+																		<key>CHILDREN</key>
+																		<array/>
+																		<key>GID</key>
+																		<integer>80</integer>
+																		<key>PATH</key>
+																		<string>../../deps/opencv/build/lib/libopencv_core.4.5.dylib</string>
+																		<key>PATH_TYPE</key>
+																		<integer>3</integer>
+																		<key>PERMISSIONS</key>
+																		<integer>493</integer>
+																		<key>TYPE</key>
+																		<integer>3</integer>
+																		<key>UID</key>
+																		<integer>0</integer>
+																	</dict>
+																	<dict>
+																		<key>CHILDREN</key>
+																		<array/>
+																		<key>GID</key>
+																		<integer>80</integer>
+																		<key>PATH</key>
+																		<string>../../deps/opencv/build/lib/libopencv_calib3d.4.5.dylib</string>
+																		<key>PATH_TYPE</key>
+																		<integer>3</integer>
+																		<key>PERMISSIONS</key>
+																		<integer>493</integer>
+																		<key>TYPE</key>
+																		<integer>3</integer>
+																		<key>UID</key>
+																		<integer>0</integer>
+																	</dict>
+																	<dict>
+																		<key>CHILDREN</key>
+																		<array/>
+																		<key>GID</key>
+																		<integer>80</integer>
+																		<key>PATH</key>
+																		<string>../../deps/opencv/build/lib/libopencv_calib3d.4.5.3.dylib</string>
+																		<key>PATH_TYPE</key>
+																		<integer>3</integer>
+																		<key>PERMISSIONS</key>
+																		<integer>493</integer>
+																		<key>TYPE</key>
+																		<integer>3</integer>
+																		<key>UID</key>
+																		<integer>0</integer>
+																	</dict>
+																	<dict>
+																		<key>CHILDREN</key>
+																		<array/>
+																		<key>GID</key>
+																		<integer>80</integer>
+																		<key>PATH</key>
+																		<string>../../deps/opencv/build/lib/libopencv_imgproc.4.5.dylib</string>
+																		<key>PATH_TYPE</key>
+																		<integer>3</integer>
+																		<key>PERMISSIONS</key>
+																		<integer>493</integer>
+																		<key>TYPE</key>
+																		<integer>3</integer>
+																		<key>UID</key>
+																		<integer>0</integer>
+																	</dict>
+																	<dict>
+																		<key>CHILDREN</key>
+																		<array/>
+																		<key>GID</key>
+																		<integer>80</integer>
+																		<key>PATH</key>
+																		<string>../../deps/opencv/build/lib/libopencv_features2d.4.5.3.dylib</string>
+																		<key>PATH_TYPE</key>
+																		<integer>3</integer>
+																		<key>PERMISSIONS</key>
+																		<integer>493</integer>
+																		<key>TYPE</key>
+																		<integer>3</integer>
+																		<key>UID</key>
+																		<integer>0</integer>
+																	</dict>
+																	<dict>
+																		<key>CHILDREN</key>
+																		<array/>
+																		<key>GID</key>
+																		<integer>80</integer>
+																		<key>PATH</key>
+																		<string>../../deps/opencv/build/lib/libopencv_core.4.5.3.dylib</string>
+																		<key>PATH_TYPE</key>
+																		<integer>3</integer>
+																		<key>PERMISSIONS</key>
+																		<integer>493</integer>
+																		<key>TYPE</key>
+																		<integer>3</integer>
+																		<key>UID</key>
+																		<integer>0</integer>
+																	</dict>
+																	<dict>
+																		<key>CHILDREN</key>
+																		<array/>
+																		<key>GID</key>
+																		<integer>80</integer>
+																		<key>PATH</key>
+																		<string>../../deps/opencv/build/lib/libopencv_flann.4.5.dylib</string>
+																		<key>PATH_TYPE</key>
+																		<integer>3</integer>
+																		<key>PERMISSIONS</key>
+																		<integer>493</integer>
+																		<key>TYPE</key>
+																		<integer>3</integer>
+																		<key>UID</key>
+																		<integer>0</integer>
+																	</dict>
+																	<dict>
+																		<key>CHILDREN</key>
+																		<array/>
+																		<key>GID</key>
+																		<integer>80</integer>
+																		<key>PATH</key>
+																		<string>../../deps/opencv/build/lib/libopencv_calib3d.dylib</string>
+																		<key>PATH_TYPE</key>
+																		<integer>3</integer>
+																		<key>PERMISSIONS</key>
+																		<integer>493</integer>
+																		<key>TYPE</key>
+																		<integer>3</integer>
+																		<key>UID</key>
+																		<integer>0</integer>
+																	</dict>
+																	<dict>
+																		<key>CHILDREN</key>
+																		<array/>
+																		<key>GID</key>
+																		<integer>80</integer>
+																		<key>PATH</key>
+																		<string>../../deps/opencv/build/lib/libopencv_objdetect.dylib</string>
+																		<key>PATH_TYPE</key>
+																		<integer>3</integer>
+																		<key>PERMISSIONS</key>
+																		<integer>493</integer>
+																		<key>TYPE</key>
+																		<integer>3</integer>
+																		<key>UID</key>
+																		<integer>0</integer>
+																	</dict>
+																	<dict>
+																		<key>CHILDREN</key>
+																		<array/>
+																		<key>GID</key>
+																		<integer>80</integer>
+																		<key>PATH</key>
+																		<string>../../deps/opencv/build/lib/libopencv_imgproc.4.5.3.dylib</string>
+																		<key>PATH_TYPE</key>
+																		<integer>3</integer>
+																		<key>PERMISSIONS</key>
+																		<integer>493</integer>
+																		<key>TYPE</key>
+																		<integer>3</integer>
+																		<key>UID</key>
+																		<integer>0</integer>
+																	</dict>
+																	<dict>
+																		<key>CHILDREN</key>
+																		<array/>
+																		<key>GID</key>
+																		<integer>80</integer>
+																		<key>PATH</key>
+																		<string>../../deps/opencv/build/lib/libopencv_flann.dylib</string>
+																		<key>PATH_TYPE</key>
+																		<integer>3</integer>
+																		<key>PERMISSIONS</key>
+																		<integer>493</integer>
+																		<key>TYPE</key>
+																		<integer>3</integer>
+																		<key>UID</key>
+																		<integer>0</integer>
+																	</dict>
+																	<dict>
+																		<key>CHILDREN</key>
+																		<array/>
+																		<key>GID</key>
+																		<integer>80</integer>
+																		<key>PATH</key>
+																		<string>../../deps/opencv/build/lib/libopencv_imgproc.dylib</string>
+																		<key>PATH_TYPE</key>
+																		<integer>3</integer>
+																		<key>PERMISSIONS</key>
+																		<integer>493</integer>
+																		<key>TYPE</key>
+																		<integer>3</integer>
+																		<key>UID</key>
+																		<integer>0</integer>
+																	</dict>
+																	<dict>
+																		<key>CHILDREN</key>
+																		<array/>
+																		<key>GID</key>
+																		<integer>80</integer>
+																		<key>PATH</key>
+																		<string>../../deps/opencv/build/lib/libopencv_flann.4.5.3.dylib</string>
+																		<key>PATH_TYPE</key>
+																		<integer>3</integer>
+																		<key>PERMISSIONS</key>
+																		<integer>493</integer>
+																		<key>TYPE</key>
+																		<integer>3</integer>
+																		<key>UID</key>
+																		<integer>0</integer>
+																	</dict>
+																	<dict>
+																		<key>CHILDREN</key>
+																		<array/>
+																		<key>GID</key>
+																		<integer>80</integer>
+																		<key>PATH</key>
+																		<string>../../deps/opencv/build/lib/libopencv_features2d.dylib</string>
+																		<key>PATH_TYPE</key>
+																		<integer>3</integer>
+																		<key>PERMISSIONS</key>
+																		<integer>493</integer>
+																		<key>TYPE</key>
+																		<integer>3</integer>
+																		<key>UID</key>
+																		<integer>0</integer>
+																	</dict>
+																	<dict>
+																		<key>CHILDREN</key>
+																		<array/>
+																		<key>GID</key>
+																		<integer>80</integer>
+																		<key>PATH</key>
+																		<string>../../deps/opencv/build/lib/libopencv_core.dylib</string>
+																		<key>PATH_TYPE</key>
+																		<integer>3</integer>
+																		<key>PERMISSIONS</key>
+																		<integer>493</integer>
+																		<key>TYPE</key>
+																		<integer>3</integer>
+																		<key>UID</key>
+																		<integer>0</integer>
+																	</dict>
+																	<dict>
+																		<key>CHILDREN</key>
+																		<array/>
+																		<key>GID</key>
+																		<integer>80</integer>
+																		<key>PATH</key>
+																		<string>../../deps/opencv/build/lib/libopencv_objdetect.4.5.dylib</string>
+																		<key>PATH_TYPE</key>
+																		<integer>3</integer>
+																		<key>PERMISSIONS</key>
+																		<integer>493</integer>
+																		<key>TYPE</key>
+																		<integer>3</integer>
+																		<key>UID</key>
+																		<integer>0</integer>
+																	</dict>
 																</array>
 																<key>GID</key>
 																<integer>80</integer>

CI/release/README.txt

@@ -1,4 +1,4 @@
-Note that you will have to use OBS version 26.1 or newer!
+Note that you will have to use OBS version 27 or newer!
 
 --- Windows ---
 Recommended: Run the provided installer. (You might have to click 'More info' and select 'Run anyway' if it is blocked by Windows)
@@ -8,18 +8,25 @@ It is usually located at 'C:\Program Files (x86)\obs-studio\'.
 Remember to install the Visual C++ Redistributable for Visual Studio 2019, if you have not done so already. (See plugin overview page)
 
 --- macOS ---
-Recommended: Run the provided installer. (You might have to right-click or control-click and select 'open' if it is blocked)
-
-Alternatively extract the *so file and data folder and either ...
-
-... right-click the OBS app inside your Applications folder and choose 'Show Package Contents'.
-Copy the advanced-scene-switcher.so file to 'Contents/Plugins' and the 'data' folder to 'Contents/Resources'.
-
-... or copy the advanced-scene-switcher.so file to Library/Application Support/obs-studio/plugins/advanced-scene-switcher/bin/ .
-And the 'data' folder to 'Library/Application Support/obs-studio/plugins/advanced-scene-switcher/'.
+Run the provided installer. (You might have to right-click or control-click and select 'open' if it is blocked)
 
 --- Linux ---
-Copy the advanced-scene-switcher.so file and into the OBS Studio plugin folder.
+Note that the plugin has dependencies to:
+ * libXss
+ * libopencv-imgproc
+ * libopencv-objdetect
+Optional:
+ * libXtst
+ * libcurl
+
+If you are using snap you can install the following package for an OBS installation which comes bundled with the plugin:
+sudo snap install obs-studio
+
+The plugin is also available via the Flatpak package manager for users who installed OBS via Flatpak:
+flatpak install com.obsproject.Studio.Plugin.SceneSwitcher
+
+If you have installed OBS via other means, it is most likely necessary to install the plugin manually.
+To do so copy the advanced-scene-switcher.so file and into the OBS Studio plugin folder.
 The location of this folder can vary, so you might have to look around a bit.
 
 Examples are ...
@@ -30,13 +37,39 @@ Examples are ...
 ~/.local/share/flatpak/app/com.obsproject.Studio/x86_64/stable/active/files/lib/obs-plugins/
 /var/lib/flatpak/app/com.obsproject.Studio/x86_64/stable/active/files/lib/obs-plugins/
 
-Unfortunately the expected location of the locale, which can be found in the data folder, can vary also.
-The data folder usually should be copied to:
-~/.config/obs-studio/plugins/advanced-scene-switcher/
+Unfortunately the expected location of the "locale" and "res" folder, which can be found in the data folder, can vary also.
+The data folder usually should be copied to "~/.config/obs-studio/plugins/advanced-scene-switcher/" and reflect the following structure:
+
+/home/user/.config/obs-studio/plugins/
+└── advanced-scene-switcher
+    ├── bin
+    │   └── 64bit
+    │       └── advanced-scene-switcher.so
+    └── data
+        ├── locale
+        │   ├── de-DE.ini
+        │   ├── en-US.ini
+        │   ├── ru-RU.ini
+        │   └── zh-CN.ini
+        └── res
+            ├── cascadeClassifiers
+            │   ├── haarcascade_eye_tree_eyeglasses.xml
+            │   ├── haarcascade_eye.xml
+            │   ├── haarcascade_frontalface_alt2.xml
+            │   ├── haarcascade_frontalface_alt_tree.xml
+            │   ├── haarcascade_frontalface_alt.xml
+            │   ├── haarcascade_frontalface_default.xml
+            │   ├── haarcascade_fullbody.xml
+            │   ├── haarcascade_lefteye_2splits.xml
+            │   ├── haarcascade_lowerbody.xml
+            │   ├── haarcascade_profileface.xml
+            │   ├── haarcascade_righteye_2splits.xml
+            │   └── haarcascade_upperbody.xml
+            └── time.svg
 
 If this does not work you can try to copy the "locale" folder found inside the data folder to:
 /usr/share/obs/obs-plugins/advanced-scene-switcher/locale
 ~/.local/share/flatpak/app/com.obsproject.Studio/x86_64/stable/active/files/share/obs/obs-plugins/advanced-scene-switcher/locale
 /var/lib/flatpak/app/com.obsproject.Studio/x86_64/stable/active/files/share/obs/obs-plugins/advanced-scene-switcher/locale
 
-In doubt please check where other "en-US.ini" files are located on your system.
+In doubt, please check where other "en-US.ini" files are located on your system.

CMakeLists.txt

@@ -42,27 +42,17 @@ endif()
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
 include(GetGitRevisionDescription)
 get_git_head_revision(GIT_REFSPEC GIT_SHA1)
+git_describe(GIT_TAG)
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/version.cpp.in"
                "${CMAKE_CURRENT_BINARY_DIR}/src/version.cpp" @ONLY)
-if(WIN32)
-  get_filename_component(ISS_PLUGIN_FILES_DIR
-                         "${CMAKE_BINARY_DIR}\\..\\package" ABSOLUTE)
-  file(TO_NATIVE_PATH "${ISS_PLUGIN_FILES_DIR}" ISS_PLUGIN_FILES_DIR)
-  get_filename_component(ISS_MSVC_REDIST_HELPER_DIR
-                         "${CMAKE_PACKAGE_PREFIX}\\.." ABSOLUTE)
-  file(TO_NATIVE_PATH "${ISS_MSVC_REDIST_HELPER_DIR}"
-       ISS_MSVC_REDIST_HELPER_DIR)
-  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/CI/windows/setup.iss.in"
-                 "${CMAKE_CURRENT_BINARY_DIR}/CI/windows/setup.iss" @ONLY)
-endif()
 
 # Windows installer
 if(WIN32)
   get_filename_component(ISS_PLUGIN_FILES_DIR
                          "${CMAKE_BINARY_DIR}\\..\\package" ABSOLUTE)
   file(TO_NATIVE_PATH "${ISS_PLUGIN_FILES_DIR}" ISS_PLUGIN_FILES_DIR)
-  get_filename_component(ISS_MSVC_REDIST_HELPER_DIR
-                         "${CMAKE_PACKAGE_PREFIX}\\.." ABSOLUTE)
+  get_filename_component(ISS_MSVC_REDIST_HELPER_DIR "${CMAKE_BINARY_DIR}\\.."
+                         ABSOLUTE)
   file(TO_NATIVE_PATH "${ISS_MSVC_REDIST_HELPER_DIR}"
        ISS_MSVC_REDIST_HELPER_DIR)
   configure_file("${CMAKE_CURRENT_SOURCE_DIR}/CI/windows/setup.iss.in"
@@ -73,19 +63,49 @@ endif()
 if(BUILD_OUT_OF_TREE)
   set(CMAKE_PREFIX_PATH "${QTDIR}")
   set(CMAKE_INCLUDE_CURRENT_DIR ON)
-  list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/external")
-  include(external/FindLibObs.cmake)
-  find_package(LibObs REQUIRED)
   find_package(Qt5Core REQUIRED)
   find_package(Qt5Widgets REQUIRED)
-  find_path(LIBOBS_FRONTEND_INCLUDE_DIR HINTS ${LIBOBS_INCLUDE_DIRS})
-  find_file(
-    LIBOBS_FRONTEND_API_LIB
-    NAMES libobs-frontend-api.*
-    HINTS ${LIBOBS_LIB})
+  find_package(LibObs)
+  find_package(LibObs-frontend-api)
+  if(LibObs_FOUND)
+    set(LIBOBS_LIB ${LIBOBS_LIBRARIES})
+    set(LIBOBS_INCLUDE_DIR ${LIBOBS_INCLUDE_DIRS})
+  endif()
+  if(LibObs-frontend-api_FOUND)
+    set(LIBOBS_FRONTEND_API_LIB ${LIBOBS-FRONTEND-API_LIBRARIES})
+    set(LIBOBS_FRONTEND_INCLUDE_DIR ${LIBOBS-FRONTEND-API_INCLUDE_DIR})
+  endif()
 
-  include_directories("${LIBOBS_INCLUDE_DIRS}" "${LIBOBS_FRONTEND_INCLUDE_DIR}"
+  if(NOT LIBOBS_LIB)
+    message(FATAL_ERROR "obs library not found - please set LIBOBS_LIB")
+  endif()
+  if(NOT LIBOBS_FRONTEND_API_LIB)
+    message(
+      FATAL_ERROR
+        "libobs frontend-api library not found - please set LIBOBS_FRONTEND_API_LIB"
+    )
+  endif()
+  if(NOT LIBOBS_INCLUDE_DIR)
+    message(
+      FATAL_ERROR "obs.hpp header not found - please set LIBOBS_INCLUDE_DIR")
+  endif()
+  if(NOT LIBOBS_FRONTEND_INCLUDE_DIR)
+    message(
+      FATAL_ERROR
+        " obs-frontend-api.h not found - please set LIBOBS_FRONTEND_INCLUDE_DIR"
+    )
+  endif()
+
+  include_directories("${LIBOBS_INCLUDE_DIR}" "${LIBOBS_FRONTEND_INCLUDE_DIR}"
                       ${Qt5Core_INCLUDES} ${Qt5Widgets_INCLUDES})
+
+  find_package(CURL REQUIRED)
+  include_directories("${CURL_INCLUDE_DIRS}")
+else()
+  find_package(Libcurl REQUIRED)
+  include_directories("${LIBCURL_INCLUDE_DIRS}")
+  add_definitions(-DVCAM_SUPPORTED)
+  add_definitions(-DREPLAYBUFFER_SUPPORTED)
 endif()
 
 # Platform specific settings
@@ -97,14 +117,21 @@ if(APPLE)
   include_directories(${COCOA})
 endif()
 
-find_package(Libcurl REQUIRED)
-include_directories("${LIBCURL_INCLUDE_DIRS}")
-
 if(UNIX AND NOT APPLE)
   find_package(X11 REQUIRED COMPONENTS Xtst Xss)
-  link_libraries(${X11_LIBRARIES})
+  find_path(PROCPS_INCLUDE_DIR NAMES proc/procps.h)
+  if(NOT PROCPS_INCLUDE_DIR)
+    message(
+      FATAL_ERROR "procps include dir not found - please set PROCPS_INCLUDE_DIR"
+    )
+  endif()
+  find_library(PROCPS_LIBRARY NAMES procps)
+  if(NOT PROCPS_LIBRARY)
+    message(FATAL_ERROR "procps lib not found - please set PROCPS_LIBRARY")
+  endif()
+  link_libraries(${X11_LIBRARIES} ${procps_LIBRARIES})
   include_directories("${X11_INCLUDE_DIR}" "${X11_Xtst_INCLUDE_PATH}"
-                      "${X11_Xss_INCLUDE_PATH}")
+                      "${X11_Xss_INCLUDE_PATH}" "${PROCPS_INCLUDE_DIR}")
 endif()
 
 if(WIN32)
@@ -119,7 +146,7 @@ elseif(APPLE)
 else()
   set(advanced-scene-switcher_PLATFORM_SOURCES
       src/linux/advanced-scene-switcher-nix.cpp)
-  set(advanced-scene-switcher_PLATFORM_LIBS Xss)
+  set(advanced-scene-switcher_PLATFORM_LIBS Xss ${PROCPS_LIBRARY})
 endif()
 
 # asio and websocketpp
@@ -169,15 +196,22 @@ set(advanced-scene-switcher_HEADERS
     src/headers/macro-action-macro.hpp
     src/headers/macro-action-media.hpp
     src/headers/macro-action-plugin-state.hpp
+    src/headers/macro-action-preview-scene.hpp
+    src/headers/macro-action-random.hpp
     src/headers/macro-action-recording.hpp
     src/headers/macro-action-replay-buffer.hpp
     src/headers/macro-action-run.hpp
     src/headers/macro-action-scene-order.hpp
+    src/headers/macro-action-scene-swap.hpp
     src/headers/macro-action-scene-switch.hpp
     src/headers/macro-action-scene-transform.hpp
     src/headers/macro-action-scene-visibility.hpp
+    src/headers/macro-action-screenshot.hpp
     src/headers/macro-action-source.hpp
     src/headers/macro-action-streaming.hpp
+    src/headers/macro-action-systray.hpp
+    src/headers/macro-action-timer.hpp
+    src/headers/macro-action-transition.hpp
     src/headers/macro-action-virtual-cam.hpp
     src/headers/macro-action-wait.hpp
     src/headers/macro-condition-edit.hpp
@@ -195,10 +229,13 @@ set(advanced-scene-switcher_HEADERS
     src/headers/macro-condition-recording.hpp
     src/headers/macro-condition-replay-buffer.hpp
     src/headers/macro-condition-scene-order.hpp
+    src/headers/macro-condition-scene-transform.hpp
+    src/headers/macro-condition-scene-visibility.hpp
     src/headers/macro-condition-scene.hpp
     src/headers/macro-condition-source.hpp
     src/headers/macro-condition-streaming.hpp
     src/headers/macro-condition-timer.hpp
+    src/headers/macro-condition-transition.hpp
     src/headers/macro-condition-video.hpp
     src/headers/macro-condition-virtual-cam.hpp
     src/headers/macro-condition-window.hpp
@@ -210,8 +247,10 @@ set(advanced-scene-switcher_HEADERS
     src/headers/hotkey.hpp
     src/headers/scene-selection.hpp
     src/headers/screenshot-helper.hpp
+    src/headers/transition-selection.hpp
     src/headers/name-dialog.hpp
     src/headers/duration-control.hpp
+    src/headers/file-selection.hpp
     src/headers/section.hpp
     src/headers/platform-funcs.hpp
     src/headers/utility.hpp
@@ -235,6 +274,7 @@ set(advanced-scene-switcher_SOURCES
     src/switch-window.cpp
     src/switch-media.cpp
     src/switch-network.cpp
+    src/file-selection.cpp
     src/hotkey.cpp
     src/general.cpp
     src/switch-pause.cpp
@@ -251,15 +291,22 @@ set(advanced-scene-switcher_SOURCES
     src/macro-action-macro.cpp
     src/macro-action-media.cpp
     src/macro-action-plugin-state.cpp
+    src/macro-action-preview-scene.cpp
+    src/macro-action-random.cpp
     src/macro-action-recording.cpp
     src/macro-action-replay-buffer.cpp
     src/macro-action-run.cpp
     src/macro-action-scene-order.cpp
+    src/macro-action-scene-swap.cpp
     src/macro-action-scene-switch.cpp
     src/macro-action-scene-transform.cpp
     src/macro-action-scene-visibility.cpp
+    src/macro-action-screenshot.cpp
     src/macro-action-source.cpp
     src/macro-action-streaming.cpp
+    src/macro-action-systray.cpp
+    src/macro-action-timer.cpp
+    src/macro-action-transition.cpp
     src/macro-action-virtual-cam.cpp
     src/macro-action-wait.cpp
     src/macro-condition-edit.cpp
@@ -277,10 +324,13 @@ set(advanced-scene-switcher_SOURCES
     src/macro-condition-recording.cpp
     src/macro-condition-replay-buffer.cpp
     src/macro-condition-scene-order.cpp
+    src/macro-condition-scene-transform.cpp
+    src/macro-condition-scene-visibility.cpp
     src/macro-condition-scene.cpp
     src/macro-condition-source.cpp
     src/macro-condition-streaming.cpp
     src/macro-condition-timer.cpp
+    src/macro-condition-transition.cpp
     src/macro-condition-video.cpp
     src/macro-condition-virtual-cam.cpp
     src/macro-condition-window.cpp
@@ -292,6 +342,7 @@ set(advanced-scene-switcher_SOURCES
     src/curl-helper.cpp
     src/scene-selection.cpp
     src/screenshot-helper.cpp
+    src/transition-selection.cpp
     src/name-dialog.cpp
     src/duration-control.cpp
     src/section.cpp
@@ -299,6 +350,46 @@ set(advanced-scene-switcher_SOURCES
     src/volume-control.cpp
     src/version.cpp)
 
+# opencv
+find_package(OpenCV)
+if(OpenCV_FOUND)
+  include_directories("${OpenCV_INCLUDE_DIRS}")
+else()
+  set(OpenCV_LIBRARIES "")
+  message(
+    WARNING
+      "OpenCV not found! Functionality relying on OpenCV will be disabled!\nOpenCV sources are available under: ${CMAKE_CURRENT_SOURCE_DIR}/deps/opencv"
+  )
+  list(REMOVE_ITEM advanced-scene-switcher_SOURCES
+       src/macro-condition-video.cpp)
+  list(REMOVE_ITEM advanced-scene-switcher_HEADERS
+       src/headers/macro-condition-video.hpp)
+endif()
+
+# Backwards compatability checks with older OBS versions
+if(DEFINED LibObs_VERSION_MAJOR)
+  if(LibObs_VERSION_MAJOR GREATER_EQUAL 27)
+    add_definitions(-DVCAM_SUPPORTED)
+  else()
+    message(
+      WARNING
+        "OBS version ${LibObs_VERSION_MAJOR} found - disabling virtual camera functionality"
+    )
+  endif()
+  if(LibObs_VERSION_MAJOR GREATER_EQUAL 26)
+    add_definitions(-DREPLAYBUFFER_SUPPORTED)
+  else()
+    message(
+      WARNING
+        "OBS version ${LibObs_VERSION_MAJOR} found - disabling replay buffer and screenshot functionality"
+    )
+    list(REMOVE_ITEM advanced-scene-switcher_SOURCES
+         src/macro-action-screenshot.cpp)
+    list(REMOVE_ITEM advanced-scene-switcher_HEADERS
+         src/headers/macro-action-screenshot.hpp)
+  endif()
+endif()
+
 add_library(
   advanced-scene-switcher MODULE
   ${advanced-scene-switcher_HEADERS}
@@ -310,8 +401,13 @@ add_library(
 # Out of tree build
 if(BUILD_OUT_OF_TREE)
   target_link_libraries(
-    advanced-scene-switcher ${advanced-scene-switcher_PLATFORM_LIBS}
-    ${LIBOBS_LIB} ${LIBOBS_FRONTEND_API_LIB} Qt5::Core Qt5::Widgets)
+    advanced-scene-switcher
+    ${advanced-scene-switcher_PLATFORM_LIBS}
+    ${OpenCV_LIBRARIES}
+    ${LIBOBS_LIB}
+    ${LIBOBS_FRONTEND_API_LIB}
+    Qt5::Core
+    Qt5::Widgets)
 
   # Additional commands to install the module in the correct place. Find all the
   # translation files so we can copy them to the correct place later on.
@@ -324,24 +420,24 @@ if(BUILD_OUT_OF_TREE)
 
   # Linux
   if(UNIX AND NOT APPLE)
-    if(ARCH EQUAL 64)
-      set(ARCH_NAME "x86_64")
-    else()
-      set(ARCH_NAME "i686")
+    if(NOT LIB_OUT_DIR)
+      set(LIB_OUT_DIR "/lib/obs-plugins")
+    endif()
+    if(NOT DATA_OUT_DIR)
+      set(DATA_OUT_DIR "/share/obs/obs-plugins/advanced-scene-switcher")
     endif()
     set_target_properties(advanced-scene-switcher PROPERTIES PREFIX "")
     install(TARGETS advanced-scene-switcher
-            LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/obs-plugins)
-    install(
-      FILES ${ASS_TRANSLATION_FILES}
-      DESTINATION
-        "${CMAKE_INSTALL_PREFIX}/share/obs/obs-plugins/advanced-scene-switcher/locale"
-    )
+            LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIB_OUT_DIR})
+    install(DIRECTORY data/locale
+            DESTINATION ${CMAKE_INSTALL_PREFIX}/${DATA_OUT_DIR})
+    install(DIRECTORY data/res
+            DESTINATION ${CMAKE_INSTALL_PREFIX}/${DATA_OUT_DIR})
   endif()
 else()
   # In tree build
   target_link_libraries(
     advanced-scene-switcher ${advanced-scene-switcher_PLATFORM_LIBS}
-    obs-frontend-api Qt5::Widgets libobs)
+    ${OpenCV_LIBRARIES} obs-frontend-api Qt5::Widgets libobs)
   install_obs_plugin_with_data(advanced-scene-switcher data)
 endif()

README.md

@@ -1,5 +1,5 @@
 # SceneSwitcher
-An automated scene switcher for OBS Studio
+An automated scene switcher for OBS Studio.
 
 More information can be found on https://obsproject.com/forum/resources/automatic-scene-switching.395/.
 
@@ -13,7 +13,11 @@ For the Windows and MacOS platforms, it is recommended to run the provided insta
 
 For Linux the Snap package manager offers an OBS Studio installation which is bundled with the plugin:
 ```
-sudo snap install obs-studi
+sudo snap install obs-studio
+```
+The plugin is also available via the Flatpak package manager for users who installed OBS via Flatpak:
+```
+flatpak install com.obsproject.Studio.Plugin.SceneSwitcher
 ```
 
 If that is not an option you will have to ... 

cmake/version.cpp.in

@@ -1,3 +1,5 @@
 #include "src/headers/version.h"
 #define GIT_SHA1 "@GIT_SHA1@"
-const char g_GIT_SHA1[] = GIT_SHA1;
+#define GIT_TAG "@GIT_TAG@"
+const char g_GIT_SHA1[] = GIT_SHA1;
+const char g_GIT_TAG[] = GIT_TAG;

data/locale/de-DE.ini

@@ -45,7 +45,7 @@ AdvSceneSwitcher.generalTab.priority.fileContent="Datei Inhalt"
 AdvSceneSwitcher.generalTab.priority.sceneSequence="Szenenfolge"
 AdvSceneSwitcher.generalTab.priority.idleDetection="Inaktivitätserkennung"
 AdvSceneSwitcher.generalTab.priority.executable="Prozess"
-AdvSceneSwitcher.generalTab.priority.screenRegion="Bildschrimbereich"
+AdvSceneSwitcher.generalTab.priority.screenRegion="Bildschirmbereich"
 AdvSceneSwitcher.generalTab.priority.windowTitle="Fenstername"
 AdvSceneSwitcher.generalTab.priority.media="Medien"
 AdvSceneSwitcher.generalTab.priority.time="Zeit"
@@ -98,7 +98,7 @@ AdvSceneSwitcher.executableTab.entry="Wenn {{processes}} läuft wechsle zu {{sce
 AdvSceneSwitcher.executableTab.help="Dieser Tab erlaubt es Szenen zu wechseln, wenn bestimmte Prozesse laufen.\nDas kann nützlich sein, wenn sich der Name eines Fensters ändern kann oder dieser nicht bekannt ist.\n\nKlicke auf das markierte Plus Symbol, um einen neuen Eintrag hinzuzufügen."
 
 ; Screen Region Tab
-AdvSceneSwitcher.screenRegionTab.title="Bildschrimbereich"
+AdvSceneSwitcher.screenRegionTab.title="Bildschirmbereich"
 AdvSceneSwitcher.screenRegionTab.currentPosition="Mauszeiger ist bei:"
 AdvSceneSwitcher.screenRegionTab.showGuideFrames="Hilfsrahmen einblenden"
 AdvSceneSwitcher.screenRegionTab.hideGuideFrames="Hilfsrahmen ausblenden"

data/locale/en-US.ini

@@ -19,15 +19,16 @@ AdvSceneSwitcher.generalTab.status.autoStart.streaming="Streaming"
 AdvSceneSwitcher.generalTab.status.autoStart.recordingAndStreaming="Recording or Streaming"
 AdvSceneSwitcher.generalTab.status.checkInterval="Check switch conditions every"
 AdvSceneSwitcher.generalTab.generalBehavior="General behavior"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMet="If no switch condition is met for"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet="If no actions are performed for"
 AdvSceneSwitcher.generalTab.generalBehavior.onNoMetDelayTooltip="Will only ever be as accurate as the configured check interval."
 AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.dontSwitch="Don't switch"
 AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.switchToRandom="Switch to any scene in Random tab"
 AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.switchTo="Switch to:"
-AdvSceneSwitcher.generalTab.generalBehavior.cooldown="After a match do not switch scenes for"
+AdvSceneSwitcher.generalTab.generalBehavior.cooldown="After a match don't perform actions for"
 AdvSceneSwitcher.generalTab.generalBehavior.cooldownHint="During this time potential matches will be ignored!"
 AdvSceneSwitcher.generalTab.generalBehavior.verboseLogging="Enable verbose logging"
 AdvSceneSwitcher.generalTab.generalBehavior.saveWindowGeo="Save window position and size"
+AdvSceneSwitcher.generalTab.generalBehavior.showTrayNotifications="Show system tray notifications"
 AdvSceneSwitcher.generalTab.generalBehavior.disableUIHints="Disable UI hints"
 AdvSceneSwitcher.generalTab.priority="Priority"
 AdvSceneSwitcher.generalTab.priority.description="Switching methods priority (Highest priority is at the top)"
@@ -56,6 +57,7 @@ AdvSceneSwitcher.generalTab.priority.macro="Macro"
 ; Macro Tab
 AdvSceneSwitcher.macroTab.title="Macro"
 AdvSceneSwitcher.macroTab.macros="Macros"
+AdvSceneSwitcher.macroTab.priorityWarning="Note: It is recommended to configure macros to be the highest priority functionality.\nThis setting can be changed on the General tab."
 AdvSceneSwitcher.macroTab.help="Macros allow you to execute a string of actions depending on multiple conditions.\n\nClick on the highlighted plus symbol to add a new Macro."
 AdvSceneSwitcher.macroTab.editConditionHelp="This section allows you to define Macro conditions.\n\nSelect an existing or add a new Macro on the left.\nThen click the plus button below to add a new condition."
 AdvSceneSwitcher.macroTab.editActionHelp="This section allows you to define Macro actions.\n\nSelect an existing or add a new Macro on the left.\nThen click the plus button below to add a new action."
@@ -65,6 +67,9 @@ AdvSceneSwitcher.macroTab.edit.condition="Condition type:"
 AdvSceneSwitcher.macroTab.edit.action="Action type:"
 AdvSceneSwitcher.macroTab.add="Add new macro"
 AdvSceneSwitcher.macroTab.name="Name:"
+AdvSceneSwitcher.macroTab.run="Run macro"
+AdvSceneSwitcher.macroTab.runFail="Running \"%1\" failed!\nEither one of the actions failed or the macro is running already."
+AdvSceneSwitcher.macroTab.runInParallel="Run macro in parallel to other macros"
 AdvSceneSwitcher.macroTab.defaultname="Macro %1"
 AdvSceneSwitcher.macroTab.exists="Macro name exists already"
 AdvSceneSwitcher.macroTab.copy="Create copy"
@@ -93,31 +98,59 @@ AdvSceneSwitcher.condition.cursor.hideFrame="Hide frame"
 AdvSceneSwitcher.condition.cursor.entry.line1="Cursor is {{conditions}} {{minX}} {{minY}} {{maxX}} {{maxY}} - {{toggleFrameButton}}"
 AdvSceneSwitcher.condition.cursor.entry.line2="Cursor is currently at {{xPos}} x {{yPos}}"
 AdvSceneSwitcher.condition.scene="Scene"
-AdvSceneSwitcher.condition.scene.type.current="Current"
-AdvSceneSwitcher.condition.scene.type.previous="Previous"
-AdvSceneSwitcher.condition.scene.entry="{{sceneType}} scene is {{scenes}}"
+AdvSceneSwitcher.condition.scene.type.current="Current scene is"
+AdvSceneSwitcher.condition.scene.type.previous="Previous scene is"
+AdvSceneSwitcher.condition.scene.type.changed="Scene changed"
+AdvSceneSwitcher.condition.scene.type.notChanged="Scene has not changed"
+AdvSceneSwitcher.condition.scene.waitForTransition="Wait for transition to complete"
+AdvSceneSwitcher.condition.scene.entry="{{sceneType}} {{scenes}} {{waitForTransition}}"
 AdvSceneSwitcher.condition.window="Window"
 AdvSceneSwitcher.condition.window.entry.line1="{{windows}} exist and ..."
 AdvSceneSwitcher.condition.window.entry.line2="... is {{fullscreen}} fullscreen {{maximized}} maximized {{focused}} focused {{windowFocusChanged}} foreground window changed"
 AdvSceneSwitcher.condition.file="File"
-AdvSceneSwitcher.condition.file.entry.line1="Content of {{fileType}} {{filePath}} {{browseButton}} matches:"
+AdvSceneSwitcher.condition.file.entry.line1="Content of {{fileType}} {{filePath}} matches:"
 AdvSceneSwitcher.condition.file.entry.line2="{{matchText}}"
 AdvSceneSwitcher.condition.file.entry.line3="{{useRegex}} {{checkModificationDate}} {{checkFileContent}}"
 AdvSceneSwitcher.condition.media="Media"
-AdvSceneSwitcher.condition.media.entry="{{mediaSources}} state is {{states}} and {{timeRestrictions}} {{time}}"
+AdvSceneSwitcher.condition.media.anyOnScene="Any media source on"
+AdvSceneSwitcher.condition.media.allOnScene="All media sources on"
+AdvSceneSwitcher.condition.media.matchOnChange="Only match on change (Note: This option will be removed in a future version - please use time constraints instead)"
+AdvSceneSwitcher.condition.media.entry="{{mediaSources}}{{scenes}} state is {{states}} and {{timeRestrictions}} {{time}}"
 AdvSceneSwitcher.condition.video="Video"
 AdvSceneSwitcher.condition.video.condition.match="exactly matches"
 AdvSceneSwitcher.condition.video.condition.differ="does not match"
 AdvSceneSwitcher.condition.video.condition.hasChanged="has changed"
 AdvSceneSwitcher.condition.video.condition.hasNotChanged="has not changed"
 AdvSceneSwitcher.condition.video.condition.noImage="has no output"
+AdvSceneSwitcher.condition.video.condition.pattern="matches pattern"
+AdvSceneSwitcher.condition.video.condition.object="contains object"
 AdvSceneSwitcher.condition.video.askFileAction="Do you want to use an existing file or create a screenshot of the currently selected source?"
 AdvSceneSwitcher.condition.video.askFileAction.file="Use existing file"
 AdvSceneSwitcher.condition.video.askFileAction.screenshot="Create screenshot"
-AdvSceneSwitcher.condition.video.entry="{{videoSources}} {{condition}} {{filePath}} {{browseButton}}"
+AdvSceneSwitcher.condition.video.usePatternForChangedCheck="Use pattern matching"
+AdvSceneSwitcher.condition.video.usePatternForChangedCheck.tooltip="This will allow you to control how much the image has to change for the condition to be true."
+AdvSceneSwitcher.condition.video.patternThreshold="Threshold: "
+AdvSceneSwitcher.condition.video.patternThresholdDescription="A higher threshold value means that the pattern needs to match the video source more closely."
+AdvSceneSwitcher.condition.video.patternThresholdUseAlphaAsMask="Use alpha channel as mask for pattern."
+AdvSceneSwitcher.condition.video.objectScaleThreshold="Scale factor: "
+AdvSceneSwitcher.condition.video.objectScaleThresholdDescription="A lower scale factor will lead to more matches but higher CPU load."
+AdvSceneSwitcher.condition.video.minNeighborDescription="A higher minimum neighbors value will result in fewer but higher quality matches."
+AdvSceneSwitcher.condition.video.showMatch="Show match"
+AdvSceneSwitcher.condition.video.screenshotFail="Failed to get screenshot of source!"
+AdvSceneSwitcher.condition.video.patternMatchFail="Pattern was not found!"
+AdvSceneSwitcher.condition.video.objectMatchFail="Object was not found!"
+AdvSceneSwitcher.condition.video.modelLoadFail="Model data could not be loaded!"
+AdvSceneSwitcher.condition.video.entry="{{videoSources}} {{condition}} {{imagePath}}"
+AdvSceneSwitcher.condition.video.entry.modelPath="Model data (haar cascade classifier): {{modelDataPath}}"
+AdvSceneSwitcher.condition.video.entry.minNeighbor="Minimum neighbors: {{minNeighbors}}"
+AdvSceneSwitcher.condition.video.entry.minSize="Minimum size: {{minSizeX}} x {{minSizeY}}"
+AdvSceneSwitcher.condition.video.entry.maxSize="Maximum size: {{maxSizeX}} x {{maxSizeY}}"
+AdvSceneSwitcher.condition.video.entry.throttle="{{throttleEnable}}Reduce CPU load by performing check only every {{throttleCount}} milliseconds"
 AdvSceneSwitcher.condition.stream="Streaming"
 AdvSceneSwitcher.condition.stream.state.start="Stream running"
 AdvSceneSwitcher.condition.stream.state.stop="Stream stopped"
+AdvSceneSwitcher.condition.stream.state.starting="Stream starting"
+AdvSceneSwitcher.condition.stream.state.stopping="Stream stopping"
 AdvSceneSwitcher.condition.stream.entry="{{streamState}}"
 AdvSceneSwitcher.condition.record="Recording"
 AdvSceneSwitcher.condition.record.state.start="Recording running"
@@ -130,11 +163,17 @@ AdvSceneSwitcher.condition.idle="Idle"
 AdvSceneSwitcher.condition.idle.entry="No keyboard or mouse inputs for {{duration}}"
 AdvSceneSwitcher.condition.pluginState="Plugin state"
 AdvSceneSwitcher.condition.pluginState.state.sceneSwitched="Automated scene change was triggered in this interval"
+AdvSceneSwitcher.condition.pluginState.state.running="Advanced scene switcher is running"
 AdvSceneSwitcher.condition.pluginState.entry="{{condition}}"
 AdvSceneSwitcher.condition.timer="Timer"
-AdvSceneSwitcher.condition.timer.entry.line1="{{duration}} have passed"
+AdvSceneSwitcher.condition.timer.type.fixed="Fixed"
+AdvSceneSwitcher.condition.timer.type.random="Random"
+AdvSceneSwitcher.condition.timer.pause="Pause"
+AdvSceneSwitcher.condition.timer.continue="Continue"
+AdvSceneSwitcher.condition.timer.entry.line1.fixed="{{type}} duration of {{duration}} has passed"
+AdvSceneSwitcher.condition.timer.entry.line1.random="{{type}} duration from {{duration}} to {{duration2}} has passed"
 AdvSceneSwitcher.condition.timer.entry.line2="Time remaining: {{remaining}} seconds"
-AdvSceneSwitcher.condition.timer.entry.line3="{{reset}} {{autoReset}} Automatically reset timer after duration was reached"
+AdvSceneSwitcher.condition.timer.entry.line3="{{pauseContinue}} {{reset}} {{saveRemaining}} Save time remaining {{autoReset}} Automatically reset timer after duration was reached"
 AdvSceneSwitcher.condition.timer.reset="Reset"
 AdvSceneSwitcher.condition.macro="Macro"
 AdvSceneSwitcher.condition.macro.type.count="Count"
@@ -144,6 +183,7 @@ AdvSceneSwitcher.condition.macro.count.type.below="Less than"
 AdvSceneSwitcher.condition.macro.count.type.above="More than"
 AdvSceneSwitcher.condition.macro.count.type.equal="Exactly"
 AdvSceneSwitcher.condition.macro.count.reset="Reset"
+AdvSceneSwitcher.condition.macro.pausedWarning="Selected macro is currently paused!"
 AdvSceneSwitcher.condition.macro.state.entry="Conditions of {{macros}} are true"
 AdvSceneSwitcher.condition.macro.count.entry.line1="{{macros}} was executed {{conditions}} {{count}} times"
 AdvSceneSwitcher.condition.macro.count.entry.line2="Current count: {{currentCount}} {{resetCount}}"
@@ -185,8 +225,31 @@ AdvSceneSwitcher.condition.replay.state.started="Replay buffer started"
 AdvSceneSwitcher.condition.replay.state.saved="Replay buffer saved"
 AdvSceneSwitcher.condition.replay.entry="{{state}}"
 AdvSceneSwitcher.condition.date="Date"
-AdvSceneSwitcher.condition.date.entry.line1="{{dateTime}} {{ignoreDate}} Ignore date selection {{ignoreTime}} Ignore time selection"
-AdvSceneSwitcher.condition.date.entry.line2="{{repeat}} Repeat every {{duration}}"
+AdvSceneSwitcher.condition.date.state.at="At"
+AdvSceneSwitcher.condition.date.state.after="After"
+AdvSceneSwitcher.condition.date.state.before="Before"
+AdvSceneSwitcher.condition.date.state.between="Between"
+AdvSceneSwitcher.condition.date.entry.line1="{{condition}} {{dateTime}} {{dateTime2}} {{ignoreDate}} Ignore date component {{ignoreTime}} Ignore time component"
+AdvSceneSwitcher.condition.date.entry.line2="{{repeat}} Repeat every {{duration}} on date match"
+AdvSceneSwitcher.condition.sceneTransform="Scene item transform"
+AdvSceneSwitcher.condition.sceneTransform.getTransform="Get transform"
+AdvSceneSwitcher.condition.sceneTransform.regex="Use regular expressions"
+AdvSceneSwitcher.condition.sceneTransform.entry.line1="On {{scenes}} {{sources}} matches transform"
+AdvSceneSwitcher.condition.sceneTransform.entry.line2="{{settings}}"
+AdvSceneSwitcher.condition.sceneTransform.entry.line3="{{regex}} {{getSettings}}"
+AdvSceneSwitcher.condition.transition="Transition"
+AdvSceneSwitcher.condition.transition.type.current="Current transition type is"
+AdvSceneSwitcher.condition.transition.type.duration="Current transition duration is"
+AdvSceneSwitcher.condition.transition.type.started="Transition started"
+AdvSceneSwitcher.condition.transition.type.ended="Transition ended"
+AdvSceneSwitcher.condition.transition.type.transitionSource="Transitioning from"
+AdvSceneSwitcher.condition.transition.type.transitionTarget="Transitioning to"
+AdvSceneSwitcher.condition.transition.durationSuffix="seconds"
+AdvSceneSwitcher.condition.transition.entry="{{conditions}}{{transitions}}{{scenes}}{{duration}}{{durationSuffix}}"
+AdvSceneSwitcher.condition.sceneVisibility="Scene item visibility"
+AdvSceneSwitcher.condition.sceneVisibility.type.shown="Shown"
+AdvSceneSwitcher.condition.sceneVisibility.type.hidden="Hidden"
+AdvSceneSwitcher.condition.sceneVisibility.entry="On {{scenes}} {{sources}} is {{conditions}} "
 
 ; Macro Actions
 AdvSceneSwitcher.action.switchScene="Switch scene"
@@ -201,6 +264,7 @@ AdvSceneSwitcher.action.audio.type.mute="Mute"
 AdvSceneSwitcher.action.audio.type.unmute="Unmute"
 AdvSceneSwitcher.action.audio.type.sourceVolume="Set source volume"
 AdvSceneSwitcher.action.audio.type.masterVolume="Set master volume"
+AdvSceneSwitcher.action.audio.fade="{{fade}}Fade over {{duration}} seconds"
 AdvSceneSwitcher.action.audio.entry="{{actions}} {{audioSources}} {{volume}}"
 AdvSceneSwitcher.action.recording="Recording"
 AdvSceneSwitcher.action.recording.type.stop="Stop recording"
@@ -222,11 +286,13 @@ AdvSceneSwitcher.action.run="Run"
 AdvSceneSwitcher.action.run.arguments="Arguments:"
 AdvSceneSwitcher.action.run.addArgument="Add argument"
 AdvSceneSwitcher.action.run.addArgumentDescription="Add new argument:"
-AdvSceneSwitcher.action.run.entry="Run {{filePath}} {{browseButton}}"
+AdvSceneSwitcher.action.run.entry="Run {{filePath}}"
 AdvSceneSwitcher.action.sceneVisibility="Scene item visibility"
 AdvSceneSwitcher.action.sceneVisibility.type.show="Show"
 AdvSceneSwitcher.action.sceneVisibility.type.hide="Hide"
-AdvSceneSwitcher.action.sceneVisibility.entry="On {{scenes}} {{actions}} {{sources}}"
+AdvSceneSwitcher.action.sceneVisibility.type.source="Source"
+AdvSceneSwitcher.action.sceneVisibility.type.sourceGroup="Any"
+AdvSceneSwitcher.action.sceneVisibility.entry="On {{scenes}} {{actions}} {{sourceTypes}} {{sources}}"
 AdvSceneSwitcher.action.filter="Filter"
 AdvSceneSwitcher.action.filter.type.enable="Enable"
 AdvSceneSwitcher.action.filter.type.disable="Disable"
@@ -252,6 +318,7 @@ AdvSceneSwitcher.action.macro="Macro"
 AdvSceneSwitcher.action.macro.type.pause="Pause"
 AdvSceneSwitcher.action.macro.type.unpause="Unpause"
 AdvSceneSwitcher.action.macro.type.resetCounter="Reset counter"
+AdvSceneSwitcher.action.macro.type.run="Run"
 AdvSceneSwitcher.action.macro.entry="{{actions}} {{macros}}"
 AdvSceneSwitcher.action.pluginState="Plugin state"
 AdvSceneSwitcher.action.pluginState.type.stop="Stop the Advanced Scene Switcher plugin"
@@ -270,8 +337,9 @@ AdvSceneSwitcher.action.hotkey.leftAlt="Left Alt"
 AdvSceneSwitcher.action.hotkey.rightAlt="Right Alt"
 AdvSceneSwitcher.action.hotkey.leftMeta="Left Meta"
 AdvSceneSwitcher.action.hotkey.rightMeta="Right Meta"
+AdvSceneSwitcher.action.hotkey.onlyOBS="Send keypress only to OBS"
 AdvSceneSwitcher.action.hotkey.disabled="Cannot simulate key presses - functionality disabled!"
-AdvSceneSwitcher.action.hotkey.entry="Press {{keys}}"
+AdvSceneSwitcher.action.hotkey.entry="Press {{keys}} for {{duration}} milliseconds"
 AdvSceneSwitcher.action.sceneOrder="Scene item order"
 AdvSceneSwitcher.action.sceneOrder.type.moveUp="Move up"
 AdvSceneSwitcher.action.sceneOrder.type.moveDown="Move down"
@@ -285,7 +353,27 @@ AdvSceneSwitcher.action.sceneTransform.entry="On {{scenes}} transform {{sources}
 AdvSceneSwitcher.action.file="File"
 AdvSceneSwitcher.action.file.type.write="Write"
 AdvSceneSwitcher.action.file.type.append="Append"
-AdvSceneSwitcher.action.file.entry="{{actions}} to {{filePath}} {{browseButton}}:"
+AdvSceneSwitcher.action.file.entry="{{actions}} to {{filePath}}:"
+AdvSceneSwitcher.action.previewScene="Switch preview scene"
+AdvSceneSwitcher.action.previewScene.entry="Switch preview scene to {{scenes}}"
+AdvSceneSwitcher.action.SceneSwap="Swap scene (Studio mode)"
+AdvSceneSwitcher.action.SceneSwap.entry="Swap preview and program scene in studio mode"
+AdvSceneSwitcher.action.transition="Transition"
+AdvSceneSwitcher.action.transition.entry.line1="{{setType}}Set transition type to {{transitions}}"
+AdvSceneSwitcher.action.transition.entry.line2="{{setDuration}}Set transition duration to {{duration}}seconds"
+AdvSceneSwitcher.action.timer="Timer"
+AdvSceneSwitcher.action.timer.type.pause="Pause"
+AdvSceneSwitcher.action.timer.type.continue="Continue"
+AdvSceneSwitcher.action.timer.type.reset="Reset"
+AdvSceneSwitcher.action.timer.type.setTimeRemaining="Set time remaining of"
+AdvSceneSwitcher.action.timer.entry="{{timerAction}} timers on {{macros}} {{duration}}"
+AdvSceneSwitcher.action.random="Random"
+AdvSceneSwitcher.action.random.entry="Randomly run any of the following macros (paused macros are ignored)"
+AdvSceneSwitcher.action.systray="System tray notification"
+AdvSceneSwitcher.action.systray.entry="Show notification: {{message}}"
+AdvSceneSwitcher.action.screenshot="Screenshot"
+AdvSceneSwitcher.action.screenshot.mainOutput="OBS's main output"
+AdvSceneSwitcher.action.screenshot.entry="Screenshot {{sources}}"
 
 ; Transition Tab
 AdvSceneSwitcher.transitionTab.title="Transition"
@@ -531,8 +619,10 @@ AdvSceneSwitcher.hotkey.stopSwitcherHotkey="Stop the Advanced Scene Switcher"
 AdvSceneSwitcher.hotkey.startStopToggleSwitcherHotkey="Toggle Start/Stop for the Advanced Scene Switcher"
 AdvSceneSwitcher.hotkey.macro.pause="Pause macro %1"
 AdvSceneSwitcher.hotkey.macro.unpause="Unpause macro %1"
+AdvSceneSwitcher.hotkey.macro.togglePause="Toggle pause of macro %1"
 
 AdvSceneSwitcher.askBackup="Detected a new version of the Advanced Scene Switcher.\nShould a backup of the old settings be created?"
+AdvSceneSwitcher.askForMacro="Select macro {{macroSelection}}"
 
 AdvSceneSwitcher.close="Close"
 AdvSceneSwitcher.browse="Browse"
@@ -542,6 +632,7 @@ AdvSceneSwitcher.selectPreviousScene="Previous Scene"
 AdvSceneSwitcher.selectCurrentScene="Current Scene"
 AdvSceneSwitcher.selectAnyScene="Any Scene"
 AdvSceneSwitcher.currentTransition="Current Transition"
+AdvSceneSwitcher.anyTransition="Any Transition"
 AdvSceneSwitcher.selectTransition="--select transition--"
 AdvSceneSwitcher.selectWindow="--select window--"
 AdvSceneSwitcher.selectSource="--select source--"
@@ -559,6 +650,8 @@ AdvSceneSwitcher.selectWindowTip="Use \"OBS\" to specify OBS window\nUse \"Task
 
 AdvSceneSwitcher.status.active="Active"
 AdvSceneSwitcher.status.inactive="Inactive"
+AdvSceneSwitcher.running="Plugin running"
+AdvSceneSwitcher.stopped="Plugin stopped"
 
 AdvSceneSwitcher.unit.milliseconds="milliseconds"
 AdvSceneSwitcher.unit.secends="seconds"

data/locale/zh-CN.ini

@@ -12,17 +12,23 @@ AdvSceneSwitcher.generalTab.status.onStartup.alwaysStart="总是自动启动"
 AdvSceneSwitcher.generalTab.status.onStartup.doNotStart="不要启动"
 AdvSceneSwitcher.generalTab.status.start="启动"
 AdvSceneSwitcher.generalTab.status.stop="停止"
+AdvSceneSwitcher.generalTab.status.autoStart="在以下情况下自动启动场景切换程序:"
+AdvSceneSwitcher.generalTab.status.autoStart.never="从不"
 AdvSceneSwitcher.generalTab.status.autoStart.recording="录制"
 AdvSceneSwitcher.generalTab.status.autoStart.streaming="推流"
 AdvSceneSwitcher.generalTab.status.autoStart.recordingAndStreaming="录制和推流"
 AdvSceneSwitcher.generalTab.status.checkInterval="检查切换条件时间间隔"
-AdvSceneSwitcher.generalTab.generalBehavior="一般表现"
+AdvSceneSwitcher.generalTab.generalBehavior="全局行为"
 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="详细日志输出"
+AdvSceneSwitcher.generalTab.generalBehavior.saveWindowGeo="保存窗口位置和大小"
+AdvSceneSwitcher.generalTab.generalBehavior.showTrayNotifications="显示系统托盘通知"
 AdvSceneSwitcher.generalTab.generalBehavior.disableUIHints="禁用UI提示"
 AdvSceneSwitcher.generalTab.priority="优先级"
 AdvSceneSwitcher.generalTab.priority.description="切换场景优先级 (最上方的项优先级最高)"
@@ -45,22 +51,338 @@ AdvSceneSwitcher.generalTab.priority.windowTitle="窗口标题"
 AdvSceneSwitcher.generalTab.priority.media="媒体"
 AdvSceneSwitcher.generalTab.priority.time="时间"
 AdvSceneSwitcher.generalTab.priority.audio="音频"
+AdvSceneSwitcher.generalTab.priority.video="视频"
+AdvSceneSwitcher.generalTab.priority.macro="宏"
+
+; Macro Tab
+AdvSceneSwitcher.macroTab.title="宏"
+AdvSceneSwitcher.macroTab.macros="宏文件"
+AdvSceneSwitcher.macroTab.help="宏允许您根据多种条件执行一系列操作。\n\n单击突出显示的加号可添加新宏."
+AdvSceneSwitcher.macroTab.editConditionHelp="此部分允许您定义宏条件。\n\n在左侧选择现有宏或添加新宏。\n然后单击下面的加号按钮添加新条件。"
+AdvSceneSwitcher.macroTab.editActionHelp="此部分允许您定义宏操作。\n\n在左侧选择现有宏或添加新宏。\n然后单击下面的加号按钮添加新操作."
+AdvSceneSwitcher.macroTab.edit="编辑宏"
+AdvSceneSwitcher.macroTab.edit.logic="逻辑类型:"
+AdvSceneSwitcher.macroTab.edit.condition="条件类型:"
+AdvSceneSwitcher.macroTab.edit.action="动作类型:"
+AdvSceneSwitcher.macroTab.add="添加新宏"
+AdvSceneSwitcher.macroTab.name="名称:"
+AdvSceneSwitcher.macroTab.defaultname="宏 %1"
+AdvSceneSwitcher.macroTab.exists="宏名称已存在"
+AdvSceneSwitcher.macroTab.copy="创建副本"
+AdvSceneSwitcher.macroTab.expandAll="全部展开"
+AdvSceneSwitcher.macroTab.collapseAll="全部收回"
+
+; Macro Logic
+AdvSceneSwitcher.logic.none="忽略条目"
+AdvSceneSwitcher.logic.and="和"
+AdvSceneSwitcher.logic.or="或"
+AdvSceneSwitcher.logic.andNot="和 不"
+AdvSceneSwitcher.logic.orNot="或 不"
+AdvSceneSwitcher.logic.rootNone="如果"
+AdvSceneSwitcher.logic.not="如果 不"
+
+; Macro Conditions
+AdvSceneSwitcher.condition.audio="音频"
+AdvSceneSwitcher.condition.audio.state.below="小于"
+AdvSceneSwitcher.condition.audio.state.above="大于"
+AdvSceneSwitcher.condition.audio.entry="音量 来源 {{audioSources}} 是 {{condition}} {{volume}}"
+AdvSceneSwitcher.condition.cursor="光标"
+AdvSceneSwitcher.condition.cursor.type.region="当前位置"
+AdvSceneSwitcher.condition.cursor.type.moving="正在移动"
+AdvSceneSwitcher.condition.cursor.showFrame="显示帧率"
+AdvSceneSwitcher.condition.cursor.hideFrame="隐藏帧率"
+AdvSceneSwitcher.condition.cursor.entry.line1="光标 处于{{conditions}} {{minX}} {{minY}} {{maxX}} {{maxY}} - {{toggleFrameButton}}"
+AdvSceneSwitcher.condition.cursor.entry.line2="光标当前位于 {{xPos}} x {{yPos}}"
+AdvSceneSwitcher.condition.scene="场景"
+AdvSceneSwitcher.condition.scene.type.current="当前场景是"
+AdvSceneSwitcher.condition.scene.type.previous="上一个场景是"
+AdvSceneSwitcher.condition.scene.type.changed="场景改变了"
+AdvSceneSwitcher.condition.scene.type.notChanged="场景没有改变"
+AdvSceneSwitcher.condition.scene.waitForTransition="等待过渡完成"
+AdvSceneSwitcher.condition.scene.entry="{{sceneType}} {{scenes}} {{waitForTransition}}"
+AdvSceneSwitcher.condition.window="窗口"
+AdvSceneSwitcher.condition.window.entry.line1="{{windows}} 存在..."
+AdvSceneSwitcher.condition.window.entry.line2="... 并且是 {{fullscreen}} 全屏 {{maximized}} 最大化 {{focused}} 获得焦点 {{windowFocusChanged}} 焦点窗口已更改"
+AdvSceneSwitcher.condition.file="文件"
+AdvSceneSwitcher.condition.file.entry.line1="内容 {{fileType}} {{filePath}} (本地是文本，网络是获取的网页)完全匹配:"
+AdvSceneSwitcher.condition.file.entry.line2="{{matchText}}"
+AdvSceneSwitcher.condition.file.entry.line3="{{useRegex}} {{checkModificationDate}} {{checkFileContent}}"
+AdvSceneSwitcher.condition.media="媒体"
+AdvSceneSwitcher.condition.media.entry="{{mediaSources}} 状态是 {{states}} 和 {{timeRestrictions}} {{time}}"
+AdvSceneSwitcher.condition.video="视频"
+AdvSceneSwitcher.condition.video.condition.match="完全匹配"
+AdvSceneSwitcher.condition.video.condition.differ="不匹配"
+AdvSceneSwitcher.condition.video.condition.hasChanged="改变了"
+AdvSceneSwitcher.condition.video.condition.hasNotChanged="没有改变"
+AdvSceneSwitcher.condition.video.condition.noImage="没有输出"
+AdvSceneSwitcher.condition.video.condition.pattern="匹配模式"
+AdvSceneSwitcher.condition.video.condition.object="包含对象"
+AdvSceneSwitcher.condition.video.askFileAction="是否要使用现有文件或创建当前选定源的屏幕截图？"
+AdvSceneSwitcher.condition.video.askFileAction.file="使用现有文件"
+AdvSceneSwitcher.condition.video.askFileAction.screenshot="创建屏幕截图"
+AdvSceneSwitcher.condition.video.usePatternForChangedCheck="使用模式匹配"
+AdvSceneSwitcher.condition.video.usePatternForChangedCheck.tooltip="这将允许您控制图像必须更改多少才能使条件为真."
+AdvSceneSwitcher.condition.video.patternThreshold="阈值: "
+AdvSceneSwitcher.condition.video.patternThresholdDescription="较高的阈值意味着模式需要更紧密地匹配视频源."
+AdvSceneSwitcher.condition.video.patternThresholdUseAlphaAsMask="使用alpha通道作为图案的遮罩."
+AdvSceneSwitcher.condition.video.objectScaleThreshold="模型比例: "
+AdvSceneSwitcher.condition.video.objectScaleThresholdDescription="较低的模比例将导致更多的匹配，但会导致更高的CPU负载."
+AdvSceneSwitcher.condition.video.minNeighborDescription="较高的“最小区域”值将导致较少但质量较高的匹配."
+AdvSceneSwitcher.condition.video.showMatch="显示模式"
+AdvSceneSwitcher.condition.video.screenshotFail="无法获取源的屏幕截图!"
+AdvSceneSwitcher.condition.video.patternMatchFail="没有找到模式!"
+AdvSceneSwitcher.condition.video.objectMatchFail="找不到对象!"
+AdvSceneSwitcher.condition.video.modelLoadFail="无法加载模型数据!"
+AdvSceneSwitcher.condition.video.entry="{{videoSources}} {{condition}} {{imagePath}}"
+AdvSceneSwitcher.condition.video.entry.modelPath="模型数据 (haar级联分类器): {{modelDataPath}}"
+AdvSceneSwitcher.condition.video.entry.minNeighbor="最小区域: {{minNeighbors}}"
+AdvSceneSwitcher.condition.video.entry.minSize="最小尺寸: {{minSizeX}} x {{minSizeY}}"
+AdvSceneSwitcher.condition.video.entry.maxSize="最大尺寸: {{maxSizeX}} x {{maxSizeY}}"
+AdvSceneSwitcher.condition.video.entry.throttle="{{throttleEnable}}通过只执行每一次检查来减少CPU负载 {{throttleCount}} 毫秒"
+AdvSceneSwitcher.condition.stream="推流"
+AdvSceneSwitcher.condition.stream.state.start="推流启动"
+AdvSceneSwitcher.condition.stream.state.stop="推流停止"
+AdvSceneSwitcher.condition.stream.state.starting="推流启动中"
+AdvSceneSwitcher.condition.stream.state.stopping="推流停止中"
+AdvSceneSwitcher.condition.stream.entry="{{streamState}}"
+AdvSceneSwitcher.condition.record="录制"
+AdvSceneSwitcher.condition.record.state.start="录制运行中"
+AdvSceneSwitcher.condition.record.state.pause="录制暂停"
+AdvSceneSwitcher.condition.record.state.stop="录制停止"
+AdvSceneSwitcher.condition.record.entry="{{recordState}}"
+AdvSceneSwitcher.condition.process="进程"
+AdvSceneSwitcher.condition.process.entry="{{processes}} 正在运行 {{focused}} 而且是获得焦点"
+AdvSceneSwitcher.condition.idle="闲置检测"
+AdvSceneSwitcher.condition.idle.entry="没有键盘或鼠标输入{{duration}}"
+AdvSceneSwitcher.condition.pluginState="插件状态"
+AdvSceneSwitcher.condition.pluginState.state.sceneSwitched="在此时间间隔内触发了自动场景更改"
+AdvSceneSwitcher.condition.pluginState.entry="{{condition}}"
+AdvSceneSwitcher.condition.timer="计时器"
+AdvSceneSwitcher.condition.timer.pause="暂停"
+AdvSceneSwitcher.condition.timer.continue="继续"
+AdvSceneSwitcher.condition.timer.entry.line1="{{duration}} 时间倒计时"
+AdvSceneSwitcher.condition.timer.entry.line2="剩余时间: {{remaining}} 秒"
+AdvSceneSwitcher.condition.timer.entry.line3="{{pauseContinue}} {{reset}} {{saveRemaining}} 保存剩余时间 {{autoReset}} 达到时间后自动重置计时器"
+AdvSceneSwitcher.condition.timer.reset="重置"
+AdvSceneSwitcher.condition.macro="宏"
+AdvSceneSwitcher.condition.macro.type.count="计数"
+AdvSceneSwitcher.condition.macro.type.state="状态"
+AdvSceneSwitcher.condition.macro.type.selection="条件类型: {{types}}"
+AdvSceneSwitcher.condition.macro.count.type.below="少于"
+AdvSceneSwitcher.condition.macro.count.type.above="大于"
+AdvSceneSwitcher.condition.macro.count.type.equal="等于"
+AdvSceneSwitcher.condition.macro.count.reset="重置"
+AdvSceneSwitcher.condition.macro.pausedWarning="所选宏当前已暂停!"
+AdvSceneSwitcher.condition.macro.state.entry="条件 {{macros}} 是真的"
+AdvSceneSwitcher.condition.macro.count.entry.line1="{{macros}} 运行 {{conditions}} {{count}} 次（相对于下面计数匹配）"
+AdvSceneSwitcher.condition.macro.count.entry.line2="当前计数: {{currentCount}} {{resetCount}}"
+AdvSceneSwitcher.condition.source="源"
+AdvSceneSwitcher.condition.source.type.active="激活状态"
+AdvSceneSwitcher.condition.source.type.showing="显示状态"
+AdvSceneSwitcher.condition.source.type.settings="设置完全匹配"
+AdvSceneSwitcher.condition.source.regex="使用正则表达式"
+AdvSceneSwitcher.condition.source.getSettings="获取当前设置"
+AdvSceneSwitcher.condition.source.entry.line1="{{sources}} {{conditions}}"
+AdvSceneSwitcher.condition.source.entry.line2="{{settings}}"
+AdvSceneSwitcher.condition.source.entry.line3="{{regex}} {{getSettings}}"
+AdvSceneSwitcher.condition.virtualCamera="虚拟摄像机"
+AdvSceneSwitcher.condition.virtualCamera.state.start="虚拟摄像机启动"
+AdvSceneSwitcher.condition.virtualCamera.state.stop="虚拟摄像机停止"
+AdvSceneSwitcher.condition.virtualCamera.entry="{{states}}"
+AdvSceneSwitcher.condition.filter="滤镜"
+AdvSceneSwitcher.condition.filter.type.active="已启用"
+AdvSceneSwitcher.condition.filter.type.showing="已关闭"
+AdvSceneSwitcher.condition.filter.type.settings="设置完全匹配"
+AdvSceneSwitcher.condition.filter.regex="使用正则表达式"
+AdvSceneSwitcher.condition.filter.getSettings="获取当前设置"
+AdvSceneSwitcher.condition.filter.entry.line1="在 {{sources}} {{filters}} {{conditions}}"
+AdvSceneSwitcher.condition.filter.entry.line2="{{settings}}"
+AdvSceneSwitcher.condition.filter.entry.line3="{{regex}} {{getSettings}}"
+AdvSceneSwitcher.condition.sceneOrder="场景项目顺序"
+AdvSceneSwitcher.condition.sceneOrder.type.above="高于"
+AdvSceneSwitcher.condition.sceneOrder.type.below="低于"
+AdvSceneSwitcher.condition.sceneOrder.type.position="位置值排比"
+AdvSceneSwitcher.condition.sceneOrder.positionInfo="位置值从底部以0开始，对于每个场景项目（包括场景组中的项目）增加1，自行测试，按照上下往上排比数值。"
+AdvSceneSwitcher.condition.sceneOrder.entry="在 {{scenes}} {{sources}} {{conditions}} {{sources2}} {{position}}"
+AdvSceneSwitcher.condition.hotkey="热键"
+AdvSceneSwitcher.condition.hotkey.name="宏触发热键"
+AdvSceneSwitcher.condition.hotkey.tip="注意：您可以在OBS设置窗口中为此热键配置按键绑定"
+AdvSceneSwitcher.condition.hotkey.entry="名称: {{name}}"
+AdvSceneSwitcher.condition.replay="回放缓存"
+AdvSceneSwitcher.condition.replay.state.stopped="回放缓存已停止"
+AdvSceneSwitcher.condition.replay.state.started="回放缓存已启动"
+AdvSceneSwitcher.condition.replay.state.saved="已保存回放缓存"
+AdvSceneSwitcher.condition.replay.entry="{{state}}"
+AdvSceneSwitcher.condition.date="日期"
+AdvSceneSwitcher.condition.date.state.at="现在"
+AdvSceneSwitcher.condition.date.state.after="之后"
+AdvSceneSwitcher.condition.date.state.before="之前"
+AdvSceneSwitcher.condition.date.state.between="之间"
+AdvSceneSwitcher.condition.date.entry.line1="{{condition}} {{dateTime}} {{dateTime2}} {{ignoreDate}} 忽略日期 {{ignoreTime}} 忽略时间"
+AdvSceneSwitcher.condition.date.entry.line2="{{repeat}} 重复的每一次 {{duration}} 匹配的时间"
+AdvSceneSwitcher.condition.sceneTransform="场景项目被改变"
+AdvSceneSwitcher.condition.sceneTransform.getTransform="内容或者设置被改变了"
+AdvSceneSwitcher.condition.sceneTransform.regex="使用正则表达式"
+AdvSceneSwitcher.condition.sceneTransform.entry.line1="在 {{scenes}} {{sources}} 匹配变换"
+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="当前转场特效持续时间为"
+AdvSceneSwitcher.condition.transition.type.started="转场特效开始"
+AdvSceneSwitcher.condition.transition.type.ended="转场特效结束"
+AdvSceneSwitcher.condition.transition.durationSuffix="秒"
+AdvSceneSwitcher.condition.transition.entry="{{conditions}}{{transitions}}{{duration}}{{durationSuffix}}"
+AdvSceneSwitcher.condition.sceneVisibility="场景项目可见"
+AdvSceneSwitcher.condition.sceneVisibility.type.shown="显示的"
+AdvSceneSwitcher.condition.sceneVisibility.type.hidden="隐藏的"
+AdvSceneSwitcher.condition.sceneVisibility.entry="在 {{scenes}} {{sources}} 是 {{conditions}} "
+
+; Macro Actions
+AdvSceneSwitcher.action.switchScene="切换场景"
+AdvSceneSwitcher.action.scene.entry="切换场景 {{scenes}} 使用 {{transitions}} 时长 {{duration}} 秒"
+AdvSceneSwitcher.action.wait="等待"
+AdvSceneSwitcher.action.wait.type.fixed="固定数值"
+AdvSceneSwitcher.action.wait.type.random="随机数值"
+AdvSceneSwitcher.action.wait.entry.fixed="等待 {{waitType}} 持续时间为 {{duration}}"
+AdvSceneSwitcher.action.wait.entry.random="等待 {{waitType}} 持续时间为 {{duration}} 到 {{duration2}}"
+AdvSceneSwitcher.action.audio="音频"
+AdvSceneSwitcher.action.audio.type.mute="静音"
+AdvSceneSwitcher.action.audio.type.unmute="取消静音"
+AdvSceneSwitcher.action.audio.type.sourceVolume="来源音量"
+AdvSceneSwitcher.action.audio.type.masterVolume="主音量"
+AdvSceneSwitcher.action.audio.fade="{{fade}}淡出 {{duration}} 秒"
+AdvSceneSwitcher.action.audio.entry="{{actions}} {{audioSources}} {{volume}}"
+AdvSceneSwitcher.action.recording="录制"
+AdvSceneSwitcher.action.recording.type.stop="停止录制"
+AdvSceneSwitcher.action.recording.type.start="开始录制"
+AdvSceneSwitcher.action.recording.type.pause="暂停录制"
+AdvSceneSwitcher.action.recording.type.unpause="取消录制暂停"
+AdvSceneSwitcher.action.recording.pause.hint="请注意，根据您的录制设置，您可能无法暂停录制"
+AdvSceneSwitcher.action.recording.entry="{{actions}}{{pauseHint}}"
+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="开始推流"
+AdvSceneSwitcher.action.streaming.entry="{{actions}}"
+AdvSceneSwitcher.action.run="运行"
+AdvSceneSwitcher.action.run.arguments="参数:"
+AdvSceneSwitcher.action.run.addArgument="添加参数"
+AdvSceneSwitcher.action.run.addArgumentDescription="添加新参数:"
+AdvSceneSwitcher.action.run.entry="运行 {{filePath}}"
+AdvSceneSwitcher.action.sceneVisibility="场景项目可见性"
+AdvSceneSwitcher.action.sceneVisibility.type.show="显示"
+AdvSceneSwitcher.action.sceneVisibility.type.hide="隐藏"
+AdvSceneSwitcher.action.sceneVisibility.type.source="来源"
+AdvSceneSwitcher.action.sceneVisibility.type.sourceGroup="全部"
+AdvSceneSwitcher.action.sceneVisibility.entry="在 {{scenes}} {{actions}} {{sourceTypes}} {{sources}}"
+AdvSceneSwitcher.action.filter="滤镜"
+AdvSceneSwitcher.action.filter.type.enable="开启"
+AdvSceneSwitcher.action.filter.type.disable="关闭"
+AdvSceneSwitcher.action.filter.type.settings="参数设置"
+AdvSceneSwitcher.action.filter.entry="在 {{sources}} {{actions}} {{filters}}"
+AdvSceneSwitcher.action.filter.getSettings="获取当前设置"
+AdvSceneSwitcher.action.source="来源"
+AdvSceneSwitcher.action.source.type.enable="启用"
+AdvSceneSwitcher.action.source.type.disable="停用"
+AdvSceneSwitcher.action.source.type.settings="配置设置"
+AdvSceneSwitcher.action.source.entry="{{actions}} {{sources}}"
+AdvSceneSwitcher.action.source.warning="警告：OBS UI无法控制全局启用和禁用源，注意，通过这个设置禁用，我测试，你必须通过这个在启用才行，不然点击小眼睛你无法显示！"
+AdvSceneSwitcher.action.source.getSettings="获取当前设置"
+AdvSceneSwitcher.action.media="媒体"
+AdvSceneSwitcher.action.media.type.play="开始"
+AdvSceneSwitcher.action.media.type.pause="暂停"
+AdvSceneSwitcher.action.media.type.stop="停止"
+AdvSceneSwitcher.action.media.type.restart="重新启动"
+AdvSceneSwitcher.action.media.type.next="下一个"
+AdvSceneSwitcher.action.media.type.previous="上一个"
+AdvSceneSwitcher.action.media.entry="{{actions}} {{mediaSources}}"
+AdvSceneSwitcher.action.macro="宏"
+AdvSceneSwitcher.action.macro.type.pause="暂停"
+AdvSceneSwitcher.action.macro.type.unpause="取消暂停"
+AdvSceneSwitcher.action.macro.type.resetCounter="复位计数器"
+AdvSceneSwitcher.action.macro.entry="{{actions}} {{macros}}"
+AdvSceneSwitcher.action.pluginState="插件状态"
+AdvSceneSwitcher.action.pluginState.type.stop="停止高级场景切换插件"
+AdvSceneSwitcher.action.pluginState.type.noMatch="没有匹配项:"
+AdvSceneSwitcher.action.pluginState.entry="{{actions}} {{values}} {{scenes}}"
+AdvSceneSwitcher.action.virtualCamera="虚拟摄像机"
+AdvSceneSwitcher.action.virtualCamera.type.stop="停止虚拟摄像机"
+AdvSceneSwitcher.action.virtualCamera.type.start="启动虚拟摄像机"
+AdvSceneSwitcher.action.virtualCamera.entry="{{actions}}"
+AdvSceneSwitcher.action.hotkey="热键"
+AdvSceneSwitcher.action.hotkey.leftShift="左 Shift"
+AdvSceneSwitcher.action.hotkey.rightShift="右 Shift"
+AdvSceneSwitcher.action.hotkey.leftCtrl="左 Ctrl"
+AdvSceneSwitcher.action.hotkey.rightCtrl="右 Ctrl"
+AdvSceneSwitcher.action.hotkey.leftAlt="左 Alt"
+AdvSceneSwitcher.action.hotkey.rightAlt="右 Alt"
+AdvSceneSwitcher.action.hotkey.leftMeta="左 Meta"
+AdvSceneSwitcher.action.hotkey.rightMeta="右 Meta"
+AdvSceneSwitcher.action.hotkey.onlyOBS="仅向OBS发送按键"
+AdvSceneSwitcher.action.hotkey.disabled="无法模拟按键-功能已禁用!"
+AdvSceneSwitcher.action.hotkey.entry="按下 {{keys}} for {{duration}} 毫秒"
+AdvSceneSwitcher.action.sceneOrder="场景项目顺序"
+AdvSceneSwitcher.action.sceneOrder.type.moveUp="上移"
+AdvSceneSwitcher.action.sceneOrder.type.moveDown="下移"
+AdvSceneSwitcher.action.sceneOrder.type.moveTop="顶部"
+AdvSceneSwitcher.action.sceneOrder.type.moveBottom="底部"
+AdvSceneSwitcher.action.sceneOrder.type.movePosition="移动到数值位置"
+AdvSceneSwitcher.action.sceneOrder.entry="在 {{scenes}} {{actions}} {{sources}} {{position}}"
+AdvSceneSwitcher.action.sceneTransform="场景项变换"
+AdvSceneSwitcher.action.sceneTransform.getTransform="得到变换"
+AdvSceneSwitcher.action.sceneTransform.entry="On {{scenes}} transform {{sources}}"
+AdvSceneSwitcher.action.file="文件"
+AdvSceneSwitcher.action.file.type.write="写入"
+AdvSceneSwitcher.action.file.type.append="追加写入"
+AdvSceneSwitcher.action.file.entry="{{actions}} to {{filePath}}:"
+AdvSceneSwitcher.action.previewScene="切换预览场景"
+AdvSceneSwitcher.action.previewScene.entry="将预览场景切换到 {{scenes}}"
+AdvSceneSwitcher.action.SceneSwap="交换场景 (Studio mode)"
+AdvSceneSwitcher.action.SceneSwap.entry="在studio模式下交换预览和编程场景"
+AdvSceneSwitcher.action.transition="过场特效"
+AdvSceneSwitcher.action.transition.entry.line1="{{setType}}将过场特效类型设置为 {{transitions}}"
+AdvSceneSwitcher.action.transition.entry.line2="{{setDuration}}将过场特效持续时间设置为 {{duration}}seconds"
+AdvSceneSwitcher.action.timer="计时器"
+AdvSceneSwitcher.action.timer.type.pause="暂停"
+AdvSceneSwitcher.action.timer.type.continue="继续"
+AdvSceneSwitcher.action.timer.type.reset="重置"
+AdvSceneSwitcher.action.timer.type.setTimeRemaining="设置剩余时间"
+AdvSceneSwitcher.action.timer.entry="{{timerAction}} 定时在 {{macros}} {{duration}}"
+AdvSceneSwitcher.action.random="随机"
+AdvSceneSwitcher.action.random.arguments="宏:"
+AdvSceneSwitcher.action.random.addArgument="增加 宏"
+AdvSceneSwitcher.action.random.entry="运行 {{macroSelection}}"
 
 ; Transition Tab
 AdvSceneSwitcher.transitionTab.title="转场特效"
+AdvSceneSwitcher.transitionTab.setTransitionBy="更改转场特效时:"
 AdvSceneSwitcher.transitionTab.transitionOverride="在场景切换器中设定的转场特效优先级高于场景设定的转场特效"
+AdvSceneSwitcher.transitionTab.adjustActiveTransitionType="更改激活转场特效类型"
 AdvSceneSwitcher.transitionTab.transitionForAToB="当自动从场景A切换到场景B时使用的转场特效"
-AdvSceneSwitcher.transitionTab.transitionsHelp="<html><head/><body><p>这里的设定<span style=\"font-style:bold;\">只影响由场景切换器引起的转场有效</span>，不影响你手动的引起的转场。<br/>在这里设定的转场特效优先级高于场景切换器其他地方设置的<br/><br/>Click the plus symbol below to continue.</p></body></html>"
+AdvSceneSwitcher.transitionTab.transitionsHelp="<html><head/><body><p>这里的设定<span style=\"font-style:bold;\">只影响由场景切换器引起的转场有效</span>，不影响你手动的引起的转场。<br/>在这里设定的转场特效优先级高于场景切换器其他地方设置的<br/><br/>单击加号添加项目.</p></body></html>"
 AdvSceneSwitcher.transitionTab.defaultTransition="当切换到这个场景时修改默认转场特效"
 AdvSceneSwitcher.transitionTab.switchDefaultLabel="活跃时切换默认转场特效为"
 AdvSceneSwitcher.transitionTab.entry="从场景 {{scenes}} 切换到场景 {{scenes2}} 时使用转场特效 {{transitions}}"
 AdvSceneSwitcher.transitionTab.defaultTransitionEntry="当场景 {{scenes}} 被激活时更改默认转场特效为 {{transitions}}"
+AdvSceneSwitcher.transitionTab.defaultTransitionsHelp="单击加号添加项目."
+AdvSceneSwitcher.transitionTab.defaultTransition.delay="场景更改 {{defTransitionDelay}} 后切换转换特效."
+AdvSceneSwitcher.transitionTab.defaultTransition.delay.help="延迟用于避免取消场景切换，如果在转换仍在进行时更改了转换类型，则可能会发生这种情况."
 
 ; Pause Scenes Tab
 AdvSceneSwitcher.pauseTab.title="暂停"
 AdvSceneSwitcher.pauseTab.pauseOnScene="当切换到这个场景时暂停场景切换器"
 AdvSceneSwitcher.pauseTab.pauseInFocus1="当窗口"
 AdvSceneSwitcher.pauseTab.pauseInFocus2="获得焦点时暂停场景切换器"
+AdvSceneSwitcher.pauseTab.pauseTypeScene="场景处于活动状态"
+AdvSceneSwitcher.pauseTab.pauseTypeWindow="窗口处于焦点位置"
+AdvSceneSwitcher.pauseTab.pauseTargetAll="全部"
+AdvSceneSwitcher.pauseTab.pauseEntry="暂停 {{pauseTargets}} 检查时 {{pauseTypes}} {{scenes}} {{windows}}"
+AdvSceneSwitcher.pauseTab.help="在此选项卡上，您可以配置在场景处于活动状态或窗口处于焦点时暂停各个切换方法。\n\n单击高亮显示的加号继续."
 
 ; Window Title Tab
 AdvSceneSwitcher.windowTitleTab.title="窗口标题"
@@ -71,31 +393,37 @@ AdvSceneSwitcher.windowTitleTab.fullscreen="全屏时"
 AdvSceneSwitcher.windowTitleTab.maximized="最大化时"
 AdvSceneSwitcher.windowTitleTab.focused="窗口聚集时"
 AdvSceneSwitcher.windowTitleTab.entry="{{windows}} {{scenes}} {{transitions}} {{fullscreen}} {{maximized}} {{focused}}"
+AdvSceneSwitcher.windowTitleTab.windowsHelp="根据正在运行的应用程序的窗口标题切换场景。\n可以选择以下附加条件：\n窗口全屏显示\n窗口最大化\n窗口聚焦\n\n单击高亮显示的加号继续."
+AdvSceneSwitcher.windowTitleTab.ignoreWindowsHelp="如果忽略某个窗口标题，则场景切换程序的作用将与之前选择的窗口仍处于焦点状态一样。\n如果您经常切换到其他窗口，则这将允许您避免场景切换，不会触发场景更改。\n\n请选择窗口或在上面输入窗口标题，然后单击下面的加号将其添加到列表中."
 
 ; Executable Tab
 AdvSceneSwitcher.executableTab.title="程序"
 AdvSceneSwitcher.executableTab.implemented="感谢dasOven的实现"
 AdvSceneSwitcher.executableTab.requiresFocus="仅获得焦点时"
 AdvSceneSwitcher.executableTab.entry="当 {{processes}} 正在运行时使用 {{transitions}} 切换到 {{scenes}} {{requiresFocus}}"
+AdvSceneSwitcher.executableTab.help="如果进程正在运行，此选项卡将允许您自动切换场景。\n这在窗口名称可能更改或未知的情况下非常有用。\n\n单击突出显示的加号继续."
 
 ; Screen Region Tab
 AdvSceneSwitcher.screenRegionTab.title="屏幕区域"
 AdvSceneSwitcher.screenRegionTab.currentPosition="鼠标当前位置："
 AdvSceneSwitcher.screenRegionTab.showGuideFrames="显示区域边界"
 AdvSceneSwitcher.screenRegionTab.hideGuideFrames="隐藏区域边界"
+AdvSceneSwitcher.screenRegionTab.excludeScenes.None="没有选择"
 AdvSceneSwitcher.screenRegionTab.entry="如果鼠标在 {{minX}} {{minY}} x {{maxX}} {{maxY}} 使用转场特效 {{transitions}} 切换到场景 {{scenes}} unless in {{excludeScenes}}"
+AdvSceneSwitcher.screenRegionTab.help="此选项卡允许您根据鼠标光标的当前位置自动切换场景。\n\n单击高亮显示的加号继续."
 
 ; Media Tab
 AdvSceneSwitcher.mediaTab.title="媒体"
 AdvSceneSwitcher.mediaTab.implemented="感谢Exeldro的实现"
-AdvSceneSwitcher.mediaTab.states.none="空"
+AdvSceneSwitcher.mediaTab.states.none="无"
 AdvSceneSwitcher.mediaTab.states.playing="播放中"
-AdvSceneSwitcher.mediaTab.states.opening="正在打开"
+AdvSceneSwitcher.mediaTab.states.opening="打开中"
 AdvSceneSwitcher.mediaTab.states.buffering="缓冲中"
 AdvSceneSwitcher.mediaTab.states.Paused="暂停"
 AdvSceneSwitcher.mediaTab.states.stopped="停止"
 AdvSceneSwitcher.mediaTab.states.ended="结束"
 AdvSceneSwitcher.mediaTab.states.error="错误"
+AdvSceneSwitcher.mediaTab.states.playedToEnd="播放结束"
 AdvSceneSwitcher.mediaTab.states.any="任意"
 AdvSceneSwitcher.mediaTab.timeRestriction.none="无"
 AdvSceneSwitcher.mediaTab.timeRestriction.shorter="播放时间小于"
@@ -103,6 +431,7 @@ AdvSceneSwitcher.mediaTab.timeRestriction.longer="播放时间大于"
 AdvSceneSwitcher.mediaTab.timeRestriction.remainShorter="剩余时间少于"
 AdvSceneSwitcher.mediaTab.timeRestriction.remainLonger="剩余时间多于"
 AdvSceneSwitcher.mediaTab.entry="当 {{mediaSources}} 状态为 {{states}} 并且 {{timeRestrictions}} {{time}} 时使用转场特效 {{transitions}} 切换到场景 {{scenes}}"
+AdvSceneSwitcher.mediaTab.help="此选项卡允许您根据媒体源的状态切换场景。\n例如，一旦所选媒体源结束播放，您可以自动切换回上一个场景。\n\n单击高亮显示的加号继续."
 
 ; File Tab
 AdvSceneSwitcher.fileTab.title="文件"
@@ -127,11 +456,13 @@ AdvSceneSwitcher.fileTab.checkfileContent="仅当文件发生修改时"
 AdvSceneSwitcher.fileTab.entry="如果 {{fileType}} 文件 {{filePath}} {{browseButton}} 匹配下列规则，使用转场特效 {{transitions}} 切换到场景 {{scenes}}"
 AdvSceneSwitcher.fileTab.entry2="{{matchText}}"
 AdvSceneSwitcher.fileTab.entry3="{{useRegex}} {{checkModificationDate}} {{checkFileContent}}"
+AdvSceneSwitcher.fileTab.help="此选项卡允许您根据远程或本地文件的内容自动切换场景。\n\n单击突出显示的加号继续."
 
 ; Random Tab
 AdvSceneSwitcher.randomTab.title="随机场景列表"
 AdvSceneSwitcher.randomTab.randomDisabledWarning="功能已被禁用 - 可通过在通用页设置\"如果不符合任何切换条件切换到随机场景列表中任意随机场景\"启用"
 AdvSceneSwitcher.randomTab.entry="如果没有切换器条件满足，使用转场特效 {{transitions}} 切换到场景 {{scenes}} 并停留 {{delay}}"
+AdvSceneSwitcher.randomTab.help="场景切换程序将在此选项卡上随机选择一个条目，以便在配置的时间内切换到该条目。\n请注意，同一条目不会连续选择两次。\n\n单击高亮显示的加号继续."
 
 ; Time Tab
 AdvSceneSwitcher.timeTab.title="时间"
@@ -146,15 +477,12 @@ AdvSceneSwitcher.timeTab.sundays="每周日"
 AdvSceneSwitcher.timeTab.afterstart="推流或录制开始后"
 AdvSceneSwitcher.timeTab.afterstart.tip="相对于直播或录制开始之后的时间点"
 AdvSceneSwitcher.timeTab.entry="{{triggers}} 的 {{time}} 使用转场特效 {{transitions}} 切换到场景 {{scenes}}"
+AdvSceneSwitcher.timeTab.help="此选项卡将允许您根据当前本地时间自动切换到其他场景。\n\n请注意，场景切换程序仅在您指定的确切时间切换场景。\n请确保您已根据自己的喜好在“常规”选项卡上配置了优先级设置，以便不会因其他切换而错过选定的时间点具有较高优先级的方法。\n\n单击突出显示的加号继续."
 
 ; Idle Tab
 AdvSceneSwitcher.idleTab.title="闲置检测"
 AdvSceneSwitcher.idleTab.enable="启用闲置检测"
-AdvSceneSwitcher.idleTab.condition1="超过"
-AdvSceneSwitcher.idleTab.condition2="没有鼠标或键盘操作"
-AdvSceneSwitcher.idleTab.switchToScene="切换到场景"
-AdvSceneSwitcher.idleTab.usingTransition1="使用"
-AdvSceneSwitcher.idleTab.usingTransition2="转场特效"
+AdvSceneSwitcher.idleTab.idleswitch="超过 {{duration}} 如果没有键盘或鼠标输入，则切换到场景 {{scenes}} 使用 {{transitions}}"
 AdvSceneSwitcher.idleTab.dontSwitchIfFocus1="如果当前窗口焦点在"
 AdvSceneSwitcher.idleTab.dontSwitchIfFocus2="时不切换"
 
@@ -169,35 +497,148 @@ AdvSceneSwitcher.sceneSequenceTab.loadFail="导入失败"
 AdvSceneSwitcher.sceneSequenceTab.loadSuccess="导入失败成功"
 AdvSceneSwitcher.sceneSequenceTab.fileType="文本文件 (*.txt)"
 AdvSceneSwitcher.sceneSequenceTab.entry="当场景 {{startScenes}} 被激活 {{delay}} 后使用转场特效 {{transitions}} 切换到场景 {{scenes}} {{interruptible}}"
+AdvSceneSwitcher.sceneSequenceTab.interruptible="中断"
+AdvSceneSwitcher.sceneSequenceTab.interruptibleHint="允许使用其他切换方法中断此场景序列"
+AdvSceneSwitcher.sceneSequenceTab.extendEdit="扩展序列"
+AdvSceneSwitcher.sceneSequenceTab.extendEntry="之后 {{delay}} 切换到 {{scenes}} 使用 {{transitions}}"
+AdvSceneSwitcher.sceneSequenceTab.help="如果某个场景在配置的时间段内处于活动状态，此选项卡将允许您自动切换到其他场景。\n例如，您可以自动在两个场景之间来回循环。\n\n单击高亮显示的加号继续."
 
 ; Audio Tab
 AdvSceneSwitcher.audioTab.title="音频"
-AdvSceneSwitcher.audioTab.entry="当{{audioSources}} is {{condition}} {{volumeWidget}} for {{duration}} 使用转场特效 {{transitions}} 切换到场景 {{scenes}}"
+AdvSceneSwitcher.audioTab.condition.above="高于"
+AdvSceneSwitcher.audioTab.condition.below="低于"
+AdvSceneSwitcher.audioTab.ignoreInactiveSource="除非源处于非活动状态"
+AdvSceneSwitcher.audioTab.entry="当{{audioSources}} 在 {{condition}} {{volumeWidget}} for {{duration}} 使用转场特效 {{transitions}} 切换到场景 {{scenes}}"
+AdvSceneSwitcher.audioTab.multiMatchfallbackCondition="如果多个条目匹配 ..."
+AdvSceneSwitcher.audioTab.multiMatchfallback="... for {{duration}} 秒切换到 {{scenes}} 使用 {{transitions}}"
+AdvSceneSwitcher.audioTab.help="此选项卡允许您根据源音量切换场景。\n例如，如果麦克风音量达到某个阈值，您可以自动切换到其他场景。\n\n单击高亮显示的加号继续."
+
+; Video Tab
+AdvSceneSwitcher.videoTab.title="视频"
+AdvSceneSwitcher.videoTab.getScreenshot="获取所选条目的屏幕截图"
+AdvSceneSwitcher.videoTab.getScreenshotHelp="获取当前选定项目的视频源的屏幕截图，并自动将其设置为目标图像"
+AdvSceneSwitcher.videoTab.condition.match="完全匹配"
+AdvSceneSwitcher.videoTab.condition.match.tooltip="精确匹配要求目标图像和源图像具有相同的分辨率。\n另外，每个像素都需要匹配，这就是为什么不建议使用使用压缩（例如.JPG）的图像格式！"
+AdvSceneSwitcher.videoTab.condition.differ="不匹配"
+AdvSceneSwitcher.videoTab.condition.hasNotChanged="没有改变"
+AdvSceneSwitcher.videoTab.condition.hasChanged="改变了"
+AdvSceneSwitcher.videoTab.entry="当 {{videoSources}} {{condition}} {{filePath}} {{browseButton}} for {{duration}} 切换 {{scenes}} using {{transitions}} {{ignoreInactiveSource}}"
+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.DisabledWarning="不幸的是，在并行运行obs websocket插件时，由于库不兼容，不得不在macOS上禁用此功能."
+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="场景组"
+AdvSceneSwitcher.sceneGroupTab.edit="编辑场景组"
+AdvSceneSwitcher.sceneGroupTab.edit.name="名字:"
+AdvSceneSwitcher.sceneGroupTab.edit.type="类型: {{type}}"
+AdvSceneSwitcher.sceneGroupTab.type.count="计数"
+AdvSceneSwitcher.sceneGroupTab.type.time="时间"
+AdvSceneSwitcher.sceneGroupTab.type.random="随机"
+AdvSceneSwitcher.sceneGroupTab.edit.count="完成后前进到列表中的下一个场景 {{count}} 完全匹配"
+AdvSceneSwitcher.sceneGroupTab.edit.time="完成后前进到列表中的下一个场景 {{time}} 过去了"
+AdvSceneSwitcher.sceneGroupTab.edit.random="随机选择列表中的下一个场景"
+AdvSceneSwitcher.sceneGroupTab.edit.repeat="如果到达“场景结束”列表，则从头开始"
+AdvSceneSwitcher.sceneGroupTab.edit.addScene="添加场景"
+AdvSceneSwitcher.sceneGroupTab.add="添加场景组"
+AdvSceneSwitcher.sceneGroupTab.defaultname="场景组 %1"
+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="停止高级场景切换器"
 AdvSceneSwitcher.hotkey.startStopToggleSwitcherHotkey="切换(启动/停止)高级场景切换器"
+AdvSceneSwitcher.hotkey.macro.pause="暂停宏 %1"
+AdvSceneSwitcher.hotkey.macro.unpause="取消暂停宏 %1"
+
+AdvSceneSwitcher.askBackup="检测到新版本的高级场景切换程序。\n是否要创建旧设置的备份?"
 
 AdvSceneSwitcher.close="关闭"
 AdvSceneSwitcher.browse="浏览文件"
 
 AdvSceneSwitcher.selectScene="--选择场景--"
+AdvSceneSwitcher.selectPreviousScene="上个场景"
+AdvSceneSwitcher.selectCurrentScene="当前场景"
+AdvSceneSwitcher.selectAnyScene="任何场景"
+AdvSceneSwitcher.currentTransition="当前转场特效"
+AdvSceneSwitcher.anyTransition="任何转场特效"
 AdvSceneSwitcher.selectTransition="--选择转场特效--"
 AdvSceneSwitcher.selectWindow="--选择窗口--"
+AdvSceneSwitcher.selectSource="--选择源--"
 AdvSceneSwitcher.selectAudioSource="--选择音频源--"
+AdvSceneSwitcher.selectVideoSource="--选择视频源--"
 AdvSceneSwitcher.selectMediaSource="--选择媒体源--"
 AdvSceneSwitcher.selectProcess="--选择进程--"
+AdvSceneSwitcher.selectFilter="--select filter--"
+AdvSceneSwitcher.selectMacro="--选择宏--"
+AdvSceneSwitcher.selectItem="--选择项目--"
 AdvSceneSwitcher.enterPath="--输入路径--"
 AdvSceneSwitcher.enterText="--输入文本--"
 AdvSceneSwitcher.invaildEntriesWillNotBeSaved="无效项将不会被保存"
-AdvSceneSwitcher.selectWindowTip="使用 \"OBS\" 来指定OBS窗口\n使用 \"Task Switching\" 来指定 Alt + Tab"
+AdvSceneSwitcher.selectWindowTip="使用 \"OBS\" 来指定OBS窗口\n使用 \"任务切换\" 来指定 Alt + Tab"
 
 AdvSceneSwitcher.status.active="运行中"
 AdvSceneSwitcher.status.inactive="已停止"
+AdvSceneSwitcher.running="插件运行"
+AdvSceneSwitcher.stopped="插件停止"
 
 AdvSceneSwitcher.unit.milliseconds="毫秒"
 AdvSceneSwitcher.unit.secends="秒"
 AdvSceneSwitcher.unit.minutes="分钟"
 AdvSceneSwitcher.unit.hours="小时"
-
+AdvSceneSwitcher.duration.condition.none="没有时间限制"
+AdvSceneSwitcher.duration.condition.more="时间少于"
+AdvSceneSwitcher.duration.condition.equal="时间等于"
+AdvSceneSwitcher.duration.condition.less="时间大于"

external/FindLibObs.cmake

@@ -1,107 +0,0 @@
-# This module can be copied and used by external plugins for OBS
-#
-# Once done these will be defined:
-#
-#  LIBOBS_FOUND
-#  LIBOBS_INCLUDE_DIRS
-#  LIBOBS_LIBRARIES
-
-find_package(PkgConfig QUIET)
-if (PKG_CONFIG_FOUND)
-	pkg_check_modules(_OBS QUIET obs libobs)
-endif()
-
-if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-	set(_lib_suffix 64)
-else()
-	set(_lib_suffix 32)
-endif()
-
-if(DEFINED CMAKE_BUILD_TYPE)
-	if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-		set(_build_type_base "debug")
-	else()
-		set(_build_type_base "release")
-	endif()
-endif()
-
-find_path(LIBOBS_INCLUDE_DIR
-	NAMES obs.h
-	HINTS
-		ENV obsPath${_lib_suffix}
-		ENV obsPath
-		${obsPath}
-	PATHS
-		/usr/include /usr/local/include /opt/local/include /sw/include
-	PATH_SUFFIXES
-		libobs
-	)
-
-function(find_obs_lib base_name repo_build_path lib_name)
-	string(TOUPPER "${base_name}" base_name_u)
-
-	if(DEFINED _build_type_base)
-		set(_build_type_${repo_build_path} "${_build_type_base}/${repo_build_path}")
-		set(_build_type_${repo_build_path}${_lib_suffix} "${_build_type_base}${_lib_suffix}/${repo_build_path}")
-	endif()
-
-	find_library(${base_name_u}_LIB
-		NAMES ${_${base_name_u}_LIBRARIES} ${lib_name} lib${lib_name}
-		HINTS
-			ENV obsPath${_lib_suffix}
-			ENV obsPath
-			${obsPath}
-			${_${base_name_u}_LIBRARY_DIRS}
-		PATHS
-			/usr/lib /usr/local/lib /opt/local/lib /sw/lib
-		PATH_SUFFIXES
-			lib${_lib_suffix} lib
-			libs${_lib_suffix} libs
-			bin${_lib_suffix} bin
-			../lib${_lib_suffix} ../lib
-			../libs${_lib_suffix} ../libs
-			../bin${_lib_suffix} ../bin
-			# base repo non-msvc-specific search paths
-			${_build_type_${repo_build_path}}
-			${_build_type_${repo_build_path}${_lib_suffix}}
-			build/${repo_build_path}
-			build${_lib_suffix}/${repo_build_path}
-			# base repo msvc-specific search paths on windows
-			build${_lib_suffix}/${repo_build_path}/Debug
-			build${_lib_suffix}/${repo_build_path}/RelWithDebInfo
-			build/${repo_build_path}/Debug
-			build/${repo_build_path}/RelWithDebInfo
-		)
-endfunction()
-
-find_obs_lib(LIBOBS libobs obs)
-
-if(MSVC)
-	find_obs_lib(W32_PTHREADS deps/w32-pthreads w32-pthreads)
-endif()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Libobs DEFAULT_MSG LIBOBS_LIB LIBOBS_INCLUDE_DIR)
-mark_as_advanced(LIBOBS_INCLUDE_DIR LIBOBS_LIB)
-
-if(LIBOBS_FOUND)
-	if(MSVC)
-		if (NOT DEFINED W32_PTHREADS_LIB)
-			message(FATAL_ERROR "Could not find the w32-pthreads library" )
-		endif()
-
-		set(W32_PTHREADS_INCLUDE_DIR ${LIBOBS_INCLUDE_DIR}/../deps/w32-pthreads)
-	endif()
-
-	set(LIBOBS_INCLUDE_DIRS ${LIBOBS_INCLUDE_DIR} ${W32_PTHREADS_INCLUDE_DIR})
-	set(LIBOBS_LIBRARIES ${LIBOBS_LIB} ${W32_PTHREADS_LIB})
-	include(${LIBOBS_INCLUDE_DIR}/../cmake/external/ObsPluginHelpers.cmake)
-
-	# allows external plugins to easily use/share common dependencies that are often included with libobs (such as FFmpeg)
-	if(NOT DEFINED INCLUDED_LIBOBS_CMAKE_MODULES)
-		set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${LIBOBS_INCLUDE_DIR}/../cmake/Modules/")
-		set(INCLUDED_LIBOBS_CMAKE_MODULES true)
-	endif()
-else()
-	message(FATAL_ERROR "Could not find the libobs library" )
-endif()

external/ObsPluginHelpers.cmake

@@ -1,163 +0,0 @@
-# Functions for generating external plugins
-
-set(EXTERNAL_PLUGIN_OUTPUT_DIR "${CMAKE_BINARY_DIR}/rundir")
-
-# Fix XCode includes to ignore warnings on system includes
-function(target_include_directories_system _target)
-  if(XCODE)
-    foreach(_arg ${ARGN})
-      if("${_arg}" STREQUAL "PRIVATE" OR "${_arg}" STREQUAL "PUBLIC" OR "${_arg}" STREQUAL "INTERFACE")
-        set(_scope ${_arg})
-      else()
-        target_compile_options(${_target} ${_scope} -isystem${_arg})
-      endif()
-    endforeach()
-  else()
-    target_include_directories(${_target} SYSTEM ${_scope} ${ARGN})
-  endif()
-endfunction()
-
-function(install_external_plugin_data_internal target source_dir target_dir)
-	install(DIRECTORY ${source_dir}/
-		DESTINATION "${target}/${target_dir}"
-		USE_SOURCE_PERMISSIONS)
-	add_custom_command(TARGET ${target} POST_BUILD
-		COMMAND "${CMAKE_COMMAND}" -E copy_directory
-			"${CMAKE_CURRENT_SOURCE_DIR}/${source_dir}" "${EXTERNAL_PLUGIN_OUTPUT_DIR}/$<CONFIGURATION>/${target}/${target_dir}"
-		VERBATIM)
-endfunction()
-
-# Installs data
-# 'target' is the destination target project being installed to
-# 'data_loc' specifies the directory of the data
-function(install_external_plugin_data target data_loc)
-	install_external_plugin_data_internal(${target} ${data_loc} "data")
-endfunction()
-
-# Installs data in an architecture-specific data directory on windows/linux (data/32bit or data/64bit).  Does not apply for mac.
-# 'target' is the destination target project being installed to
-# 'data_loc' specifies the directory of the data being installed
-function(install_external_plugin_arch_data target data_loc)
-	if(APPLE)
-		set(_bit_suffix "")
-	elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
-		set(_bit_suffix "/64bit")
-	else()
-		set(_bit_suffix "/32bit")
-	endif()
-
-	install_external_plugin_data_internal(${target} ${data_loc} "data${_bit_suffix}")
-endfunction()
-
-# Installs data in the target's bin directory
-# 'target' is the destination target project being installed to
-# 'data_loc' specifies the directory of the data being installed
-function(install_external_plugin_data_to_bin target data_loc)
-	if(APPLE)
-		set(_bit_suffix "")
-	elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
-		set(_bit_suffix "/64bit")
-	else()
-		set(_bit_suffix "/32bit")
-	endif()
-
-	install_external_plugin_data_internal(${target} ${data_loc} "bin${_bit_suffix}")
-endfunction()
-
-# Installs an additional binary to a target
-# 'target' is the destination target project being installed to
-# 'additional_target' specifies the additional binary
-function(install_external_plugin_additional target additional_target)
-	if(APPLE)
-		set(_bit_suffix "")
-	elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
-		set(_bit_suffix "64bit/")
-	else()
-		set(_bit_suffix "32bit/")
-	endif()
-
-	set_target_properties(${additional_target} PROPERTIES
-		PREFIX "")
-
-	install(TARGETS ${additional_target}
-		LIBRARY DESTINATION "bin"
-		RUNTIME DESTINATION "bin")
-	add_custom_command(TARGET ${additional_target} POST_BUILD
-		COMMAND "${CMAKE_COMMAND}" -E copy
-			"$<TARGET_FILE:${additional_target}>"
-			"${EXTERNAL_PLUGIN_OUTPUT_DIR}/$<CONFIGURATION>/${target}/bin/${_bit_suffix}$<TARGET_FILE_NAME:${additional_target}>"
-		VERBATIM)
-endfunction()
-
-# Installs the binary of the target
-# 'target' is the target project being installed
-function(install_external_plugin target)
-	install_external_plugin_additional(${target} ${target})
-endfunction()
-
-# Installs the binary and data of the target
-# 'target' is the destination target project being installed to
-function(install_external_plugin_with_data target data_loc)
-	install_external_plugin(${target})
-	install_external_plugin_data(${target} ${data_loc})
-endfunction()
-
-# Installs an additional binary to the data of a target
-# 'target' is the destination target project being installed to
-# 'additional_target' specifies the additional binary
-function(install_external_plugin_bin_to_data target additional_target)
-	install(TARGETS ${additional_target}
-		LIBRARY DESTINATION "data"
-		RUNTIME DESTINATION "data")
-	add_custom_command(TARGET ${additional_target} POST_BUILD
-		COMMAND "${CMAKE_COMMAND}" -E copy
-			"$<TARGET_FILE:${additional_target}>"
-			"${EXTERNAL_PLUGIN_OUTPUT_DIR}/$<CONFIGURATION>/${target}/data/$<TARGET_FILE_NAME:${additional_target}>"
-		VERBATIM)
-endfunction()
-
-# Installs an additional binary in an architecture-specific data directory on windows/linux (data/32bit or data/64bit).  Does not apply for mac.
-# 'target' is the destination target project being installed to
-# 'additional_target' specifies the additional binary
-function(install_external_plugin_bin_to_arch_data target additional_target)
-	if(APPLE)
-		set(_bit_suffix "")
-	elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
-		set(_bit_suffix "/64bit")
-	else()
-		set(_bit_suffix "/32bit")
-	endif()
-
-	install(TARGETS ${additional_target}
-		LIBRARY DESTINATION "data${_bit_suffix}"
-		RUNTIME DESTINATION "data${_bit_suffix}")
-	add_custom_command(TARGET ${additional_target} POST_BUILD
-		COMMAND "${CMAKE_COMMAND}" -E copy
-			"$<TARGET_FILE:${additional_target}>"
-			"${EXTERNAL_PLUGIN_OUTPUT_DIR}/$<CONFIGURATION>/${target}/data${_bit_suffix}/$<TARGET_FILE_NAME:${additional_target}>"
-		VERBATIM)
-endfunction()
-
-# Installs an additional file in an architecture-specific data directory on windows/linux (data/32bit or data/64bit).  Does not apply for mac.
-# 'target' is the destination target project being installed to
-# 'additional_target' specifies the additional binary
-function(install_external_plugin_data_file_to_arch_data target additional_target file_target)
-	if(APPLE)
-		set(_bit_suffix "")
-	elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
-		set(_bit_suffix "/64bit")
-	else()
-		set(_bit_suffix "/32bit")
-	endif()
-
-	get_filename_component(file_target_name ${file_target} NAME)
-
-	install(TARGETS ${additional_target}
-		LIBRARY DESTINATION "data${_bit_suffix}"
-		RUNTIME DESTINATION "data${_bit_suffix}")
-	add_custom_command(TARGET ${additional_target} POST_BUILD
-		COMMAND "${CMAKE_COMMAND}" -E copy
-			"${file_target}"
-			"${EXTERNAL_PLUGIN_OUTPUT_DIR}/$<CONFIGURATION>/${target}/data${_bit_suffix}/${file_target_name}"
-		VERBATIM)
-endfunction()

forms/advanced-scene-switcher.ui

@@ -258,13 +258,6 @@
                 </item>
                </layout>
               </item>
-              <item>
-               <widget class="Line" name="line_6">
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
               <item>
                <layout class="QHBoxLayout" name="horizontalLayout_52">
                 <item>
@@ -313,6 +306,30 @@
                 </item>
                </layout>
               </item>
+              <item>
+               <layout class="QHBoxLayout" name="horizontalLayout_2">
+                <item>
+                 <widget class="QCheckBox" name="showTrayNotifications">
+                  <property name="text">
+                   <string>AdvSceneSwitcher.generalTab.generalBehavior.showTrayNotifications</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <spacer name="horizontalSpacer_2">
+                  <property name="orientation">
+                   <enum>Qt::Horizontal</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0">
+                   <size>
+                    <width>40</width>
+                    <height>20</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+               </layout>
+              </item>
               <item>
                <layout class="QHBoxLayout" name="horizontalLayout_48">
                 <item>
@@ -364,19 +381,6 @@
                   <item>
                    <widget class="QListWidget" name="priorityList"/>
                   </item>
-                  <item>
-                   <spacer name="horizontalSpacer_30">
-                    <property name="orientation">
-                     <enum>Qt::Horizontal</enum>
-                    </property>
-                    <property name="sizeHint" stdset="0">
-                     <size>
-                      <width>40</width>
-                      <height>20</height>
-                     </size>
-                    </property>
-                   </spacer>
-                  </item>
                  </layout>
                 </item>
                </layout>
@@ -541,6 +545,13 @@
           <string>AdvSceneSwitcher.macroTab.macros</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_36">
+          <item>
+           <widget class="QLabel" name="macroPriorityWarning">
+            <property name="text">
+             <string>AdvSceneSwitcher.macroTab.priorityWarning</string>
+            </property>
+           </widget>
+          </item>
           <item>
            <layout class="QGridLayout" name="gridLayout_26">
             <item row="0" column="0">
@@ -718,7 +729,7 @@
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_34">
           <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_18" stretch="0,0,0">
+           <layout class="QHBoxLayout" name="horizontalLayout_18" stretch="0,0,0,0,0">
             <item>
              <widget class="QLabel" name="label_20">
               <property name="text">
@@ -729,6 +740,20 @@
             <item>
              <widget class="QLineEdit" name="macroName"/>
             </item>
+            <item>
+             <widget class="QPushButton" name="runMacro">
+              <property name="text">
+               <string>AdvSceneSwitcher.macroTab.run</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="runMacroInParallel">
+              <property name="text">
+               <string>AdvSceneSwitcher.macroTab.runInParallel</string>
+              </property>
+             </widget>
+            </item>
             <item>
              <spacer name="horizontalSpacer_13">
               <property name="orientation">
@@ -759,7 +784,7 @@
                 <x>0</x>
                 <y>0</y>
                 <width>767</width>
-                <height>220</height>
+                <height>218</height>
                </rect>
               </property>
               <layout class="QVBoxLayout" name="verticalLayout_35" stretch="10,1">
@@ -858,7 +883,7 @@
                 <x>0</x>
                 <y>0</y>
                 <width>767</width>
-                <height>219</height>
+                <height>218</height>
                </rect>
               </property>
               <layout class="QVBoxLayout" name="verticalLayout_33" stretch="10,1">

src/advanced-scene-switcher.cpp

@@ -2,6 +2,7 @@
 #include <QAction>
 #include <QFileDialog>
 #include <regex>
+#include <filesystem>
 
 #include <obs-module.h>
 #include <obs-frontend-api.h>
@@ -19,6 +20,7 @@ SwitcherData *switcher = nullptr;
 AdvSceneSwitcher::AdvSceneSwitcher(QWidget *parent)
 	: QDialog(parent), ui(new Ui_AdvSceneSwitcher)
 {
+	switcher->settingsWindowOpened = true;
 	ui->setupUi(this);
 
 	std::lock_guard<std::mutex> lock(switcher->m);
@@ -27,6 +29,13 @@ AdvSceneSwitcher::AdvSceneSwitcher(QWidget *parent)
 	loadUI();
 }
 
+AdvSceneSwitcher::~AdvSceneSwitcher()
+{
+	if (switcher) {
+		switcher->settingsWindowOpened = false;
+	}
+}
+
 bool translationAvailable()
 {
 	return !!strcmp(obs_module_text("AdvSceneSwitcher.pluginName"),
@@ -36,9 +45,16 @@ bool translationAvailable()
 void AdvSceneSwitcher::loadUI()
 {
 	if (!translationAvailable()) {
-		(void)DisplayMessage(
-			"Failed to find plug-in's 'data' directory.\n"
-			"Please check installation instructions!");
+		QString msg = "Failed to find plug-in's 'data' directory.\n"
+			      "Please check installation instructions!\n\n"
+			      "Data most likely expected at:\n\n";
+#ifdef _WIN32
+		msg += QString::fromStdString(
+			(std::filesystem::current_path().string()));
+		msg += "/";
+#endif
+		msg += obs_get_module_data_path(obs_current_module());
+		(void)DisplayMessage(msg);
 	}
 
 #if __APPLE__
@@ -72,71 +88,34 @@ void AdvSceneSwitcher::loadUI()
 /******************************************************************************
  * Saving and loading
  ******************************************************************************/
-void AskBackup(obs_data_t *obj)
-{
-	bool backupSettings = DisplayMessage(
-		obs_module_text("AdvSceneSwitcher.askBackup"), true);
-
-	if (!backupSettings) {
-		return;
-	}
-
-	QString directory = QFileDialog::getSaveFileName(
-		nullptr,
-		obs_module_text(
-			"AdvSceneSwitcher.generalTab.saveOrLoadsettings.importWindowTitle"),
-		QDir::currentPath(),
-		obs_module_text(
-			"AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType"));
-	if (directory.isEmpty()) {
-		return;
-	}
-
-	QFile file(directory);
-	if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
-		return;
-	}
-
-	obs_data_save_json(obj, file.fileName().toUtf8().constData());
-}
-
 static void SaveSceneSwitcher(obs_data_t *save_data, bool saving, void *)
 {
 	if (saving) {
 		std::lock_guard<std::mutex> lock(switcher->m);
-
 		switcher->Prune();
-
 		obs_data_t *obj = obs_data_create();
-
 		switcher->saveSettings(obj);
-
 		obs_data_set_obj(save_data, "advanced-scene-switcher", obj);
-
 		obs_data_release(obj);
 	} else {
-		switcher->m.lock();
-
-		obs_data_t *obj =
-			obs_data_get_obj(save_data, "advanced-scene-switcher");
-
-		if (!obj) {
-			obj = obs_data_create();
-		}
-		if (switcher->versionChanged(obj, g_GIT_SHA1)) {
-			AskBackup(obj);
-		}
-
-		switcher->loadSettings(obj);
-
-		obs_data_release(obj);
-
-		switcher->m.unlock();
-
 		// Stop the scene switcher at least once to
 		// avoid scene duplication issues with scene collection changes
 		bool start = !switcher->stop;
 		switcher->Stop();
+
+		switcher->m.lock();
+		obs_data_t *obj =
+			obs_data_get_obj(save_data, "advanced-scene-switcher");
+		if (!obj) {
+			obj = obs_data_create();
+		}
+		if (switcher->versionChanged(obj, g_GIT_SHA1)) {
+			AskForBackup(obj);
+		}
+		switcher->loadSettings(obj);
+		obs_data_release(obj);
+		switcher->m.unlock();
+
 		if (start) {
 			switcher->Start();
 		}
@@ -166,9 +145,7 @@ void SwitcherData::Thread()
 		bool setPrevSceneAfterLinger = false;
 		bool macroMatch = false;
 		macroSceneSwitched = false;
-
 		endTime = std::chrono::high_resolution_clock::now();
-
 		auto runTime =
 			std::chrono::duration_cast<std::chrono::milliseconds>(
 				endTime - startTime);
@@ -232,12 +209,17 @@ void SwitcherData::Thread()
 			}
 		}
 
-		// After this point we will call frontend functions
+		// After this point we will call frontend functions like
 		// obs_frontend_set_current_scene() and
 		// obs_frontend_set_current_transition()
 		//
 		// During this time SaveSceneSwitcher() could be called
-		// leading to a deadlock, so we have to unlock()
+		// leading to a deadlock with the frontend function being stuck
+		// in QMetaObject::invokeMethod() holding the mutex and
+		// OBS being stuck in SaveSceneSwitcher().
+		//
+		// So we have to unlock() risking race conditions as these are
+		// less frequent than the above described deadlock
 		lock.unlock();
 
 		if (match) {
@@ -360,8 +342,7 @@ void switchScene(const sceneSwitchInfo &sceneSwitch)
 	}
 
 	obs_source_t *source = obs_weak_source_get_source(sceneSwitch.scene);
-	obs_source_t *currentSource =
-		obs_weak_source_get_source(switcher->currentScene);
+	obs_source_t *currentSource = obs_frontend_get_current_scene();
 
 	if (source && source != currentSource) {
 		transitionData currentTransitionData;
@@ -411,12 +392,18 @@ void SwitcherData::Start()
 	if (networkConfig.ClientEnabled) {
 		client.connect(networkConfig.GetClientUri());
 	}
+
+	if (showSystemTrayNotifications) {
+		DisplayTrayMessage(
+			obs_module_text("AdvSceneSwitcher.pluginName"),
+			obs_module_text("AdvSceneSwitcher.running"));
+	}
 }
 
 void ResetMacroCounters()
 {
 	for (auto &m : switcher->macros) {
-		m.ResetCount();
+		m->ResetCount();
 	}
 }
 
@@ -424,8 +411,9 @@ void SwitcherData::Stop()
 {
 	if (th && th->isRunning()) {
 		stop = true;
-		transitionCv.notify_one();
-		cv.notify_one();
+		cv.notify_all();
+		abortMacroWait = true;
+		macroWaitCv.notify_all();
 		th->wait();
 		delete th;
 		th = nullptr;
@@ -436,6 +424,19 @@ void SwitcherData::Stop()
 
 	server.stop();
 	client.disconnect();
+
+	for (auto &t : audioHelperThreads) {
+		if (t.joinable()) {
+			t.join();
+		}
+	}
+	audioHelperThreads.clear();
+
+	if (showSystemTrayNotifications) {
+		DisplayTrayMessage(
+			obs_module_text("AdvSceneSwitcher.pluginName"),
+			obs_module_text("AdvSceneSwitcher.stopped"));
+	}
 }
 
 void SwitcherData::setWaitScene()
@@ -475,6 +476,9 @@ extern "C" void FreeSceneSwitcher()
 
 void handleSceneChange()
 {
+	switcher->lastSceneChangeTime =
+		std::chrono::high_resolution_clock::now();
+
 	// Stop waiting if scene was changed
 	if (switcher->sceneChangedDuringWait()) {
 		switcher->cv.notify_one();
@@ -544,6 +548,24 @@ void setReplayBufferSaved()
 	switcher->replayBufferSaved = true;
 }
 
+void setTranstionEnd()
+{
+	switcher->lastTransitionEndTime =
+		std::chrono::high_resolution_clock::now();
+}
+
+void setStreamStarting()
+{
+	switcher->lastStreamStartingTime =
+		std::chrono::high_resolution_clock::now();
+}
+
+void setStreamStopping()
+{
+	switcher->lastStreamStoppingTime =
+		std::chrono::high_resolution_clock::now();
+}
+
 // Note to future self:
 // be careful using switcher->m here as there is potential for deadlocks when using
 // frontend functions such as obs_frontend_set_current_scene()
@@ -575,16 +597,30 @@ static void OBSEvent(enum obs_frontend_event event, void *switcher)
 	case OBS_FRONTEND_EVENT_STREAMING_STOPPED:
 		resetLiveTime();
 		break;
+#ifdef REPLAYBUFFER_SUPPORTED
 	case OBS_FRONTEND_EVENT_REPLAY_BUFFER_SAVED:
 		setReplayBufferSaved();
 		break;
+#endif
+	case OBS_FRONTEND_EVENT_TRANSITION_STOPPED:
+		setTranstionEnd();
+		break;
+	case OBS_FRONTEND_EVENT_STREAMING_STARTING:
+		setStreamStarting();
+		break;
+	case OBS_FRONTEND_EVENT_STREAMING_STOPPING:
+		setStreamStopping();
+		break;
 	default:
 		break;
 	}
 }
 
+AdvSceneSwitcher *ssWindow;
+
 extern "C" void InitSceneSwitcher()
 {
+	blog(LOG_INFO, "version: %s", g_GIT_TAG);
 	blog(LOG_INFO, "version: %s", g_GIT_SHA1);
 
 	QAction *action = (QAction *)obs_frontend_add_tools_menu_qaction(
@@ -599,11 +635,16 @@ extern "C" void InitSceneSwitcher()
 	PlatformInit();
 
 	auto cb = []() {
-		QMainWindow *window =
-			(QMainWindow *)obs_frontend_get_main_window();
-
-		AdvSceneSwitcher ss(window);
-		ss.exec();
+		if (switcher->settingsWindowOpened) {
+			ssWindow->show();
+			ssWindow->raise();
+			ssWindow->activateWindow();
+		} else {
+			ssWindow = new AdvSceneSwitcher(
+				(QMainWindow *)obs_frontend_get_main_window());
+			ssWindow->setAttribute(Qt::WA_DeleteOnClose);
+			ssWindow->show();
+		}
 	};
 
 	obs_frontend_add_save_callback(SaveSceneSwitcher, nullptr);

src/duration-control.cpp

@@ -46,6 +46,13 @@ double Duration::TimeRemaining()
 	return (seconds * 1000 - runTime.count()) / 1000.;
 }
 
+void Duration::SetTimeRemaining(double remaining)
+{
+	long long msPassed = (seconds - remaining) * 1000;
+	_startTime = std::chrono::high_resolution_clock::now() -
+		     std::chrono::milliseconds(msPassed);
+}
+
 void Duration::Reset()
 {
 	_startTime = {};

src/file-selection.cpp

@@ -0,0 +1,49 @@
+#include "headers/file-selection.hpp"
+
+#include <obs-module.h>
+#include <QLayout>
+#include <QFileDialog>
+
+FileSelection::FileSelection(FileSelection::Type type, QWidget *parent)
+	: QWidget(parent), _type(type)
+{
+	_filePath = new QLineEdit();
+	_browseButton =
+		new QPushButton(obs_module_text("AdvSceneSwitcher.browse"));
+
+	QWidget::connect(_filePath, SIGNAL(editingFinished()), this,
+			 SLOT(PathChange()));
+	QWidget::connect(_browseButton, SIGNAL(clicked()), this,
+			 SLOT(BrowseButtonClicked()));
+	QHBoxLayout *layout = new QHBoxLayout;
+	layout->addWidget(_filePath);
+	layout->addWidget(_browseButton);
+	layout->setContentsMargins(0, 0, 0, 0);
+	setLayout(layout);
+}
+
+void FileSelection::SetPath(const QString &path)
+{
+	_filePath->setText(path);
+}
+
+void FileSelection::BrowseButtonClicked()
+{
+	QString path;
+	if (_type == FileSelection::Type::WRITE) {
+		path = QFileDialog::getSaveFileName(this);
+	} else {
+		path = QFileDialog::getOpenFileName(this);
+	}
+	if (path.isEmpty()) {
+		return;
+	}
+
+	_filePath->setText(path);
+	emit PathChanged(path);
+}
+
+void FileSelection::PathChange()
+{
+	emit PathChanged(_filePath->text());
+}

src/general.cpp

@@ -3,12 +3,19 @@
 #include "headers/version.h"
 
 #include <QFileDialog>
+#include <QGuiApplication>
+#include <QStandardPaths>
 
 QMetaObject::Connection inactivePluse;
 
 void AdvSceneSwitcher::on_close_clicked()
 {
-	done(0);
+	close();
+}
+
+void AdvSceneSwitcher::reject()
+{
+	close();
 }
 
 void AdvSceneSwitcher::UpdateNonMatchingScene(const QString &name)
@@ -177,6 +184,9 @@ void AdvSceneSwitcher::on_toggleStartButton_clicked()
 
 void AdvSceneSwitcher::closeEvent(QCloseEvent *)
 {
+	if (!switcher) {
+		return;
+	}
 	switcher->windowPos = this->pos();
 	switcher->windowSize = this->size();
 
@@ -201,6 +211,15 @@ void AdvSceneSwitcher::on_saveWindowGeo_stateChanged(int state)
 	switcher->saveWindowGeo = state;
 }
 
+void AdvSceneSwitcher::on_showTrayNotifications_stateChanged(int state)
+{
+	if (loading) {
+		return;
+	}
+
+	switcher->showSystemTrayNotifications = state;
+}
+
 void AdvSceneSwitcher::on_uiHintsDisable_stateChanged(int state)
 {
 	if (loading) {
@@ -210,13 +229,53 @@ void AdvSceneSwitcher::on_uiHintsDisable_stateChanged(int state)
 	switcher->disableHints = state;
 }
 
+QString getDefaultSaveLocation()
+{
+	QString desktopPath = QStandardPaths::writableLocation(
+		QStandardPaths::DesktopLocation);
+	auto scName = obs_frontend_get_current_scene_collection();
+	QString sceneCollectionName(scName);
+	bfree(scName);
+	auto timestamp = QDateTime::currentDateTime();
+	return desktopPath + "/adv-ss-" + sceneCollectionName + "-" +
+	       timestamp.toString("yyyy.MM.dd.hh.mm.ss");
+}
+
+void AskForBackup(obs_data_t *obj)
+{
+	bool backupSettings = DisplayMessage(
+		obs_module_text("AdvSceneSwitcher.askBackup"), true);
+
+	if (!backupSettings) {
+		return;
+	}
+
+	QString path = QFileDialog::getSaveFileName(
+		nullptr,
+		obs_module_text(
+			"AdvSceneSwitcher.generalTab.saveOrLoadsettings.importWindowTitle"),
+		getDefaultSaveLocation(),
+		obs_module_text(
+			"AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType"));
+	if (path.isEmpty()) {
+		return;
+	}
+
+	QFile file(path);
+	if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+		return;
+	}
+
+	obs_data_save_json(obj, file.fileName().toUtf8().constData());
+}
+
 void AdvSceneSwitcher::on_exportSettings_clicked()
 {
 	QString directory = QFileDialog::getSaveFileName(
 		this,
 		tr(obs_module_text(
 			"AdvSceneSwitcher.generalTab.saveOrLoadsettings.exportWindowTitle")),
-		QDir::currentPath(),
+		getDefaultSaveLocation(),
 		tr(obs_module_text(
 			"AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType")));
 	if (directory.isEmpty()) {
@@ -377,9 +436,14 @@ void AdvSceneSwitcher::setTabOrder()
 	connect(bar, &QTabBar::tabMoved, this, &AdvSceneSwitcher::on_tabMoved);
 }
 
+bool windowPosValid(QPoint pos)
+{
+	return !!QGuiApplication::screenAt(pos);
+}
+
 void AdvSceneSwitcher::restoreWindowGeo()
 {
-	if (switcher->saveWindowGeo) {
+	if (switcher->saveWindowGeo && windowPosValid(switcher->windowPos)) {
 		this->resize(switcher->windowSize);
 		this->move(switcher->windowPos);
 	}
@@ -480,6 +544,8 @@ void SwitcherData::saveGeneralSettings(obs_data_t *obj)
 			 static_cast<int>(autoStartEvent));
 
 	obs_data_set_bool(obj, "verbose", verbose);
+	obs_data_set_bool(obj, "showSystemTrayNotifications",
+			  showSystemTrayNotifications);
 	obs_data_set_bool(obj, "disableHints", disableHints);
 
 	obs_data_set_int(obj, "priority0", functionNamesByPriority[0]);
@@ -551,6 +617,8 @@ void SwitcherData::loadGeneralSettings(obs_data_t *obj)
 		obs_data_get_int(obj, "autoStartEvent"));
 
 	verbose = obs_data_get_bool(obj, "verbose");
+	showSystemTrayNotifications =
+		obs_data_get_bool(obj, "showSystemTrayNotifications");
 	disableHints = obs_data_get_bool(obj, "disableHints");
 
 	obs_data_set_default_int(obj, "priority0", default_priority_0);
@@ -777,6 +845,8 @@ void AdvSceneSwitcher::setupGeneralTab()
 
 	ui->verboseLogging->setChecked(switcher->verbose);
 	ui->saveWindowGeo->setChecked(switcher->saveWindowGeo);
+	ui->showTrayNotifications->setChecked(
+		switcher->showSystemTrayNotifications);
 	ui->uiHintsDisable->setChecked(switcher->disableHints);
 
 	for (int p : switcher->functionNamesByPriority) {
@@ -864,4 +934,6 @@ void AdvSceneSwitcher::setupGeneralTab()
 	QTimer *statusTimer = new QTimer(this);
 	connect(statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus()));
 	statusTimer->start(1000);
+
+	setWindowTitle(windowTitle() + " - " + g_GIT_TAG);
 }

src/headers/advanced-scene-switcher.hpp

@@ -29,7 +29,9 @@ public:
 	bool currentStatusActive = false;
 
 	AdvSceneSwitcher(QWidget *parent);
+	~AdvSceneSwitcher();
 
+	void reject() override;
 	void closeEvent(QCloseEvent *event) override;
 
 	void SetStarted();
@@ -49,6 +51,10 @@ public:
 	bool addNewMacro(std::string &name);
 	Macro *getSelectedMacro();
 	void SetEditMacro(Macro &m);
+	void HighlightAction(int idx);
+	void HighlightCondition(int idx);
+	void PopulateMacroActions(Macro &m, uint32_t afterIdx = 0);
+	void PopulateMacroConditions(Macro &m, uint32_t afterIdx = 0);
 	void ConnectControlSignals(MacroActionEdit *);
 	void ConnectControlSignals(MacroConditionEdit *);
 	void SwapActions(Macro *m, int pos1, int pos2);
@@ -109,6 +115,8 @@ public slots:
 	void on_macroUp_clicked();
 	void on_macroDown_clicked();
 	void on_macroName_editingFinished();
+	void on_runMacro_clicked();
+	void on_runMacroInParallel_stateChanged(int value);
 	void on_macros_currentRowChanged(int idx);
 	void on_macros_itemChanged(QListWidgetItem *);
 	void on_conditionAdd_clicked();
@@ -159,6 +167,7 @@ public slots:
 
 	void on_verboseLogging_stateChanged(int state);
 	void on_saveWindowGeo_stateChanged(int state);
+	void on_showTrayNotifications_stateChanged(int state);
 	void on_uiHintsDisable_stateChanged(int state);
 
 	void on_exportSettings_clicked();
@@ -278,6 +287,11 @@ void restoreTransitionOverride(obs_source_t *scene, const transitionData &td);
 void switchScene(const sceneSwitchInfo &ssi);
 void switchPreviewScene(const OBSWeakSource &ws);
 
+/******************************************************************************
+ * Settings helper
+ ******************************************************************************/
+void AskForBackup(obs_data_t *obj);
+
 /******************************************************************************
  * Main SwitcherData
  ******************************************************************************/

src/headers/duration-control.hpp

@@ -22,6 +22,7 @@ public:
 
 	bool DurationReached();
 	double TimeRemaining();
+	void SetTimeRemaining(double);
 	void Reset();
 	std::string ToString();
 

src/headers/file-selection.hpp

@@ -0,0 +1,30 @@
+#pragma once
+#include <QLineEdit>
+#include <QPushButton>
+#include <QWidget>
+
+class FileSelection : public QWidget {
+	Q_OBJECT
+
+public:
+	enum class Type {
+		READ,
+		WRITE,
+	};
+
+	FileSelection(FileSelection::Type type = FileSelection::Type::READ,
+		      QWidget *parent = 0);
+	void SetPath(const QString &);
+	QPushButton *Button() { return _browseButton; }
+
+private slots:
+	void BrowseButtonClicked();
+	void PathChange();
+signals:
+	void PathChanged(const QString &);
+
+private:
+	Type _type;
+	QLineEdit *_filePath;
+	QPushButton *_browseButton;
+};

src/headers/macro-action-audio.hpp

@@ -1,7 +1,10 @@
 #pragma once
-#include <QSpinBox>
-#include <QHBoxLayout>
 #include "macro-action-edit.hpp"
+#include "duration-control.hpp"
+
+#include <QSpinBox>
+#include <QCheckBox>
+#include <QHBoxLayout>
 
 enum class AudioAction {
 	MUTE,
@@ -26,6 +29,8 @@ public:
 	OBSWeakSource _audioSource;
 	AudioAction _action = AudioAction::MUTE;
 	int _volume = 0;
+	bool _fade = false;
+	Duration _duration;
 
 private:
 	static bool _registered;
@@ -53,6 +58,8 @@ private slots:
 	void SourceChanged(const QString &text);
 	void ActionChanged(int value);
 	void VolumeChanged(int value);
+	void FadeChanged(int value);
+	void DurationChanged(double seconds);
 signals:
 	void HeaderInfoChanged(const QString &);
 
@@ -60,9 +67,11 @@ protected:
 	QComboBox *_audioSources;
 	QComboBox *_actions;
 	QSpinBox *_volumePercent;
+	QCheckBox *_fade;
+	DurationSelection *_duration;
+	QHBoxLayout *_fadeLayout;
 	std::shared_ptr<MacroActionAudio> _entryData;
 
 private:
-	QHBoxLayout *_mainLayout;
 	bool _loading = true;
 };

src/headers/macro-action-edit.hpp

@@ -5,8 +5,8 @@ struct MacroActionInfo {
 	using TCreateMethod = std::shared_ptr<MacroAction> (*)();
 	using TCreateWidgetMethod = QWidget *(*)(QWidget *parent,
 						 std::shared_ptr<MacroAction>);
-	TCreateMethod _createFunc;
-	TCreateWidgetMethod _createWidgetFunc;
+	TCreateMethod _createFunc = nullptr;
+	TCreateWidgetMethod _createWidgetFunc = nullptr;
 	std::string _name;
 };
 

src/headers/macro-action-file.hpp

@@ -2,6 +2,7 @@
 #include <QSpinBox>
 #include <QPlainTextEdit>
 #include "macro-action-edit.hpp"
+#include "file-selection.hpp"
 
 enum class FileAction {
 	WRITE,
@@ -47,16 +48,14 @@ public:
 	}
 
 private slots:
-	void FilePathChanged();
-	void BrowseButtonClicked();
+	void PathChanged(const QString &text);
 	void TextChanged();
 	void ActionChanged(int value);
 signals:
 	void HeaderInfoChanged(const QString &);
 
 protected:
-	QLineEdit *_filePath;
-	QPushButton *_browseButton;
+	FileSelection *_filePath;
 	QPlainTextEdit *_text;
 	QComboBox *_actions;
 	std::shared_ptr<MacroActionFile> _entryData;

src/headers/macro-action-hotkey.hpp

@@ -3,6 +3,7 @@
 #include "hotkey.hpp"
 
 #include <QCheckBox>
+#include <QSpinBox>
 #include <QHBoxLayout>
 
 class MacroActionHotkey : public MacroAction {
@@ -27,6 +28,12 @@ public:
 	bool _rightAlt = false;
 	bool _leftMeta = false;
 	bool _rightMeta = false;
+	int _duration = 300; // in ms
+#ifdef __APPLE__
+	bool _onlySendToObs = true;
+#else
+	bool _onlySendToObs = false;
+#endif
 
 private:
 	static bool _registered;
@@ -59,6 +66,8 @@ private slots:
 	void RAltChanged(int state);
 	void LMetaChanged(int state);
 	void RMetaChanged(int state);
+	void DurationChanged(int ms);
+	void OnlySendToOBSChanged(int state);
 
 protected:
 	QComboBox *_keys;
@@ -70,10 +79,14 @@ protected:
 	QCheckBox *_rightAlt;
 	QCheckBox *_leftMeta;
 	QCheckBox *_rightMeta;
+	QSpinBox *_duration;
+	QCheckBox *_onlySendToOBS;
+	QLabel *_noKeyPressSimulationWarning;
 
 	std::shared_ptr<MacroActionHotkey> _entryData;
 
 private:
+	void SetWarningVisibility();
 	QHBoxLayout *_mainLayout;
 	bool _loading = true;
 };

src/headers/macro-action-macro.hpp

@@ -8,6 +8,7 @@ enum class PerformMacroAction {
 	PAUSE,
 	UNPAUSE,
 	RESET_COUNTER,
+	RUN,
 };
 
 class MacroActionMacro : public MacroRefAction {

src/headers/macro-action-preview-scene.hpp

@@ -0,0 +1,54 @@
+#pragma once
+#include "macro-action-edit.hpp"
+#include "scene-selection.hpp"
+
+class MacroActionPreviewScene : public MacroAction {
+public:
+	bool PerformAction();
+	void LogAction();
+	bool Save(obs_data_t *obj);
+	bool Load(obs_data_t *obj);
+	std::string GetShortDesc();
+	std::string GetId() { return id; };
+	static std::shared_ptr<MacroAction> Create()
+	{
+		return std::make_shared<MacroActionPreviewScene>();
+	}
+
+	SceneSelection _scene;
+
+private:
+	static bool _registered;
+	static const std::string id;
+};
+
+class MacroActionPreviewSceneEdit : public QWidget {
+	Q_OBJECT
+
+public:
+	MacroActionPreviewSceneEdit(
+		QWidget *parent,
+		std::shared_ptr<MacroActionPreviewScene> entryData = nullptr);
+	void UpdateEntryData();
+	static QWidget *Create(QWidget *parent,
+			       std::shared_ptr<MacroAction> action)
+	{
+		return new MacroActionPreviewSceneEdit(
+			parent,
+			std::dynamic_pointer_cast<MacroActionPreviewScene>(
+				action));
+	}
+
+private slots:
+	void SceneChanged(const SceneSelection &);
+signals:
+	void HeaderInfoChanged(const QString &);
+
+protected:
+	SceneSelectionWidget *_scenes;
+	std::shared_ptr<MacroActionPreviewScene> _entryData;
+
+private:
+	QHBoxLayout *_mainLayout;
+	bool _loading = true;
+};

src/headers/macro-action-random.hpp

@@ -0,0 +1,75 @@
+#pragma once
+#include "macro-action-edit.hpp"
+#include "macro-selection.hpp"
+
+#include <QPushButton>
+#include <QListWidget>
+#include <QDialog>
+#include <unordered_map>
+
+class MacroActionRandom : public MultiMacroRefAction {
+public:
+	bool PerformAction();
+	void LogAction();
+	bool Save(obs_data_t *obj);
+	bool Load(obs_data_t *obj);
+	std::string GetId() { return id; };
+	static std::shared_ptr<MacroAction> Create()
+	{
+		return std::make_shared<MacroActionRandom>();
+	}
+
+	// TODO: add weights to each macro ...
+	// std::unordered_map<MacroRef, int> _weights;
+
+private:
+	MacroRef lastRandomMacro;
+	static bool _registered;
+	static const std::string id;
+};
+
+class MacroDialog : public QDialog {
+	Q_OBJECT
+
+public:
+	MacroDialog(QWidget *parent);
+	static bool AskForMacro(QWidget *parent, std::string &macroName);
+
+private:
+	MacroSelection *_macroSelection;
+};
+
+class MacroActionRandomEdit : public QWidget {
+	Q_OBJECT
+
+public:
+	MacroActionRandomEdit(
+		QWidget *parent,
+		std::shared_ptr<MacroActionRandom> entryData = nullptr);
+	void UpdateEntryData();
+	static QWidget *Create(QWidget *parent,
+			       std::shared_ptr<MacroAction> action)
+	{
+		return new MacroActionRandomEdit(
+			parent,
+			std::dynamic_pointer_cast<MacroActionRandom>(action));
+	}
+
+private slots:
+	void MacroRemove(const QString &name);
+	void MacroRename(const QString &oldName, const QString &newName);
+	void AddMacro();
+	void RemoveMacro();
+
+protected:
+	std::shared_ptr<MacroActionRandom> _entryData;
+
+private:
+	int FindEntry(const std::string &macro);
+	void SetMacroListSize();
+
+	QListWidget *_macroList;
+	QPushButton *_add;
+	QPushButton *_remove;
+	bool _loading = true;
+};

src/headers/macro-action-replay-buffer.hpp

@@ -1,3 +1,5 @@
+#ifdef REPLAYBUFFER_SUPPORTED
+
 #pragma once
 #include "macro-action-edit.hpp"
 #include "duration-control.hpp"
@@ -65,3 +67,5 @@ private:
 	QHBoxLayout *_mainLayout;
 	bool _loading = true;
 };
+
+#endif

src/headers/macro-action-run.hpp

@@ -1,5 +1,6 @@
 #pragma once
 #include "macro-action-edit.hpp"
+#include "file-selection.hpp"
 
 #include <QLineEdit>
 #include <QPushButton>
@@ -43,8 +44,7 @@ public:
 	}
 
 private slots:
-	void FilePathChanged();
-	void BrowseButtonClicked();
+	void PathChanged(const QString &text);
 	void AddArg();
 	void RemoveArg();
 	void ArgUp();
@@ -56,8 +56,9 @@ protected:
 	std::shared_ptr<MacroActionRun> _entryData;
 
 private:
-	QLineEdit *_filePath;
-	QPushButton *_browseButton;
+	void SetArgListSize();
+
+	FileSelection *_filePath;
 	QListWidget *_argList;
 	QPushButton *_addArg;
 	QPushButton *_removeArg;

src/headers/macro-action-scene-swap.hpp

@@ -0,0 +1,38 @@
+#pragma once
+#include "macro-action-edit.hpp"
+
+class MacroActionSceneSwap : public MacroAction {
+public:
+	bool PerformAction();
+	void LogAction();
+	bool Save(obs_data_t *obj);
+	bool Load(obs_data_t *obj);
+	std::string GetId() { return id; };
+	static std::shared_ptr<MacroAction> Create()
+	{
+		return std::make_shared<MacroActionSceneSwap>();
+	}
+
+private:
+	static bool _registered;
+	static const std::string id;
+};
+
+class MacroActionSceneSwapEdit : public QWidget {
+	Q_OBJECT
+
+public:
+	MacroActionSceneSwapEdit(
+		QWidget *parent,
+		std::shared_ptr<MacroActionSceneSwap> entryData = nullptr);
+	static QWidget *Create(QWidget *parent,
+			       std::shared_ptr<MacroAction> action)
+	{
+		return new MacroActionSceneSwapEdit(
+			parent, std::dynamic_pointer_cast<MacroActionSceneSwap>(
+					action));
+	}
+
+protected:
+	std::shared_ptr<MacroActionSceneSwap> _entryData;
+};

src/headers/macro-action-scene-transform.hpp

@@ -21,8 +21,8 @@ public:
 
 	SceneSelection _scene;
 	OBSWeakSource _source;
-	struct obs_transform_info _info;
-	struct obs_sceneitem_crop _crop;
+	struct obs_transform_info _info = {};
+	struct obs_sceneitem_crop _crop = {};
 
 private:
 	static bool _registered;

src/headers/macro-action-scene-visibility.hpp

@@ -8,6 +8,11 @@ enum class SceneVisibilityAction {
 	HIDE,
 };
 
+enum class SceneItemSourceType {
+	SOURCE,
+	SOURCE_GROUP,
+};
+
 class MacroActionSceneVisibility : public MacroAction {
 public:
 	bool PerformAction();
@@ -22,7 +27,9 @@ public:
 	}
 
 	SceneSelection _scene;
+	SceneItemSourceType _sourceType = SceneItemSourceType::SOURCE;
 	OBSWeakSource _source;
+	std::string _sourceGroup = "";
 	SceneVisibilityAction _action = SceneVisibilityAction::SHOW;
 
 private:
@@ -49,6 +56,7 @@ public:
 
 private slots:
 	void SceneChanged(const SceneSelection &);
+	void SourceTypeChanged(int value);
 	void SourceChanged(const QString &text);
 	void ActionChanged(int value);
 signals:
@@ -56,6 +64,7 @@ signals:
 
 protected:
 	SceneSelectionWidget *_scenes;
+	QComboBox *_sourceTypes;
 	QComboBox *_sources;
 	QComboBox *_actions;
 	std::shared_ptr<MacroActionSceneVisibility> _entryData;

src/headers/macro-action-screenshot.hpp

@@ -0,0 +1,50 @@
+#pragma once
+#include "macro-action-edit.hpp"
+
+class MacroActionScreenshot : public MacroAction {
+public:
+	bool PerformAction();
+	void LogAction();
+	bool Save(obs_data_t *obj);
+	bool Load(obs_data_t *obj);
+	std::string GetShortDesc();
+	std::string GetId() { return id; };
+	static std::shared_ptr<MacroAction> Create()
+	{
+		return std::make_shared<MacroActionScreenshot>();
+	}
+	OBSWeakSource _source;
+
+private:
+	static bool _registered;
+	static const std::string id;
+};
+
+class MacroActionScreenshotEdit : public QWidget {
+	Q_OBJECT
+
+public:
+	MacroActionScreenshotEdit(
+		QWidget *parent,
+		std::shared_ptr<MacroActionScreenshot> entryData = nullptr);
+	void UpdateEntryData();
+	static QWidget *Create(QWidget *parent,
+			       std::shared_ptr<MacroAction> action)
+	{
+		return new MacroActionScreenshotEdit(
+			parent,
+			std::dynamic_pointer_cast<MacroActionScreenshot>(
+				action));
+	}
+private slots:
+	void SourceChanged(const QString &text);
+signals:
+	void HeaderInfoChanged(const QString &);
+
+protected:
+	QComboBox *_sources;
+	std::shared_ptr<MacroActionScreenshot> _entryData;
+
+private:
+	bool _loading = true;
+};

src/headers/macro-action-systray.hpp

@@ -0,0 +1,49 @@
+#pragma once
+#include "macro-action-edit.hpp"
+
+#include <QLineEdit>
+
+class MacroActionSystray : public MacroAction {
+public:
+	bool PerformAction();
+	void LogAction();
+	bool Save(obs_data_t *obj);
+	bool Load(obs_data_t *obj);
+	std::string GetId() { return id; };
+	static std::shared_ptr<MacroAction> Create()
+	{
+		return std::make_shared<MacroActionSystray>();
+	}
+
+	std::string _msg = "";
+
+private:
+	static bool _registered;
+	static const std::string id;
+};
+
+class MacroActionSystrayEdit : public QWidget {
+	Q_OBJECT
+
+public:
+	MacroActionSystrayEdit(
+		QWidget *parent,
+		std::shared_ptr<MacroActionSystray> entryData = nullptr);
+	static QWidget *Create(QWidget *parent,
+			       std::shared_ptr<MacroAction> action)
+	{
+		return new MacroActionSystrayEdit(
+			parent,
+			std::dynamic_pointer_cast<MacroActionSystray>(action));
+	}
+
+private slots:
+	void MessageChanged();
+
+protected:
+	std::shared_ptr<MacroActionSystray> _entryData;
+
+private:
+	QLineEdit *_msg;
+	bool _loading = true;
+};

src/headers/macro-action-timer.hpp

@@ -0,0 +1,72 @@
+#pragma once
+#include "macro-action-edit.hpp"
+#include "duration-control.hpp"
+#include "macro-selection.hpp"
+
+#include <QDoubleSpinBox>
+#include <QHBoxLayout>
+
+enum class TimerAction {
+	PAUSE,
+	CONTINUE,
+	RESET,
+	SET_TIME_REMAINING,
+};
+
+class MacroActionTimer : public MacroRefAction {
+public:
+	bool PerformAction();
+	void LogAction();
+	bool Save(obs_data_t *obj);
+	bool Load(obs_data_t *obj);
+	std::string GetShortDesc();
+	std::string GetId() { return id; };
+	static std::shared_ptr<MacroAction> Create()
+	{
+		return std::make_shared<MacroActionTimer>();
+	}
+	Duration _duration;
+	TimerAction _actionType = TimerAction::PAUSE;
+
+private:
+	static bool _registered;
+	static const std::string id;
+};
+
+class MacroActionTimerEdit : public QWidget {
+	Q_OBJECT
+
+public:
+	MacroActionTimerEdit(
+		QWidget *parent,
+		std::shared_ptr<MacroActionTimer> entryData = nullptr);
+	void UpdateEntryData();
+	static QWidget *Create(QWidget *parent,
+			       std::shared_ptr<MacroAction> action)
+	{
+		return new MacroActionTimerEdit(
+			parent,
+			std::dynamic_pointer_cast<MacroActionTimer>(action));
+	}
+
+private slots:
+	void MacroChanged(const QString &text);
+	void MacroRemove(const QString &name);
+	void DurationChanged(double value);
+	void DurationUnitChanged(DurationUnit unit);
+	void ActionTypeChanged(int value);
+signals:
+	void HeaderInfoChanged(const QString &);
+
+protected:
+	void SetWidgetVisibility();
+
+	MacroSelection *_macros;
+	DurationSelection *_duration;
+	QComboBox *_timerAction;
+	std::shared_ptr<MacroActionTimer> _entryData;
+
+private:
+	QHBoxLayout *_mainLayout;
+	bool _loading = true;
+};

src/headers/macro-action-transition.hpp

@@ -0,0 +1,68 @@
+#pragma once
+#include "macro-action-edit.hpp"
+#include "duration-control.hpp"
+#include "transition-selection.hpp"
+
+#include <QCheckBox>
+#include <QHBoxLayout>
+
+class MacroActionTransition : public MacroAction {
+public:
+	bool PerformAction();
+	void LogAction();
+	bool Save(obs_data_t *obj);
+	bool Load(obs_data_t *obj);
+	std::string GetShortDesc();
+	std::string GetId() { return id; };
+	static std::shared_ptr<MacroAction> Create()
+	{
+		return std::make_shared<MacroActionTransition>();
+	}
+
+	bool _setDuration = true;
+	bool _setType = true;
+	TransitionSelection _transition;
+	Duration _duration;
+
+private:
+	static bool _registered;
+	static const std::string id;
+};
+
+class MacroActionTransitionEdit : public QWidget {
+	Q_OBJECT
+
+public:
+	MacroActionTransitionEdit(
+		QWidget *parent,
+		std::shared_ptr<MacroActionTransition> entryData = nullptr);
+	void UpdateEntryData();
+	static QWidget *Create(QWidget *parent,
+			       std::shared_ptr<MacroAction> action)
+	{
+		return new MacroActionTransitionEdit(
+			parent,
+			std::dynamic_pointer_cast<MacroActionTransition>(
+				action));
+	}
+
+private slots:
+	void SetTypeChanged(int state);
+	void SetDurationChanged(int state);
+	void TransitionChanged(const TransitionSelection &);
+	void DurationChanged(double seconds);
+signals:
+	void HeaderInfoChanged(const QString &);
+
+protected:
+	QCheckBox *_setType;
+	QCheckBox *_setDuration;
+	TransitionSelectionWidget *_transitions;
+	DurationSelection *_duration;
+	QHBoxLayout *_typeLayout;
+	QHBoxLayout *_durationLayout;
+	std::shared_ptr<MacroActionTransition> _entryData;
+
+private:
+	bool _loading = true;
+};

src/headers/macro-action-virtual-cam.hpp

@@ -1,3 +1,5 @@
+#ifdef VCAM_SUPPORTED
+
 #pragma once
 #include "macro-action-edit.hpp"
 
@@ -55,3 +57,5 @@ private:
 	QHBoxLayout *_mainLayout;
 	bool _loading = true;
 };
+
+#endif

src/headers/macro-condition-date.hpp

@@ -4,6 +4,14 @@
 
 #include <QCheckBox>
 #include <QDateTimeEdit>
+#include <QComboBox>
+
+enum class DateCondition {
+	AT,
+	AFTER,
+	BEFORE,
+	BETWEEN,
+};
 
 class MacroConditionDate : public MacroCondition {
 public:
@@ -18,10 +26,12 @@ public:
 	}
 
 	QDateTime _dateTime;
+	QDateTime _dateTime2;
 	bool _ignoreDate = false;
 	bool _ignoreTime = false;
 	bool _repeat = false;
 	Duration _duration;
+	DateCondition _condition = DateCondition::AT;
 
 private:
 	static bool _registered;
@@ -45,7 +55,9 @@ public:
 	}
 
 private slots:
+	void ConditionChanged(int cond);
 	void DateTimeChanged(const QDateTime &datetime);
+	void DateTime2Changed(const QDateTime &datetime);
 	void IgnoreDateChanged(int state);
 	void IgnoreTimeChanged(int state);
 	void RepeatChanged(int state);
@@ -55,7 +67,9 @@ signals:
 	void HeaderInfoChanged(const QString &);
 
 protected:
+	QComboBox *_condition;
 	QDateTimeEdit *_dateTime;
+	QDateTimeEdit *_dateTime2;
 	QCheckBox *_ignoreDate;
 	QCheckBox *_ignoreTime;
 	QCheckBox *_repeat;
@@ -63,5 +77,6 @@ protected:
 	std::shared_ptr<MacroConditionDate> _entryData;
 
 private:
+	void ShowSecondDateSelection(bool visible);
 	bool _loading = true;
 };

src/headers/macro-condition-edit.hpp

@@ -5,8 +5,8 @@ struct MacroConditionInfo {
 	using TCreateMethod = std::shared_ptr<MacroCondition> (*)();
 	using TCreateWidgetMethod =
 		QWidget *(*)(QWidget *parent, std::shared_ptr<MacroCondition>);
-	TCreateMethod _createFunc;
-	TCreateWidgetMethod _createWidgetFunc;
+	TCreateMethod _createFunc = nullptr;
+	TCreateWidgetMethod _createWidgetFunc = nullptr;
 	std::string _name;
 	bool _useDurationConstraint = true;
 };

src/headers/macro-condition-file.hpp

@@ -1,5 +1,7 @@
 #pragma once
 #include "macro.hpp"
+#include "file-selection.hpp"
+
 #include <QWidget>
 #include <QComboBox>
 #include <QDateTime>
@@ -61,8 +63,7 @@ public:
 
 private slots:
 	void FileTypeChanged(int index);
-	void FilePathChanged();
-	void BrowseButtonClicked();
+	void PathChanged(const QString &text);
 	void MatchTextChanged();
 	void UseRegexChanged(int state);
 	void CheckModificationDateChanged(int state);
@@ -72,8 +73,7 @@ signals:
 
 protected:
 	QComboBox *_fileType;
-	QLineEdit *_filePath;
-	QPushButton *_browseButton;
+	FileSelection *_filePath;
 	QPlainTextEdit *_matchText;
 	QCheckBox *_useRegex;
 	QCheckBox *_checkModificationDate;

src/headers/macro-condition-macro.hpp

@@ -67,6 +67,7 @@ private slots:
 	void ConditionChanged(int cond);
 	void ResetClicked();
 	void UpdateCount();
+	void UpdatePaused();
 signals:
 	void HeaderInfoChanged(const QString &);
 
@@ -76,16 +77,17 @@ protected:
 	QComboBox *_counterConditions;
 	QSpinBox *_count;
 	QLabel *_currentCount;
+	QLabel *_pausedWarning;
 	QPushButton *_resetCount;
 	QHBoxLayout *_settingsLine1;
 	QHBoxLayout *_settingsLine2;
-	std::unique_ptr<QTimer> _timer;
+	QTimer _countTimer;
+	QTimer _pausedTimer;
 	std::shared_ptr<MacroConditionMacro> _entryData;
 
 private:
 	void ClearLayouts();
 	void SetupStateWidgets();
 	void SetupCountWidgets();
-	void ResetTimer();
 	bool _loading = true;
 };

src/headers/macro-condition-media.hpp

@@ -3,8 +3,10 @@
 #include <limits>
 #include <QWidget>
 #include <QComboBox>
+#include <QCheckBox>
 
 #include "duration-control.hpp"
+#include "scene-selection.hpp"
 
 enum class MediaTimeRestriction {
 	TIME_RESTRICTION_NONE,
@@ -33,6 +35,12 @@ enum class MediaState {
 	ANY,
 };
 
+enum class MediaSourceType {
+	SOURCE,
+	ANY,
+	ALL,
+};
+
 class MacroConditionMedia : public MacroCondition {
 public:
 	~MacroConditionMedia();
@@ -50,15 +58,23 @@ public:
 	static void MediaStopped(void *data, calldata_t *);
 	static void MediaEnded(void *data, calldata_t *);
 
+	MediaSourceType _sourceType = MediaSourceType::SOURCE;
+	SceneSelection _scene;
 	OBSWeakSource _source = nullptr;
+	std::vector<MacroConditionMedia> _sources;
 	MediaState _state = MediaState::OBS_MEDIA_STATE_NONE;
 	MediaTimeRestriction _restriction =
 		MediaTimeRestriction::TIME_RESTRICTION_NONE;
 	Duration _time;
+	bool _onlyMatchonChagne = false;
 
 private:
-	std::atomic_bool _stopped = {false};
-	std::atomic_bool _ended = {false};
+	bool CheckMediaMatch();
+
+	bool _stopped = false;
+	bool _ended = false;
+	// TODO: Remove _alreadyMatched as it does not make much sense when
+	// time restrictions for macro conditions are available.
 	// Trigger scene change only once even if media state might trigger repeatedly
 	bool _alreadyMatched = false;
 	// Workaround to enable use of "ended" to specify end of VLC playlist
@@ -87,20 +103,25 @@ public:
 
 private slots:
 	void SourceChanged(const QString &text);
+	void SceneChanged(const SceneSelection &);
 	void StateChanged(int index);
 	void TimeRestrictionChanged(int index);
 	void TimeChanged(double seconds);
 	void TimeUnitChanged(DurationUnit unit);
+	void OnChangeChanged(int);
 signals:
 	void HeaderInfoChanged(const QString &);
 
 protected:
+	SceneSelectionWidget *_scenes;
 	QComboBox *_mediaSources;
 	QComboBox *_states;
 	QComboBox *_timeRestrictions;
 	DurationSelection *_time;
+	QCheckBox *_onChange;
 	std::shared_ptr<MacroConditionMedia> _entryData;
 
 private:
+	void SetWidgetVisibility();
 	bool _loading = true;
 };

src/headers/macro-condition-plugin-state.hpp

@@ -5,6 +5,7 @@
 
 enum class PluginStateCondition {
 	SCENESWITCHED,
+	RUNNING,
 };
 
 class MacroConditionPluginState : public MacroCondition {

src/headers/macro-condition-recording.hpp

@@ -20,7 +20,7 @@ public:
 		return std::make_shared<MacroConditionRecord>();
 	}
 
-	RecordState _recordState;
+	RecordState _recordState = RecordState::STOP;
 
 private:
 	static bool _registered;

src/headers/macro-condition-replay-buffer.hpp

@@ -1,3 +1,5 @@
+#ifdef REPLAYBUFFER_SUPPORTED
+
 #pragma once
 #include "macro.hpp"
 #include <QWidget>
@@ -20,7 +22,7 @@ public:
 		return std::make_shared<MacroConditionReplayBuffer>();
 	}
 
-	ReplayBufferState _state;
+	ReplayBufferState _state = ReplayBufferState::STOP;
 
 private:
 	static bool _registered;
@@ -54,3 +56,5 @@ protected:
 private:
 	bool _loading = true;
 };
+
+#endif

src/headers/macro-condition-scene-transform.hpp

@@ -0,0 +1,69 @@
+#pragma once
+#include "macro.hpp"
+#include "scene-selection.hpp"
+
+#include <QSpinBox>
+#include <QPlainTextEdit>
+#include <QCheckBox>
+
+class MacroConditionSceneTransform : public MacroCondition {
+public:
+	bool CheckCondition();
+	bool Save(obs_data_t *obj);
+	bool Load(obs_data_t *obj);
+	std::string GetShortDesc();
+	std::string GetId() { return id; };
+	static std::shared_ptr<MacroCondition> Create()
+	{
+		return std::make_shared<MacroConditionSceneTransform>();
+	}
+
+	SceneSelection _scene;
+	OBSWeakSource _source;
+	bool _regex = false;
+	std::string _settings = "";
+
+private:
+	static bool _registered;
+	static const std::string id;
+};
+
+class MacroConditionSceneTransformEdit : public QWidget {
+	Q_OBJECT
+
+public:
+	MacroConditionSceneTransformEdit(
+		QWidget *parent,
+		std::shared_ptr<MacroConditionSceneTransform> entryData =
+			nullptr);
+	void UpdateEntryData();
+	static QWidget *Create(QWidget *parent,
+			       std::shared_ptr<MacroCondition> cond)
+	{
+		return new MacroConditionSceneTransformEdit(
+			parent,
+			std::dynamic_pointer_cast<MacroConditionSceneTransform>(
+				cond));
+	}
+
+private slots:
+	void SceneChanged(const SceneSelection &);
+	void SourceChanged(const QString &text);
+	void GetSettingsClicked();
+	void SettingsChanged();
+	void RegexChanged(int);
+signals:
+	void HeaderInfoChanged(const QString &);
+
+protected:
+	SceneSelectionWidget *_scenes;
+	QComboBox *_sources;
+	QPushButton *_getSettings;
+	QPlainTextEdit *_settings;
+	QCheckBox *_regex;
+
+	std::shared_ptr<MacroConditionSceneTransform> _entryData;
+
+private:
+	bool _loading = true;
+};

src/headers/macro-condition-scene-visibility.hpp

@@ -0,0 +1,66 @@
+#pragma once
+#include "macro.hpp"
+#include "scene-selection.hpp"
+
+#include <QComboBox>
+
+enum class SceneVisibilityCondition {
+	SHOWN,
+	HIDDEN,
+};
+
+class MacroConditionSceneVisibility : public MacroCondition {
+public:
+	bool CheckCondition();
+	bool Save(obs_data_t *obj);
+	bool Load(obs_data_t *obj);
+	std::string GetShortDesc();
+	std::string GetId() { return id; };
+	static std::shared_ptr<MacroCondition> Create()
+	{
+		return std::make_shared<MacroConditionSceneVisibility>();
+	}
+
+	SceneSelection _scene;
+	OBSWeakSource _source;
+	SceneVisibilityCondition _condition = SceneVisibilityCondition::SHOWN;
+
+private:
+	static bool _registered;
+	static const std::string id;
+};
+
+class MacroConditionSceneVisibilityEdit : public QWidget {
+	Q_OBJECT
+
+public:
+	MacroConditionSceneVisibilityEdit(
+		QWidget *parent,
+		std::shared_ptr<MacroConditionSceneVisibility> cond = nullptr);
+	void UpdateEntryData();
+	static QWidget *Create(QWidget *parent,
+			       std::shared_ptr<MacroCondition> cond)
+	{
+		return new MacroConditionSceneVisibilityEdit(
+			parent,
+			std::dynamic_pointer_cast<MacroConditionSceneVisibility>(
+				cond));
+	}
+
+private slots:
+	void SceneChanged(const SceneSelection &);
+	void SourceChanged(const QString &text);
+	void ConditionChanged(int cond);
+signals:
+	void HeaderInfoChanged(const QString &);
+
+protected:
+	SceneSelectionWidget *_scenes;
+	QComboBox *_sources;
+	QComboBox *_conditions;
+
+	std::shared_ptr<MacroConditionSceneVisibility> _entryData;
+
+private:
+	bool _loading = true;
+};

src/headers/macro-condition-scene.hpp

@@ -4,10 +4,13 @@
 
 #include <QWidget>
 #include <QComboBox>
+#include <QCheckBox>
 
 enum class SceneType {
 	CURRENT,
 	PREVIOUS,
+	CHANGED,
+	NOTCHANGED,
 };
 
 class MacroConditionScene : public MacroCondition {
@@ -22,10 +25,15 @@ public:
 		return std::make_shared<MacroConditionScene>();
 	}
 
+	// This option is to be removed in a future version and be replaced by
+	// transition specific conditions
+	bool _waitForTransition = true;
+
 	SceneSelection _scene;
-	SceneType _type;
+	SceneType _type = SceneType::CURRENT;
 
 private:
+	std::chrono::high_resolution_clock::time_point _lastSceneChangeTime{};
 	static bool _registered;
 	static const std::string id;
 };
@@ -49,14 +57,17 @@ public:
 private slots:
 	void SceneChanged(const SceneSelection &);
 	void TypeChanged(int value);
+	void WaitForTransitionChanged(int state);
 signals:
 	void HeaderInfoChanged(const QString &);
 
 protected:
 	SceneSelectionWidget *_scenes;
 	QComboBox *_sceneType;
+	QCheckBox *_waitForTransition;
 	std::shared_ptr<MacroConditionScene> _entryData;
 
 private:
+	void SetWidgetVisibility();
 	bool _loading = true;
 };

src/headers/macro-condition-streaming.hpp

@@ -6,6 +6,8 @@
 enum class StreamState {
 	STOP,
 	START,
+	STARTING,
+	STOPPING,
 };
 
 class MacroConditionStream : public MacroCondition {
@@ -19,9 +21,12 @@ public:
 		return std::make_shared<MacroConditionStream>();
 	}
 
-	StreamState _streamState;
+	StreamState _streamState = StreamState::STOP;
 
 private:
+	std::chrono::high_resolution_clock::time_point _lastStreamStartingTime{};
+	std::chrono::high_resolution_clock::time_point _lastStreamStoppingTime{};
+
 	static bool _registered;
 	static const std::string id;
 };

src/headers/macro-condition-timer.hpp

@@ -5,6 +5,15 @@
 #include <QCheckBox>
 #include <QPushButton>
 #include <QTimer>
+#include <QComboBox>
+#include <QHBoxLayout>
+
+#include <random>
+
+enum class TimerType {
+	FIXED,
+	RANDOM,
+};
 
 class MacroConditionTimer : public MacroCondition {
 public:
@@ -16,11 +25,21 @@ public:
 	{
 		return std::make_shared<MacroConditionTimer>();
 	}
+	void Pause();
+	void Continue();
+	void Reset();
 
+	TimerType _type = TimerType::FIXED;
 	Duration _duration;
+	Duration _duration2;
+	bool _paused = false;
+	bool _saveRemaining = false;
+	double _remaining = 0.;
 	bool _oneshot = false;
 
 private:
+	void SetRandomTimeRemaining();
+	std::default_random_engine _re;
 	static bool _registered;
 	static const std::string id;
 };
@@ -42,20 +61,34 @@ public:
 	}
 
 private slots:
+	void TimerTypeChanged(int type);
 	void DurationChanged(double seconds);
 	void DurationUnitChanged(DurationUnit unit);
+	void Duration2Changed(double seconds);
+	void Duration2UnitChanged(DurationUnit unit);
+	void SaveRemainingChanged(int state);
 	void AutoResetChanged(int state);
+	void PauseContinueClicked();
 	void ResetClicked();
 	void UpdateTimeRemaining();
 
 protected:
+	void SetPauseContinueButtonLabel();
+
+	QComboBox *_timerTypes;
 	DurationSelection *_duration;
+	DurationSelection *_duration2;
 	QCheckBox *_autoReset;
+	QCheckBox *_saveRemaining;
 	QPushButton *_reset;
+	QPushButton *_pauseConinue;
 	QLabel *_remaining;
 	std::shared_ptr<MacroConditionTimer> _entryData;
 
 private:
+	void SetWidgetVisibility();
+
+	QHBoxLayout *_timerLayout;
 	QTimer timer;
 	bool _loading = true;
 };

src/headers/macro-condition-transition.hpp

@@ -0,0 +1,85 @@
+#pragma once
+#include "macro.hpp"
+#include "duration-control.hpp"
+#include "transition-selection.hpp"
+#include "scene-selection.hpp"
+
+#include <QWidget>
+#include <QComboBox>
+
+enum class TransitionCondition {
+	CURRENT,
+	DURATION,
+	STARTED,
+	ENDED,
+	TRANSITION_SOURCE,
+	TRANSITION_TARGET,
+};
+
+class MacroConditionTransition : public MacroCondition {
+public:
+	bool CheckCondition();
+	bool Save(obs_data_t *obj);
+	bool Load(obs_data_t *obj);
+	std::string GetShortDesc();
+	std::string GetId() { return id; };
+	static std::shared_ptr<MacroCondition> Create()
+	{
+		return std::make_shared<MacroConditionTransition>();
+	}
+	void ConnectToTransitionSignals();
+	void DisconnectTransitionSignals();
+
+	TransitionCondition _condition = TransitionCondition::CURRENT;
+	TransitionSelection _transition;
+	SceneSelection _scene;
+	Duration _duration;
+
+private:
+	static void TransitionStarted(void *data, calldata_t *);
+	static void TransitionEnded(void *data, calldata_t *);
+
+	bool _started = false;
+	bool _ended = false;
+	std::chrono::high_resolution_clock::time_point _lastTransitionEndTime{};
+	static bool _registered;
+	static const std::string id;
+};
+
+class MacroConditionTransitionEdit : public QWidget {
+	Q_OBJECT
+
+public:
+	MacroConditionTransitionEdit(
+		QWidget *parent,
+		std::shared_ptr<MacroConditionTransition> cond = nullptr);
+	void UpdateEntryData();
+	static QWidget *Create(QWidget *parent,
+			       std::shared_ptr<MacroCondition> cond)
+	{
+		return new MacroConditionTransitionEdit(
+			parent,
+			std::dynamic_pointer_cast<MacroConditionTransition>(
+				cond));
+	}
+
+private slots:
+	void ConditionChanged(int cond);
+	void TransitionChanged(const TransitionSelection &);
+	void SceneChanged(const SceneSelection &);
+	void DurationChanged(double seconds);
+signals:
+	void HeaderInfoChanged(const QString &);
+
+protected:
+	QComboBox *_conditions;
+	TransitionSelectionWidget *_transitions;
+	SceneSelectionWidget *_scenes;
+	DurationSelection *_duration;
+	QLabel *_durationSuffix;
+	std::shared_ptr<MacroConditionTransition> _entryData;
+
+private:
+	void SetWidgetVisibility();
+	bool _loading = true;
+};

src/headers/macro-condition-video.hpp

@@ -1,10 +1,15 @@
 #pragma once
 #include "macro.hpp"
 #include "screenshot-helper.hpp"
+#include "file-selection.hpp"
 
 #include <QWidget>
 #include <QComboBox>
+#include <QCheckBox>
+#include <QHBoxLayout>
 #include <chrono>
+#undef NO // MacOS macro that can conflict with OpenCV
+#include <opencv2/opencv.hpp>
 
 enum class VideoCondition {
 	MATCH,
@@ -12,8 +17,19 @@ enum class VideoCondition {
 	HAS_NOT_CHANGED,
 	HAS_CHANGED,
 	NO_IMAGE,
+	PATTERN,
+	OBJECT,
 };
 
+struct PatternMatchData {
+	cv::Mat4b rgbaPattern;
+	cv::Mat3b rgbPattern;
+	cv::Mat1b mask;
+};
+
+constexpr int minMinNeighbors = 3;
+constexpr int maxMinNeighbors = 6;
+
 class MacroConditionVideo : public MacroCondition {
 public:
 	bool CheckCondition();
@@ -28,20 +44,69 @@ public:
 	}
 	void GetScreenshot();
 	bool LoadImageFromFile();
+	bool LoadModelData(std::string &path);
+	std::string GetModelDataPath() { return _modelDataPath; }
+	void ResetLastMatch() { _lastMatchResult = false; }
 
 	OBSWeakSource _videoSource;
 	VideoCondition _condition = VideoCondition::MATCH;
 	std::string _file = obs_module_text("AdvSceneSwitcher.enterPath");
+	bool _useAlphaAsMask = false;
+	bool _usePatternForChangedCheck = false;
+	PatternMatchData _patternData;
+	double _patternThreshold = 0.8;
+	cv::CascadeClassifier _objectCascade;
+	double _scaleFactor = 1.1;
+	int _minNeighbors = minMinNeighbors;
+	int _minSizeX = 0;
+	int _minSizeY = 0;
+	int _maxSizeX = 0;
+	int _maxSizeY = 0;
+
+	bool _throttleEnabled = false;
+	int _throttleCount = 3;
 
 private:
+	bool OutputChanged();
+	bool ScreenshotContainsPattern();
+	bool ScreenshotContainsObject();
 	bool Compare();
+	bool CheckShouldBeSkipped();
 
 	std::unique_ptr<AdvSSScreenshotObj> _screenshotData = nullptr;
 	QImage _matchImage;
+	std::string _modelDataPath =
+		obs_get_module_data_path(obs_current_module()) +
+		std::string(
+			"/res/cascadeClassifiers/haarcascade_frontalface_alt.xml");
+	bool _lastMatchResult = false;
+	int _runCount = 0;
+
 	static bool _registered;
 	static const std::string id;
 };
 
+class ThresholdSlider : public QWidget {
+	Q_OBJECT
+
+public:
+	ThresholdSlider(double min = 0., double max = 1.,
+			const QString &label = "threshold",
+			const QString &description = "", QWidget *parent = 0);
+	void SetDoubleValue(double);
+public slots:
+	void NotifyValueChanged(int value);
+signals:
+	void DoubleValueChanged(double value);
+
+private:
+	void SetDoubleValueText(double);
+	QLabel *_value;
+	QSlider *_slider;
+	double _scale = 100.0;
+	int _precision = 2;
+};
+
 class MacroConditionVideoEdit : public QWidget {
 	Q_OBJECT
 
@@ -59,23 +124,60 @@ public:
 	}
 
 	void UpdatePreviewTooltip();
-	void SetFilePath(const QString &text);
 
 private slots:
 	void SourceChanged(const QString &text);
 	void ConditionChanged(int cond);
-	void FilePathChanged();
-	void BrowseButtonClicked();
+	void ImagePathChanged(const QString &text);
+	void ImageBrowseButtonClicked();
+	void UsePatternForChangedCheckChanged(int value);
+	void PatternThresholdChanged(double);
+	void UseAlphaAsMaskChanged(int value);
+
+	void ModelPathChanged(const QString &text);
+	void ObjectScaleThresholdChanged(double);
+	void MinNeighborsChanged(int value);
+	void MinSizeXChanged(int value);
+	void MinSizeYChanged(int value);
+	void MaxSizeXChanged(int value);
+	void MaxSizeYChanged(int value);
+
+	void ThrottleEnableChanged(int value);
+	void ThrottleCountChanged(int value);
+	void ShowMatchClicked();
 signals:
 	void HeaderInfoChanged(const QString &);
 
 protected:
 	QComboBox *_videoSelection;
 	QComboBox *_condition;
-	QLineEdit *_filePath;
-	QPushButton *_browseButton;
+
+	QCheckBox *_usePatternForChangedCheck;
+	FileSelection *_imagePath;
+	ThresholdSlider *_patternThreshold;
+	QCheckBox *_useAlphaAsMask;
+
+	FileSelection *_modelDataPath;
+	QHBoxLayout *_modelPathLayout;
+	ThresholdSlider *_objectScaleThreshold;
+	QHBoxLayout *_neighborsControlLayout;
+	QSpinBox *_minNeighbors;
+	QLabel *_minNeighborsDescription;
+	QHBoxLayout *_minSizeControlLayout;
+	QSpinBox *_minSizeX;
+	QSpinBox *_minSizeY;
+	QHBoxLayout *_maxSizeControlLayout;
+	QSpinBox *_maxSizeX;
+	QSpinBox *_maxSizeY;
+
+	QHBoxLayout *_throttleControlLayout;
+	QCheckBox *_throttleEnable;
+	QSpinBox *_throttleCount;
+	QPushButton *_showMatch;
+
 	std::shared_ptr<MacroConditionVideo> _entryData;
 
 private:
+	void SetWidgetVisibility();
 	bool _loading = true;
 };

src/headers/macro-condition-virtual-cam.hpp

@@ -1,3 +1,5 @@
+#ifdef VCAM_SUPPORTED
+
 #pragma once
 #include "macro.hpp"
 #include <QWidget>
@@ -19,7 +21,7 @@ public:
 		return std::make_shared<MacroConditionVCam>();
 	}
 
-	VCamState _state;
+	VCamState _state = VCamState::STOP;
 
 private:
 	static bool _registered;
@@ -52,3 +54,5 @@ protected:
 private:
 	bool _loading = true;
 };
+
+#endif

src/headers/macro-segment.hpp

@@ -14,7 +14,7 @@ public:
 	virtual std::string GetId() = 0;
 
 protected:
-	int _idx;
+	int _idx = 0;
 	bool _collapsed = false;
 };
 
@@ -30,6 +30,7 @@ public:
 	// Use this function to avoid accidental edits when scrolling through
 	// list of actions and conditions
 	void SetFocusPolicyOfWidgets();
+	void SetCollapsed(bool collapsed);
 
 protected slots:
 	void HeaderInfoChanged(const QString &);

src/headers/macro.hpp

@@ -2,16 +2,16 @@
 #include "macro-segment.hpp"
 #include "duration-control.hpp"
 
+#include <QString>
 #include <string>
 #include <deque>
 #include <memory>
 #include <map>
+#include <thread>
 #include <obs.hpp>
 #include <obs-module.h>
-#include <QString>
 
 constexpr auto macro_func = 10;
-constexpr auto default_priority_10 = macro_func;
 
 constexpr auto logic_root_offset = 100;
 
@@ -55,7 +55,7 @@ public:
 	void SetDuration(double seconds);
 
 private:
-	LogicType _logic;
+	LogicType _logic = LogicType::ROOT_NONE;
 	DurationConstraint _duration;
 };
 
@@ -73,11 +73,13 @@ public:
 	virtual ~Macro();
 
 	bool CeckMatch();
-	bool PerformAction();
+	bool PerformAction(bool forceParallel = false);
 	bool Matched() { return _matched; }
 	std::string Name() { return _name; }
 	void SetName(const std::string &name);
-	void SetPaused(bool pause = true) { _paused = pause; }
+	void SetRunInParallel(bool parallel) { _runInParallel = parallel; }
+	bool RunInParallel() { return _runInParallel; }
+	void SetPaused(bool pause = true);
 	bool Paused() { return _paused; }
 	int GetCount() { return _count; };
 	void ResetCount() { _count = 0; };
@@ -102,15 +104,24 @@ private:
 	void SetupHotkeys();
 	void ClearHotkeys();
 	void SetHotkeysDesc();
+	void ResetTimers();
+	void RunActions(bool &ret);
+	void RunActions();
 
 	std::string _name = "";
 	std::deque<std::shared_ptr<MacroCondition>> _conditions;
 	std::deque<std::shared_ptr<MacroAction>> _actions;
+	bool _runInParallel = false;
 	bool _matched = false;
 	bool _paused = false;
 	int _count = 0;
 	obs_hotkey_id _pauseHotkey = OBS_INVALID_HOTKEY_ID;
 	obs_hotkey_id _unpauseHotkey = OBS_INVALID_HOTKEY_ID;
+	obs_hotkey_id _togglePauseHotkey = OBS_INVALID_HOTKEY_ID;
+
+	bool _stop = false;
+	bool _done = true;
+	std::thread _thread;
 };
 
 Macro *GetMacroByName(const char *name);
@@ -144,3 +155,9 @@ public:
 	void ResolveMacroRef();
 	MacroRef _macro;
 };
+
+class MultiMacroRefAction : public MacroAction {
+public:
+	void ResolveMacroRef();
+	std::vector<MacroRef> _macros;
+};

src/headers/platform-funcs.hpp

@@ -10,6 +10,6 @@ std::pair<int, int> getCursorPos();
 int secondsSinceLastInput();
 void GetProcessList(QStringList &processes);
 bool isInFocus(const QString &executable);
-void PressKeys(const std::vector<HotkeyType> keys);
+void PressKeys(const std::vector<HotkeyType> keys, int duration);
 void PlatformInit();
 void PlatformCleanup();

src/headers/scene-trigger.hpp

@@ -8,6 +8,7 @@
 #pragma once
 
 #include "switch-generic.hpp"
+#include "duration-control.hpp"
 
 enum class sceneTriggerType {
 	NONE = 0,
@@ -43,7 +44,7 @@ struct SceneTrigger : SceneSwitcherEntry {
 	static bool pause;
 	sceneTriggerType triggerType = sceneTriggerType::NONE;
 	sceneTriggerAction triggerAction = sceneTriggerAction::NONE;
-	double duration = 0;
+	Duration duration;
 	OBSWeakSource audioSource = nullptr;
 
 	const char *getType() { return "trigger"; }
@@ -70,13 +71,14 @@ public:
 private slots:
 	void TriggerTypeChanged(int index);
 	void TriggerActionChanged(int index);
-	void DurationChanged(double dur);
+	void DurationChanged(double seconds);
+	void DurationUnitChanged(DurationUnit unit);
 	void AudioSourceChanged(const QString &text);
 
 private:
 	QComboBox *triggers;
 	QComboBox *actions;
-	QDoubleSpinBox *duration;
+	DurationSelection *duration;
 	QComboBox *audioSources;
 
 	SceneTrigger *switchData;

src/headers/section.hpp

@@ -16,6 +16,7 @@ public:
 
 	void SetContent(QWidget *w, bool collapsed = true);
 	void AddHeaderWidget(QWidget *);
+	void SetCollapsed(bool);
 
 protected:
 	bool eventFilter(QObject *obj, QEvent *event) override;

src/headers/switch-audio.hpp

@@ -14,7 +14,6 @@
 #include "volume-control.hpp"
 
 constexpr auto audio_func = 8;
-constexpr auto default_priority_8 = audio_func;
 
 typedef enum {
 	ABOVE,
@@ -44,7 +43,7 @@ struct AudioSwitch : virtual SceneSwitcherEntry {
 
 	AudioSwitch(){};
 	AudioSwitch(const AudioSwitch &other);
-	AudioSwitch(AudioSwitch &&other);
+	AudioSwitch(AudioSwitch &&other) noexcept;
 	~AudioSwitch();
 	AudioSwitch &operator=(const AudioSwitch &other);
 	AudioSwitch &operator=(AudioSwitch &&other) noexcept;

src/headers/switch-executable.hpp

@@ -10,7 +10,6 @@
 #include "switch-generic.hpp"
 
 constexpr auto exe_func = 3;
-constexpr auto default_priority_3 = exe_func;
 
 struct ExecutableSwitch : SceneSwitcherEntry {
 	static bool pause;

src/headers/switch-file.hpp

@@ -11,7 +11,6 @@
 #include <obs-module.h>
 
 constexpr auto read_file_func = 0;
-constexpr auto default_priority_0 = read_file_func;
 
 typedef enum {
 	LOCAL,

src/headers/switch-idle.hpp

@@ -10,7 +10,6 @@
 
 constexpr auto default_idle_time = 60;
 constexpr auto idle_func = 2;
-constexpr auto default_priority_2 = idle_func;
 
 struct IdleData : SceneSwitcherEntry {
 	static bool pause;

src/headers/switch-media.hpp

@@ -9,7 +9,6 @@
 #include "switch-generic.hpp"
 
 constexpr auto media_func = 6;
-constexpr auto default_priority_6 = media_func;
 
 typedef enum {
 	TIME_RESTRICTION_NONE,
@@ -52,7 +51,7 @@ struct MediaSwitch : SceneSwitcherEntry {
 	inline MediaSwitch(){};
 
 	MediaSwitch(const MediaSwitch &other);
-	MediaSwitch(MediaSwitch &&other);
+	MediaSwitch(MediaSwitch &&other) noexcept;
 	~MediaSwitch();
 	MediaSwitch &operator=(const MediaSwitch &other);
 	MediaSwitch &operator=(MediaSwitch &&other) noexcept;

src/headers/switch-network.hpp

@@ -70,8 +70,8 @@ private:
 	QString getRemoteEndpoint(connection_hdl hdl);
 
 	server _server;
-	quint16 _serverPort;
-	bool _lockToIPv4;
+	quint16 _serverPort = 55555;
+	bool _lockToIPv4 = false;
 	std::set<connection_hdl, std::owner_less<connection_hdl>> _connections;
 	QMutex _clMutex;
 	QThreadPool _threadPool;

src/headers/switch-screen-region.hpp

@@ -10,7 +10,6 @@
 #include "switch-generic.hpp"
 
 constexpr auto screen_region_func = 4;
-constexpr auto default_priority_4 = screen_region_func;
 
 struct ScreenRegionSwitch : SceneSwitcherEntry {
 	static bool pause;

src/headers/switch-sequence.hpp

@@ -12,7 +12,6 @@
 #include "duration-control.hpp"
 
 constexpr auto round_trip_func = 1;
-constexpr auto default_priority_1 = round_trip_func;
 
 struct SceneSequenceSwitch : SceneSwitcherEntry {
 	static bool pause;

src/headers/switch-time.hpp

@@ -11,7 +11,6 @@
 #include "switch-generic.hpp"
 
 constexpr auto time_func = 7;
-constexpr auto default_priority_7 = time_func;
 
 typedef enum {
 	ANY_DAY = 0,

src/headers/switch-video.hpp

@@ -12,7 +12,6 @@
 #include "screenshot-helper.hpp"
 
 constexpr auto video_func = 9;
-constexpr auto default_priority_9 = video_func;
 
 enum class videoSwitchType {
 	MATCH,

src/headers/switch-window.hpp

@@ -9,7 +9,6 @@
 #include "switch-generic.hpp"
 
 constexpr auto window_title_func = 5;
-constexpr auto default_priority_5 = window_title_func;
 
 struct WindowSwitch : SceneSwitcherEntry {
 	static bool pause;

src/headers/switcher-data-structs.hpp

@@ -6,6 +6,7 @@
 #include <QDateTime>
 #include <QThread>
 #include <curl/curl.h>
+#include <unordered_map>
 
 #include "scene-group.hpp"
 #include "scene-trigger.hpp"
@@ -32,6 +33,18 @@ constexpr auto previous_scene_name = "Previous Scene";
 constexpr auto current_transition_name = "Current Transition";
 constexpr auto tab_count = 18;
 
+constexpr auto default_priority_0 = macro_func;
+constexpr auto default_priority_1 = read_file_func;
+constexpr auto default_priority_2 = idle_func;
+constexpr auto default_priority_3 = audio_func;
+constexpr auto default_priority_4 = media_func;
+constexpr auto default_priority_5 = video_func;
+constexpr auto default_priority_6 = time_func;
+constexpr auto default_priority_7 = screen_region_func;
+constexpr auto default_priority_8 = round_trip_func;
+constexpr auto default_priority_9 = window_title_func;
+constexpr auto default_priority_10 = exe_func;
+
 typedef enum { NO_SWITCH = 0, SWITCH = 1, RANDOM_SWITCH = 2 } NoMatch;
 typedef enum { PERSIST = 0, START = 1, STOP = 2 } StartupBehavior;
 
@@ -63,14 +76,16 @@ class SwitcherThread;
 struct SwitcherData {
 	SwitcherThread *th = nullptr;
 
+	bool settingsWindowOpened = false;
+
 	std::condition_variable cv;
 	std::mutex m;
 	bool transitionActive = false;
 	bool waitForTransition = false;
-	std::condition_variable transitionCv;
 	bool stop = false;
 	bool verbose = false;
 	bool disableHints = false;
+	bool showSystemTrayNotifications = false;
 	bool showFrame = false;
 	bool transitionOverrideOverride = false;
 	bool adjustActiveTransitionType = true;
@@ -80,18 +95,28 @@ struct SwitcherData {
 	obs_source_t *waitScene = nullptr;
 	OBSWeakSource currentScene = nullptr;
 	OBSWeakSource previousScene = nullptr;
+	std::chrono::high_resolution_clock::time_point lastSceneChangeTime{};
+	std::chrono::high_resolution_clock::time_point lastTransitionEndTime{};
+	std::chrono::high_resolution_clock::time_point lastStreamStartingTime{};
+	std::chrono::high_resolution_clock::time_point lastStreamStoppingTime{};
 	OBSWeakSource lastRandomScene;
-	SceneGroup *lastRandomSceneGroup;
+	SceneGroup *lastRandomSceneGroup = nullptr;
 	OBSWeakSource nonMatchingScene;
 	NoMatch switchIfNotMatching = NO_SWITCH;
 	Duration noMatchDelay;
 	StartupBehavior startupBehavior = PERSIST;
 	AutoStartEvent autoStartEvent = AutoStartEvent::NEVER;
 
+	std::vector<std::thread> audioHelperThreads;
+	std::atomic_bool masterAudioFadeActive = {false};
+	std::unordered_map<std::string, std::atomic_bool> activeAudioFades;
+
 	Duration cooldown;
 	std::chrono::high_resolution_clock::time_point lastMatchTime;
 
-	std::deque<Macro> macros;
+	std::deque<std::shared_ptr<Macro>> macros;
+	std::condition_variable macroWaitCv;
+	std::atomic_bool abortMacroWait = {false};
 	bool macroSceneSwitched = false;
 	bool replayBufferSaved = false;
 

src/headers/transition-selection.hpp

@@ -0,0 +1,46 @@
+#pragma once
+#include "utility.hpp"
+
+#include <QComboBox>
+
+enum class TransitionSelectionType {
+	TRANSITION,
+	CURRENT,
+	ANY,
+};
+
+class TransitionSelection {
+public:
+	void Save(obs_data_t *obj, const char *name = "transition",
+		  const char *typeName = "transitionType");
+	void Load(obs_data_t *obj, const char *name = "transition",
+		  const char *typeName = "transitionType");
+
+	TransitionSelectionType GetType() { return _type; }
+	OBSWeakSource GetTransition();
+	std::string ToString();
+
+private:
+	OBSWeakSource _transition;
+	TransitionSelectionType _type = TransitionSelectionType::TRANSITION;
+	friend class TransitionSelectionWidget;
+};
+
+class TransitionSelectionWidget : public QComboBox {
+	Q_OBJECT
+
+public:
+	TransitionSelectionWidget(QWidget *parent, bool current = true,
+				  bool any = false);
+	void SetTransition(TransitionSelection &);
+	void Repopulate(bool current, bool any);
+signals:
+	void TransitionChanged(const TransitionSelection &);
+
+private slots:
+	void SelectionChanged(const QString &name);
+
+private:
+	bool IsCurrentTransitionSelected(const QString &name);
+	bool IsAnyTransitionSelected(const QString &name);
+};

src/headers/utility.hpp

@@ -30,39 +30,42 @@ bool compareSourceSettings(const OBSWeakSource &source,
 std::vector<obs_scene_item *> getSceneItemsWithName(OBSScene scene,
 						    std::string &name);
 std::string getDataFilePath(const std::string &file);
-QString fromatJsonString(std::string);
-QString fromatJsonString(const char *);
-
-/**
- * Populate layout with labels and widgets based on provided text
- *
- * @param text		Text based on which labels are generated and widgets are placed.
- * @param layout	Layout in which the widgets and labels will be placed.
- * @param placeholders	Map containing a mapping of placeholder strings to widgets.
- * @param addStretch	Add addStretch() to layout.
- */
+bool matchJson(const std::string &json1, const std::string &json2,
+	       bool useRegex);
+QString formatJsonString(std::string);
+QString formatJsonString(const char *);
+QString escapeForRegex(QString &s);
+void loadTransformState(obs_data_t *obj, struct obs_transform_info &info,
+			struct obs_sceneitem_crop &crop);
+bool saveTransformState(obs_data_t *obj, struct obs_transform_info &info,
+			struct obs_sceneitem_crop &crop);
+std::string getSceneItemTransform(obs_scene_item *item);
 void placeWidgets(std::string text, QBoxLayout *layout,
 		  std::unordered_map<std::string, QWidget *> placeholders,
 		  bool addStretch = true);
 void deleteLayoutItem(QLayoutItem *item);
-void clearLayout(QLayout *layout);
-QMetaObject::Connection PulseWidget(QWidget *widget, QColor endColor,
+void clearLayout(QLayout *layout, int afterIdx = 0);
+void setLayoutVisible(QLayout *layout, bool visible);
+QMetaObject::Connection PulseWidget(QWidget *widget, QColor startColor,
 				    QColor = QColor(0, 0, 0, 0),
-				    QString specifier = "QLabel ");
+				    QString specifier = "QLabel ",
+				    bool once = false);
 void listAddClicked(QListWidget *list, QWidget *newWidget,
 		    QPushButton *addButton = nullptr,
 		    QMetaObject::Connection *addHighlight = nullptr);
 bool listMoveUp(QListWidget *list);
 bool listMoveDown(QListWidget *list);
+void setHeightToContentHeight(QListWidget *list);
 bool DisplayMessage(const QString &msg, bool question = false);
+void DisplayTrayMessage(const QString &title, const QString &msg);
 void addSelectionEntry(QComboBox *sel, const char *description,
 		       bool selectable = false, const char *tooltip = "");
 void populateTransitionSelection(QComboBox *sel, bool addCurrent = true,
-				 bool addSelect = true,
-				 bool selectable = false);
+				 bool addAny = false);
 void populateWindowSelection(QComboBox *sel, bool addSelect = true);
 void populateAudioSelection(QComboBox *sel, bool addSelect = true);
-void populateVideoSelection(QComboBox *sel, bool addSelect = true);
+void populateVideoSelection(QComboBox *sel, bool addScenes = false,
+			    bool addSelect = true);
 void populateMediaSelection(QComboBox *sel, bool addSelect = true);
 void populateProcessSelection(QComboBox *sel, bool addSelect = true);
 void populateSourceSelection(QComboBox *list, bool addSelect = true);
@@ -78,3 +81,4 @@ void populateFilterSelection(QComboBox *list,
 void populateSceneItemSelection(QComboBox *list,
 				OBSWeakSource sceneWeakSource = nullptr);
 void populateSceneItemSelection(QComboBox *list, SceneSelection &s);
+void populateSourceTypeSelection(QComboBox *list);

src/headers/version.h

@@ -1 +1,2 @@
 extern const char g_GIT_SHA1[];
+extern const char g_GIT_TAG[];

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

@@ -24,6 +24,9 @@
 #include <QStringList>
 #include <QRegularExpression>
 #include <QLibrary>
+#include <proc/readproc.h>
+#include <fstream>
+#include <sstream>
 
 static Display *xdisplay = 0;
 
@@ -363,17 +366,78 @@ bool isFullscreen(const std::string &title)
 void GetProcessList(QStringList &processes)
 {
 	processes.clear();
-	for (size_t i = 0; i < getTopLevelWindows().size(); ++i) {
-		std::string s = GetWindowTitle(i);
-		if (s != "")
-			processes << QString::fromStdString(s);
+	PROCTAB *proc = openproc(PROC_FILLSTAT);
+	proc_t proc_info;
+	memset(&proc_info, 0, sizeof(proc_info));
+	while (readproc(proc, &proc_info) != NULL) {
+		QString procName(proc_info.cmd);
+		if (!procName.isEmpty() && !processes.contains(proc_info.cmd)) {
+			processes << QString(proc_info.cmd);
+		}
 	}
+	closeproc(proc);
+}
+
+int getForegroundProcessPid()
+{
+	if (!ewmhIsSupported()) {
+		return -1;
+	}
+
+	auto dpy = disp();
+	Atom active = XInternAtom(dpy, "_NET_ACTIVE_WINDOW", true);
+	Atom actualType;
+	int format;
+	unsigned long num, bytes;
+	Window *window = 0;
+	int pid = -1;
+
+	Window rootWin = RootWindow(dpy, 0);
+
+	int xstatus = XGetWindowProperty(dpy, rootWin, active, 0L, ~0L, false,
+					 AnyPropertyType, &actualType, &format,
+					 &num, &bytes, (uint8_t **)&window);
+
+	if (xstatus == 0 && window == nullptr) {
+		return -1;
+	}
+
+	Atom atom, actual_type;
+	int actual_format;
+	unsigned long nitems;
+	unsigned long bytes_after;
+	unsigned char *prop;
+	atom = XInternAtom(dpy, "_NET_WM_PID", True);
+	auto status = XGetWindowProperty(dpy, *window, atom, 0, 1024, False,
+					 AnyPropertyType, &actual_type,
+					 &actual_format, &nitems, &bytes_after,
+					 &prop);
+
+	if (status != 0) {
+		return -2;
+	}
+	if (!prop) {
+		return -3;
+	}
+
+	pid = prop[1] * 256;
+	pid += prop[0];
+	return pid;
+}
+
+std::string getProcNameFromPid(int pid)
+{
+	std::string path = "/proc/" + std::to_string(pid) + "/comm";
+	std::ifstream t(path);
+	std::stringstream buffer;
+	buffer << t.rdbuf();
+	return buffer.str();
 }
 
 bool isInFocus(const QString &executable)
 {
-	std::string current;
-	GetCurrentWindowTitle(current);
+	auto pid = getForegroundProcessPid();
+	std::string current = getProcNameFromPid(pid);
 
 	// True if executable switch equals current window
 	bool equals = (executable.toStdString() == current);
@@ -524,7 +588,7 @@ static std::unordered_map<HotkeyType, long> keyTable = {
 	{HotkeyType::Key_NumpadEnter, XK_KP_Enter},
 };
 
-void PressKeys(const std::vector<HotkeyType> keys)
+void PressKeys(const std::vector<HotkeyType> keys, int duration)
 {
 	if (!canSimulateKeyPresses) {
 		return;
@@ -545,7 +609,7 @@ void PressKeys(const std::vector<HotkeyType> keys)
 	}
 	XFlush(display);
 
-	std::this_thread::sleep_for(std::chrono::milliseconds(300));
+	std::this_thread::sleep_for(std::chrono::milliseconds(duration));
 
 	// Release keys
 	for (auto &key : keys) {

src/macro-action-audio.cpp

@@ -18,6 +18,94 @@ const static std::map<AudioAction, std::string> actionTypes = {
 	 "AdvSceneSwitcher.action.audio.type.masterVolume"},
 };
 
+constexpr auto fadeInterval = std::chrono::milliseconds(100);
+constexpr float minFade = 0.000001f;
+
+void fadeSourceVolume(Duration duration, float vol, OBSWeakSource audioSource)
+{
+	auto s = obs_weak_source_get_source(audioSource);
+	if (!s) {
+		return;
+	}
+	float curVol = obs_source_get_volume(s);
+	obs_source_release(s);
+	bool volIncrease = curVol <= vol;
+	int nrSteps = duration.seconds * 1000 / fadeInterval.count();
+	float volDiff = (volIncrease) ? vol - curVol : curVol - vol;
+	float volStep = volDiff / nrSteps;
+
+	if (volStep < minFade) {
+		switcher->activeAudioFades[GetWeakSourceName(audioSource)] =
+			false;
+		return;
+	}
+
+	for (int step = 0; step < nrSteps && !switcher->stop; ++step) {
+		auto s = obs_weak_source_get_source(audioSource);
+		if (!s) {
+			return;
+		}
+		curVol = (volIncrease) ? curVol + volStep : curVol - volStep;
+		obs_source_set_volume(s, curVol);
+		std::this_thread::sleep_for(fadeInterval);
+		obs_source_release(s);
+	}
+
+	switcher->activeAudioFades[GetWeakSourceName(audioSource)] = false;
+}
+void fadeMasterVolume(Duration duration, float vol)
+{
+	float curVol = obs_get_master_volume();
+	bool volIncrease = curVol <= vol;
+	int nrSteps = duration.seconds * 1000 / fadeInterval.count();
+	float volDiff = (volIncrease) ? vol - curVol : curVol - vol;
+	float volStep = volDiff / nrSteps;
+
+	if (volStep < minFade) {
+		switcher->masterAudioFadeActive = false;
+		return;
+	}
+
+	for (int step = 0; step < nrSteps && !switcher->stop; ++step) {
+		curVol = (volIncrease) ? curVol + volStep : curVol - volStep;
+		obs_set_master_volume(curVol);
+		std::this_thread::sleep_for(fadeInterval);
+	}
+
+	switcher->masterAudioFadeActive = false;
+}
+
+void startSourceFade(Duration &duration, float vol, OBSWeakSource audioSource)
+{
+	if (!audioSource) {
+		return;
+	}
+	auto it =
+		switcher->activeAudioFades.find(GetWeakSourceName(audioSource));
+	if (it != switcher->activeAudioFades.end() && it->second == true) {
+		blog(LOG_WARNING,
+		     "Audio fade for volume of %s already active! New fade request will be ignored!",
+		     GetWeakSourceName(audioSource).c_str());
+		return;
+	}
+	switcher->activeAudioFades[GetWeakSourceName(audioSource)] = true;
+	switcher->audioHelperThreads.emplace_back(fadeSourceVolume, duration,
+						  vol, audioSource);
+}
+
+void startMasterFade(Duration &duration, float vol)
+{
+
+	if (switcher->masterAudioFadeActive) {
+		blog(LOG_WARNING,
+		     "Audio fade for master volume already active! New fade request will be ignored!");
+		return;
+	}
+	switcher->masterAudioFadeActive = true;
+	switcher->audioHelperThreads.emplace_back(fadeMasterVolume, duration,
+						  vol);
+}
+
 bool MacroActionAudio::PerformAction()
 {
 	auto s = obs_weak_source_get_source(_audioSource);
@@ -29,10 +117,19 @@ bool MacroActionAudio::PerformAction()
 		obs_source_set_muted(s, false);
 		break;
 	case AudioAction::SOURCE_VOLUME:
-		obs_source_set_volume(s, (float)_volume / 100.0f);
+		if (_fade) {
+			startSourceFade(_duration, (float)_volume / 100.0f,
+					_audioSource);
+		} else {
+			obs_source_set_volume(s, (float)_volume / 100.0f);
+		}
 		break;
 	case AudioAction::MASTER_VOLUME:
-		obs_set_master_volume((float)_volume / 100.0f);
+		if (_fade) {
+			startMasterFade(_duration, (float)_volume / 100.0f);
+		} else {
+			obs_set_master_volume((float)_volume / 100.0f);
+		}
 		break;
 	default:
 		break;
@@ -46,9 +143,10 @@ void MacroActionAudio::LogAction()
 	auto it = actionTypes.find(_action);
 	if (it != actionTypes.end()) {
 		vblog(LOG_INFO,
-		      "performed action \"%s\" for source \"%s\" with volume %d",
+		      "performed action \"%s\" for source \"%s\" with volume %d with fade %d %f",
 		      it->second.c_str(),
-		      GetWeakSourceName(_audioSource).c_str(), _volume);
+		      GetWeakSourceName(_audioSource).c_str(), _volume, _fade,
+		      _duration.seconds);
 	} else {
 		blog(LOG_WARNING, "ignored unknown audio action %d",
 		     static_cast<int>(_action));
@@ -58,20 +156,24 @@ void MacroActionAudio::LogAction()
 bool MacroActionAudio::Save(obs_data_t *obj)
 {
 	MacroAction::Save(obj);
+	_duration.Save(obj);
 	obs_data_set_string(obj, "audioSource",
 			    GetWeakSourceName(_audioSource).c_str());
 	obs_data_set_int(obj, "action", static_cast<int>(_action));
 	obs_data_set_int(obj, "volume", _volume);
+	obs_data_set_bool(obj, "fade", _fade);
 	return true;
 }
 
 bool MacroActionAudio::Load(obs_data_t *obj)
 {
 	MacroAction::Load(obj);
+	_duration.Load(obj);
 	const char *audioSourceName = obs_data_get_string(obj, "audioSource");
 	_audioSource = GetWeakSourceByName(audioSourceName);
 	_action = static_cast<AudioAction>(obs_data_get_int(obj, "action"));
 	_volume = obs_data_get_int(obj, "volume");
+	_fade = obs_data_get_bool(obj, "fade");
 	return true;
 }
 
@@ -100,6 +202,8 @@ MacroActionAudioEdit::MacroActionAudioEdit(
 	_volumePercent->setMinimum(0);
 	_volumePercent->setMaximum(2000);
 	_volumePercent->setSuffix("%");
+	_fade = new QCheckBox();
+	_duration = new DurationSelection(parent, false);
 
 	populateActionSelection(_actions);
 	populateAudioSelection(_audioSources);
@@ -111,15 +215,25 @@ MacroActionAudioEdit::MacroActionAudioEdit(
 			 SLOT(SourceChanged(const QString &)));
 	QWidget::connect(_volumePercent, SIGNAL(valueChanged(int)), this,
 			 SLOT(VolumeChanged(int)));
+	QWidget::connect(_fade, SIGNAL(stateChanged(int)), this,
+			 SLOT(FadeChanged(int)));
+	QWidget::connect(_duration, SIGNAL(DurationChanged(double)), this,
+			 SLOT(DurationChanged(double)));
 
-	QHBoxLayout *mainLayout = new QHBoxLayout;
 	std::unordered_map<std::string, QWidget *> widgetPlaceholders = {
-		{"{{audioSources}}", _audioSources},
-		{"{{actions}}", _actions},
-		{"{{volume}}", _volumePercent},
+		{"{{audioSources}}", _audioSources}, {"{{actions}}", _actions},
+		{"{{volume}}", _volumePercent},      {"{{fade}}", _fade},
+		{"{{duration}}", _duration},
 	};
+	QHBoxLayout *entryLayout = new QHBoxLayout;
 	placeWidgets(obs_module_text("AdvSceneSwitcher.action.audio.entry"),
-		     mainLayout, widgetPlaceholders);
+		     entryLayout, widgetPlaceholders);
+	_fadeLayout = new QHBoxLayout;
+	placeWidgets(obs_module_text("AdvSceneSwitcher.action.audio.fade"),
+		     _fadeLayout, widgetPlaceholders);
+	QVBoxLayout *mainLayout = new QVBoxLayout;
+	mainLayout->addLayout(entryLayout);
+	mainLayout->addLayout(_fadeLayout);
 	setLayout(mainLayout);
 
 	_entryData = entryData;
@@ -140,19 +254,11 @@ bool hasSourceControl(AudioAction action)
 
 void MacroActionAudioEdit::SetWidgetVisibility()
 {
-	if (hasVolumeControl(_entryData->_action)) {
-		_volumePercent->show();
-	} else {
-		_volumePercent->hide();
-	}
-
-	if (hasSourceControl(_entryData->_action)) {
-		_audioSources->show();
-	} else {
-		_audioSources->hide();
-	}
+	_volumePercent->setVisible(hasVolumeControl(_entryData->_action));
+	_audioSources->setVisible(hasSourceControl(_entryData->_action));
+	setLayoutVisible(_fadeLayout, hasVolumeControl(_entryData->_action));
+	adjustSize();
 }
-
 void MacroActionAudioEdit::UpdateEntryData()
 {
 	if (!_entryData) {
@@ -163,7 +269,8 @@ void MacroActionAudioEdit::UpdateEntryData()
 		GetWeakSourceName(_entryData->_audioSource).c_str());
 	_actions->setCurrentIndex(static_cast<int>(_entryData->_action));
 	_volumePercent->setValue(_entryData->_volume);
-
+	_fade->setChecked(_entryData->_fade);
+	_duration->SetDuration(_entryData->_duration);
 	SetWidgetVisibility();
 }
 
@@ -199,3 +306,23 @@ void MacroActionAudioEdit::VolumeChanged(int value)
 	std::lock_guard<std::mutex> lock(switcher->m);
 	_entryData->_volume = value;
 }
+
+void MacroActionAudioEdit::FadeChanged(int value)
+{
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	_entryData->_fade = value;
+}
+
+void MacroActionAudioEdit::DurationChanged(double seconds)
+{
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	_entryData->_duration.seconds = seconds;
+}

src/macro-action-edit.cpp

@@ -92,12 +92,14 @@ void MacroActionEdit::ActionSelectionChanged(const QString &text)
 		return;
 	}
 
+	auto idx = _entryData->get()->GetIndex();
 	std::string id = MacroActionFactory::GetIdByName(text);
 	HeaderInfoChanged("");
 
 	std::lock_guard<std::mutex> lock(switcher->m);
 	_entryData->reset();
 	*_entryData = MacroActionFactory::Create(id);
+	(*_entryData)->SetIndex(idx);
 	auto widget = MacroActionFactory::CreateWidget(id, this, *_entryData);
 	QWidget::connect(widget, SIGNAL(HeaderInfoChanged(const QString &)),
 			 this, SLOT(HeaderInfoChanged(const QString &)));
@@ -134,20 +136,27 @@ void AdvSceneSwitcher::AddMacroAction(int idx)
 		return;
 	}
 
-	MacroActionSwitchScene temp;
-	std::string id = temp.GetId();
-
+	std::string id;
+	if (idx - 1 >= 0) {
+		id = macro->Actions().at(idx - 1)->GetId();
+	} else {
+		MacroActionSwitchScene temp;
+		id = temp.GetId();
+	}
 	std::lock_guard<std::mutex> lock(switcher->m);
-	auto action = macro->Actions().emplace(macro->Actions().begin() + idx,
-					       MacroActionFactory::Create(id));
+	macro->Actions().emplace(macro->Actions().begin() + idx,
+				 MacroActionFactory::Create(id));
+	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->UpdateActionIndices();
 
-	// All entry pointers in existing edit widgets after the new entry will
-	// be invalidated by adding the new entry so we have to recreate them
-	// and because I am lazy I am recreating every widget.
-	//
-	// If performance should become a concern this has to be revisited.
-	SetEditMacro(*macro);
+	clearLayout(ui->macroEditActionLayout, idx);
+	PopulateMacroActions(*macro, idx);
+	HighlightAction(idx);
 }
 
 void AdvSceneSwitcher::on_actionAdd_clicked()
@@ -174,14 +183,12 @@ void AdvSceneSwitcher::RemoveMacroAction(int idx)
 
 	std::lock_guard<std::mutex> lock(switcher->m);
 	macro->Actions().erase(macro->Actions().begin() + idx);
+	switcher->abortMacroWait = true;
+	switcher->macroWaitCv.notify_all();
 	macro->UpdateActionIndices();
 
-	// All entry pointers in existing edit widgets after the new entry will
-	// be invalidated by adding the new entry so we have to recreate them
-	// and because I am lazy I am recreating every widget.
-	//
-	// If performance should become a concern this has to be revisited.
-	SetEditMacro(*macro);
+	clearLayout(ui->macroEditActionLayout, idx);
+	PopulateMacroActions(*macro, idx);
 }
 
 void AdvSceneSwitcher::on_actionRemove_clicked()

src/macro-action-file.cpp

@@ -86,9 +86,7 @@ MacroActionFileEdit::MacroActionFileEdit(
 	QWidget *parent, std::shared_ptr<MacroActionFile> entryData)
 	: QWidget(parent)
 {
-	_filePath = new QLineEdit();
-	_browseButton =
-		new QPushButton(obs_module_text("AdvSceneSwitcher.browse"));
+	_filePath = new FileSelection(FileSelection::Type::WRITE);
 	_text = new QPlainTextEdit();
 	_actions = new QComboBox();
 
@@ -96,10 +94,8 @@ MacroActionFileEdit::MacroActionFileEdit(
 
 	QWidget::connect(_actions, SIGNAL(currentIndexChanged(int)), this,
 			 SLOT(ActionChanged(int)));
-	QWidget::connect(_filePath, SIGNAL(editingFinished()), this,
-			 SLOT(FilePathChanged()));
-	QWidget::connect(_browseButton, SIGNAL(clicked()), this,
-			 SLOT(BrowseButtonClicked()));
+	QWidget::connect(_filePath, SIGNAL(PathChanged(const QString &)), this,
+			 SLOT(PathChanged(const QString &)));
 	QWidget::connect(_text, SIGNAL(textChanged()), this,
 			 SLOT(TextChanged()));
 	;
@@ -107,7 +103,6 @@ MacroActionFileEdit::MacroActionFileEdit(
 	QHBoxLayout *entryLayout = new QHBoxLayout;
 	std::unordered_map<std::string, QWidget *> widgetPlaceholders = {
 		{"{{filePath}}", _filePath},
-		{"{{browseButton}}", _browseButton},
 		{"{{matchText}}", _text},
 		{"{{actions}}", _actions},
 	};
@@ -131,41 +126,22 @@ void MacroActionFileEdit::UpdateEntryData()
 	}
 
 	_actions->setCurrentIndex(static_cast<int>(_entryData->_action));
-	_filePath->setText(QString::fromStdString(_entryData->_file));
+	_filePath->SetPath(QString::fromStdString(_entryData->_file));
 	_text->setPlainText(QString::fromStdString(_entryData->_text));
 }
 
-void MacroActionFileEdit::FilePathChanged()
+void MacroActionFileEdit::PathChanged(const QString &text)
 {
 	if (_loading || !_entryData) {
 		return;
 	}
 
 	std::lock_guard<std::mutex> lock(switcher->m);
-	_entryData->_file = _filePath->text().toUtf8().constData();
+	_entryData->_file = text.toUtf8().constData();
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
 }
 
-void MacroActionFileEdit::BrowseButtonClicked()
-{
-	if (_loading || !_entryData) {
-		return;
-	}
-
-	QString path = QFileDialog::getSaveFileName(
-		this,
-		tr(obs_module_text("AdvSceneSwitcher.fileTab.selectWrite")),
-		QDir::currentPath(),
-		tr(obs_module_text("AdvSceneSwitcher.fileTab.anyFileType")));
-	if (path.isEmpty()) {
-		return;
-	}
-
-	_filePath->setText(path);
-	FilePathChanged();
-}
-
 void MacroActionFileEdit::TextChanged()
 {
 	if (_loading || !_entryData) {

src/macro-action-filter.cpp

@@ -94,6 +94,7 @@ MacroActionFilterEdit::MacroActionFilterEdit(
 {
 	_sources = new QComboBox();
 	_filters = new QComboBox();
+	_filters->setSizeAdjustPolicy(QComboBox::AdjustToContents);
 	_actions = new QComboBox();
 	_getSettings = new QPushButton(
 		obs_module_text("AdvSceneSwitcher.action.filter.getSettings"));
@@ -165,6 +166,7 @@ void MacroActionFilterEdit::SourceChanged(const QString &text)
 	}
 	_filters->clear();
 	populateFilterSelection(_filters, _entryData->_source);
+	_filters->adjustSize();
 }
 
 void MacroActionFilterEdit::FilterChanged(const QString &text)
@@ -198,7 +200,7 @@ void MacroActionFilterEdit::GetSettingsClicked()
 	}
 
 	_settings->setPlainText(
-		fromatJsonString(getSourceSettings(_entryData->_filter)));
+		formatJsonString(getSourceSettings(_entryData->_filter)));
 }
 
 void MacroActionFilterEdit::SettingsChanged()

src/macro-action-hotkey.cpp

@@ -1,18 +1,196 @@
 #include "headers/macro-action-hotkey.hpp"
 #include "headers/advanced-scene-switcher.hpp"
 #include "headers/utility.hpp"
+#include <obs-interaction.h>
 
 const std::string MacroActionHotkey::id = "hotkey";
 
-// TODO:
-// I can't seem to get this to work so drop support for this functionality
-// on MacOS
-#if !__APPLE__
 bool MacroActionHotkey::_registered = MacroActionFactory::Register(
 	MacroActionHotkey::id,
 	{MacroActionHotkey::Create, MacroActionHotkeyEdit::Create,
 	 "AdvSceneSwitcher.action.hotkey"});
-#endif
+
+static std::unordered_map<HotkeyType, long> keyTable = {
+	// Chars
+	{HotkeyType::Key_A, OBS_KEY_A},
+	{HotkeyType::Key_B, OBS_KEY_B},
+	{HotkeyType::Key_C, OBS_KEY_C},
+	{HotkeyType::Key_D, OBS_KEY_D},
+	{HotkeyType::Key_E, OBS_KEY_E},
+	{HotkeyType::Key_F, OBS_KEY_F},
+	{HotkeyType::Key_G, OBS_KEY_G},
+	{HotkeyType::Key_H, OBS_KEY_H},
+	{HotkeyType::Key_I, OBS_KEY_I},
+	{HotkeyType::Key_J, OBS_KEY_J},
+	{HotkeyType::Key_K, OBS_KEY_K},
+	{HotkeyType::Key_L, OBS_KEY_L},
+	{HotkeyType::Key_M, OBS_KEY_M},
+	{HotkeyType::Key_N, OBS_KEY_N},
+	{HotkeyType::Key_O, OBS_KEY_O},
+	{HotkeyType::Key_P, OBS_KEY_P},
+	{HotkeyType::Key_Q, OBS_KEY_Q},
+	{HotkeyType::Key_R, OBS_KEY_R},
+	{HotkeyType::Key_S, OBS_KEY_S},
+	{HotkeyType::Key_T, OBS_KEY_T},
+	{HotkeyType::Key_U, OBS_KEY_U},
+	{HotkeyType::Key_V, OBS_KEY_V},
+	{HotkeyType::Key_W, OBS_KEY_W},
+	{HotkeyType::Key_X, OBS_KEY_X},
+	{HotkeyType::Key_Y, OBS_KEY_Y},
+	{HotkeyType::Key_Z, OBS_KEY_Z},
+
+	// Numbers
+	{HotkeyType::Key_0, OBS_KEY_0},
+	{HotkeyType::Key_1, OBS_KEY_1},
+	{HotkeyType::Key_2, OBS_KEY_2},
+	{HotkeyType::Key_3, OBS_KEY_3},
+	{HotkeyType::Key_4, OBS_KEY_4},
+	{HotkeyType::Key_5, OBS_KEY_5},
+	{HotkeyType::Key_6, OBS_KEY_6},
+	{HotkeyType::Key_7, OBS_KEY_7},
+	{HotkeyType::Key_8, OBS_KEY_8},
+	{HotkeyType::Key_9, OBS_KEY_9},
+
+	{HotkeyType::Key_F1, OBS_KEY_F1},
+	{HotkeyType::Key_F2, OBS_KEY_F2},
+	{HotkeyType::Key_F3, OBS_KEY_F3},
+	{HotkeyType::Key_F4, OBS_KEY_F4},
+	{HotkeyType::Key_F5, OBS_KEY_F5},
+	{HotkeyType::Key_F6, OBS_KEY_F6},
+	{HotkeyType::Key_F7, OBS_KEY_F7},
+	{HotkeyType::Key_F8, OBS_KEY_F8},
+	{HotkeyType::Key_F9, OBS_KEY_F9},
+	{HotkeyType::Key_F10, OBS_KEY_F10},
+	{HotkeyType::Key_F11, OBS_KEY_F11},
+	{HotkeyType::Key_F12, OBS_KEY_F12},
+	{HotkeyType::Key_F13, OBS_KEY_F13},
+	{HotkeyType::Key_F14, OBS_KEY_F14},
+	{HotkeyType::Key_F15, OBS_KEY_F15},
+	{HotkeyType::Key_F16, OBS_KEY_F16},
+	{HotkeyType::Key_F17, OBS_KEY_F17},
+	{HotkeyType::Key_F18, OBS_KEY_F18},
+	{HotkeyType::Key_F19, OBS_KEY_F19},
+	{HotkeyType::Key_F20, OBS_KEY_F20},
+	{HotkeyType::Key_F21, OBS_KEY_F21},
+	{HotkeyType::Key_F22, OBS_KEY_F22},
+	{HotkeyType::Key_F23, OBS_KEY_F23},
+	{HotkeyType::Key_F24, OBS_KEY_F24},
+
+	{HotkeyType::Key_Escape, OBS_KEY_ESCAPE},
+	{HotkeyType::Key_Space, OBS_KEY_SPACE},
+	{HotkeyType::Key_Return, OBS_KEY_RETURN},
+	{HotkeyType::Key_Backspace, OBS_KEY_BACKSPACE},
+	{HotkeyType::Key_Tab, OBS_KEY_TAB},
+
+	{HotkeyType::Key_Shift_L, OBS_KEY_SHIFT},
+	{HotkeyType::Key_Shift_R, OBS_KEY_SHIFT},
+	{HotkeyType::Key_Control_L, OBS_KEY_CONTROL},
+	{HotkeyType::Key_Control_R, OBS_KEY_CONTROL},
+	{HotkeyType::Key_Alt_L, OBS_KEY_ALT},
+	{HotkeyType::Key_Alt_R, OBS_KEY_ALT},
+	{HotkeyType::Key_Win_L, OBS_KEY_META},
+	{HotkeyType::Key_Win_R, OBS_KEY_META},
+	{HotkeyType::Key_Apps, OBS_KEY_APPLICATIONLEFT},
+
+	{HotkeyType::Key_CapsLock, OBS_KEY_CAPSLOCK},
+	{HotkeyType::Key_NumLock, OBS_KEY_NUMLOCK},
+	{HotkeyType::Key_ScrollLock, OBS_KEY_SCROLLLOCK},
+
+	{HotkeyType::Key_PrintScreen, OBS_KEY_PRINT},
+	{HotkeyType::Key_Pause, OBS_KEY_PAUSE},
+
+	{HotkeyType::Key_Insert, OBS_KEY_INSERT},
+	{HotkeyType::Key_Delete, OBS_KEY_DELETE},
+	{HotkeyType::Key_PageUP, OBS_KEY_PAGEUP},
+	{HotkeyType::Key_PageDown, OBS_KEY_PAGEDOWN},
+	{HotkeyType::Key_Home, OBS_KEY_HOME},
+	{HotkeyType::Key_End, OBS_KEY_END},
+
+	{HotkeyType::Key_Left, OBS_KEY_LEFT},
+	{HotkeyType::Key_Up, OBS_KEY_UP},
+	{HotkeyType::Key_Right, OBS_KEY_RIGHT},
+	{HotkeyType::Key_Down, OBS_KEY_DOWN},
+
+	{HotkeyType::Key_Numpad0, OBS_KEY_NUM0},
+	{HotkeyType::Key_Numpad1, OBS_KEY_NUM1},
+	{HotkeyType::Key_Numpad2, OBS_KEY_NUM2},
+	{HotkeyType::Key_Numpad3, OBS_KEY_NUM3},
+	{HotkeyType::Key_Numpad4, OBS_KEY_NUM4},
+	{HotkeyType::Key_Numpad5, OBS_KEY_NUM5},
+	{HotkeyType::Key_Numpad6, OBS_KEY_NUM6},
+	{HotkeyType::Key_Numpad7, OBS_KEY_NUM7},
+	{HotkeyType::Key_Numpad8, OBS_KEY_NUM8},
+	{HotkeyType::Key_Numpad9, OBS_KEY_NUM9},
+
+	{HotkeyType::Key_NumpadAdd, OBS_KEY_NUMPLUS},
+	{HotkeyType::Key_NumpadSubtract, OBS_KEY_NUMMINUS},
+	{HotkeyType::Key_NumpadMultiply, OBS_KEY_NUMASTERISK},
+	{HotkeyType::Key_NumpadDivide, OBS_KEY_NUMSLASH},
+	{HotkeyType::Key_NumpadDecimal, OBS_KEY_NUMPERIOD},
+	//{HotkeyType::Key_NumpadEnter, ???},
+};
+
+obs_key_combination keysToOBSKeycombo(const std::vector<HotkeyType> &keys)
+{
+	obs_key_combination combo{};
+	auto it = keyTable.find(keys.back());
+	if (it != keyTable.end()) {
+		combo.key = (obs_key_t)it->second;
+	}
+	if (keys.size() == 1) {
+		return combo;
+	}
+
+	for (uint32_t i = 0; i < keys.size() - 1; i++) {
+		switch (keys[i]) {
+		case HotkeyType::Key_Shift_L:
+			combo.modifiers |= INTERACT_SHIFT_KEY;
+			break;
+		case HotkeyType::Key_Shift_R:
+			combo.modifiers |= INTERACT_SHIFT_KEY;
+			break;
+		case HotkeyType::Key_Control_L:
+			combo.modifiers |= INTERACT_CONTROL_KEY;
+			break;
+		case HotkeyType::Key_Control_R:
+			combo.modifiers |= INTERACT_CONTROL_KEY;
+			break;
+		case HotkeyType::Key_Alt_L:
+			combo.modifiers |= INTERACT_ALT_KEY;
+			break;
+		case HotkeyType::Key_Alt_R:
+			combo.modifiers |= INTERACT_ALT_KEY;
+			break;
+		case HotkeyType::Key_Win_L:
+			combo.modifiers |= INTERACT_COMMAND_KEY;
+			break;
+		case HotkeyType::Key_Win_R:
+			combo.modifiers |= INTERACT_COMMAND_KEY;
+			break;
+		case HotkeyType::Key_CapsLock:
+			combo.modifiers |= INTERACT_CAPS_KEY;
+			break;
+		default:
+			break;
+		}
+	}
+
+	return combo;
+}
+
+void InjectKeys(const std::vector<HotkeyType> &keys, int duration)
+{
+	auto combo = keysToOBSKeycombo(keys);
+	if (obs_key_combination_is_empty(combo)) {
+		return;
+	}
+	// I am not sure why this is necessary
+	obs_hotkey_inject_event(combo, false);
+
+	obs_hotkey_inject_event(combo, true);
+	std::this_thread::sleep_for(std::chrono::milliseconds(duration));
+	obs_hotkey_inject_event(combo, false);
+}
 
 bool MacroActionHotkey::PerformAction()
 {
@@ -35,13 +213,25 @@ bool MacroActionHotkey::PerformAction()
 	if (_rightAlt) {
 		keys.push_back(HotkeyType::Key_Alt_R);
 	}
+	if (_leftMeta) {
+		keys.push_back(HotkeyType::Key_Win_L);
+	}
+	if (_rightMeta) {
+		keys.push_back(HotkeyType::Key_Win_R);
+	}
 	if (_key != HotkeyType::Key_NoKey) {
 		keys.push_back(_key);
 	}
 
 	if (!keys.empty()) {
-		std::thread t([keys]() { PressKeys(keys); });
-		t.detach();
+		int dur = _duration;
+		if (_onlySendToObs) {
+			std::thread t([keys, dur]() { InjectKeys(keys, dur); });
+			t.detach();
+		} else {
+			std::thread t([keys, dur]() { PressKeys(keys, dur); });
+			t.detach();
+		}
 	}
 
 	return true;
@@ -64,6 +254,8 @@ bool MacroActionHotkey::Save(obs_data_t *obj)
 	obs_data_set_bool(obj, "right_alt", _rightAlt);
 	obs_data_set_bool(obj, "left_meta", _leftMeta);
 	obs_data_set_bool(obj, "right_meta", _rightMeta);
+	obs_data_set_int(obj, "duration", _duration);
+	obs_data_set_bool(obj, "onlyOBS", _onlySendToObs);
 	return true;
 }
 
@@ -79,6 +271,8 @@ bool MacroActionHotkey::Load(obs_data_t *obj)
 	_rightAlt = obs_data_get_bool(obj, "right_alt");
 	_leftMeta = obs_data_get_bool(obj, "left_meta");
 	_rightMeta = obs_data_get_bool(obj, "right_meta");
+	_duration = obs_data_get_int(obj, "duration");
+	_onlySendToObs = obs_data_get_bool(obj, "onlyOBS");
 	return true;
 }
 
@@ -213,6 +407,12 @@ MacroActionHotkeyEdit::MacroActionHotkeyEdit(
 		obs_module_text("AdvSceneSwitcher.action.hotkey.leftMeta"));
 	_rightMeta = new QCheckBox(
 		obs_module_text("AdvSceneSwitcher.action.hotkey.rightMeta"));
+	_duration = new QSpinBox();
+	_duration->setMaximum(5000);
+	_onlySendToOBS = new QCheckBox(
+		obs_module_text("AdvSceneSwitcher.action.hotkey.onlyOBS"));
+	_noKeyPressSimulationWarning = new QLabel(
+		obs_module_text("AdvSceneSwitcher.action.hotkey.disabled"));
 
 	populateKeySelection(_keys);
 
@@ -234,10 +434,15 @@ MacroActionHotkeyEdit::MacroActionHotkeyEdit(
 			 SLOT(LMetaChanged(int)));
 	QWidget::connect(_rightMeta, SIGNAL(stateChanged(int)), this,
 			 SLOT(RMetaChanged(int)));
+	QWidget::connect(_duration, SIGNAL(valueChanged(int)), this,
+			 SLOT(DurationChanged(int)));
+	QWidget::connect(_onlySendToOBS, SIGNAL(stateChanged(int)), this,
+			 SLOT(OnlySendToOBSChanged(int)));
 
 	QHBoxLayout *line1Layout = new QHBoxLayout;
 	std::unordered_map<std::string, QWidget *> widgetPlaceholders = {
 		{"{{keys}}", _keys},
+		{"{{duration}}", _duration},
 	};
 	placeWidgets(obs_module_text("AdvSceneSwitcher.action.hotkey.entry"),
 		     line1Layout, widgetPlaceholders);
@@ -256,11 +461,8 @@ MacroActionHotkeyEdit::MacroActionHotkeyEdit(
 	QVBoxLayout *mainLayout = new QVBoxLayout;
 	mainLayout->addLayout(line1Layout);
 	mainLayout->addLayout(line2Layout);
-
-	if (!canSimulateKeyPresses) {
-		mainLayout->addWidget(new QLabel(obs_module_text(
-			"AdvSceneSwitcher.action.hotkey.disabled")));
-	}
+	mainLayout->addWidget(_onlySendToOBS);
+	mainLayout->addWidget(_noKeyPressSimulationWarning);
 
 	setLayout(mainLayout);
 
@@ -269,6 +471,12 @@ MacroActionHotkeyEdit::MacroActionHotkeyEdit(
 	_loading = false;
 }
 
+void MacroActionHotkeyEdit::SetWarningVisibility()
+{
+	_noKeyPressSimulationWarning->setVisible(!_entryData->_onlySendToObs &&
+						 !canSimulateKeyPresses);
+}
+
 void MacroActionHotkeyEdit::UpdateEntryData()
 {
 	if (!_entryData) {
@@ -284,6 +492,9 @@ void MacroActionHotkeyEdit::UpdateEntryData()
 	_rightAlt->setChecked(_entryData->_rightAlt);
 	_leftMeta->setChecked(_entryData->_leftMeta);
 	_rightMeta->setChecked(_entryData->_rightMeta);
+	_duration->setValue(_entryData->_duration);
+	_onlySendToOBS->setChecked(_entryData->_onlySendToObs);
+	SetWarningVisibility();
 }
 
 void MacroActionHotkeyEdit::LShiftChanged(int state)
@@ -366,6 +577,27 @@ void MacroActionHotkeyEdit::RMetaChanged(int state)
 	_entryData->_rightMeta = state;
 }
 
+void MacroActionHotkeyEdit::DurationChanged(int ms)
+{
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	_entryData->_duration = ms;
+}
+
+void MacroActionHotkeyEdit::OnlySendToOBSChanged(int state)
+{
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	_entryData->_onlySendToObs = state;
+	SetWarningVisibility();
+}
+
 void MacroActionHotkeyEdit::KeyChanged(int key)
 {
 	if (_loading || !_entryData) {

src/macro-action-macro.cpp

@@ -15,6 +15,7 @@ const static std::map<PerformMacroAction, std::string> actionTypes = {
 	 "AdvSceneSwitcher.action.macro.type.unpause"},
 	{PerformMacroAction::RESET_COUNTER,
 	 "AdvSceneSwitcher.action.macro.type.resetCounter"},
+	{PerformMacroAction::RUN, "AdvSceneSwitcher.action.macro.type.run"},
 };
 
 bool MacroActionMacro::PerformAction()
@@ -33,6 +34,9 @@ bool MacroActionMacro::PerformAction()
 	case PerformMacroAction::RESET_COUNTER:
 		_macro->ResetCount();
 		break;
+	case PerformMacroAction::RUN:
+		_macro->PerformAction();
+		break;
 	default:
 		break;
 	}
@@ -55,6 +59,10 @@ void MacroActionMacro::LogAction()
 		vblog(LOG_INFO, "reset counter for \"%s\"",
 		      _macro->Name().c_str());
 		break;
+	case PerformMacroAction::RUN:
+		vblog(LOG_INFO, "run nested macro \"%s\"",
+		      _macro->Name().c_str());
+		break;
 	default:
 		break;
 	}