docs(jsdoc): clean up types for compatability with obs-websocket-js typedef generator

add SetSceneItemOrder from master

.editorconfig

@@ -0,0 +1,9 @@
+[*]
+insert_final_newline = true
+
+[*.{c,cpp,h,hpp}]
+indent_style = tab
+
+[*.{yml,yaml}]
+indent_style = space
+indent_size = 2

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "deps/mbedtls"]
-	path = deps/mbedtls
-	url = https://github.com/ARMmbed/mbedtls

.travis.yml

@@ -32,14 +32,6 @@ matrix:
     after_success:
     - docker exec -it xenial /root/obs-websocket/CI/package-xenial.sh
 
-  - os: osx
-    env: _macos_build
-    osx_image: xcode8.3
-    before_install: "./CI/install-dependencies-macos.sh"
-    script: "./CI/build-macos.sh"
-    after_success: 
-    - ./CI/package-macos.sh
-
 deploy:
 - provider: s3
   region: eu-central-1
@@ -51,19 +43,7 @@ deploy:
   acl: public_read
   on:
     repo: Palakis/obs-websocket
-    condition: 
+    condition:
     - "$TRAVIS_OS_NAME = linux"
     - "-d /home/travis/package"
     all_branches: true
-- provider: s3
-  region: eu-central-1
-  bucket: obs-websocket-osx-builds
-  access_key_id: "$AWS_ID"
-  secret_access_key: "$AWS_SECRET"
-  local_dir: release
-  skip_cleanup: true
-  acl: public_read
-  on:
-    repo: Palakis/obs-websocket
-    condition: "$TRAVIS_OS_NAME = osx"
-    all_branches: true

BUILDING.md

@@ -1,6 +1,9 @@
 # Compiling obs-websocket
 ## Prerequisites
-You'll need [QT 5.9.0](https://download.qt.io/official_releases/qt/5.7/5.7.0/), CMake, and a working development environment for OBS Studio installed on your computer. 
+You'll need [Qt 5.10.x](https://download.qt.io/official_releases/qt/5.10/),
+[CMake](https://cmake.org/download/), and a working [development environment for
+OBS Studio](https://obsproject.com/wiki/install-instructions) installed on your
+computer.
 
 ## Windows
 In cmake-gui, you'll have to set the following variables :
@@ -22,17 +25,31 @@ sudo make install
 ```
 
 ## OS X
-Use of the Travis macOS CI scripts is recommended. Please note that these scripts install new software and can change several settings on your system. An existing obs-studio development environment is not required, as `install-dependencies-macos.sh` will install it for you.
-Of course, you're encouraged to dig through the contents of these scripts to look for issues or specificities.
+As a prerequisite, you will need Xcode for your current OSX version, the command line tools, and [Homebrew](https://brew.sh/).
+Homebrew's setup will guide you in getting your system set up, you should be good to go once Homebrew is successfully up and running.
+
+Use of the Travis macOS CI scripts is recommended. Please note that these
+scripts install new software and can change several settings on your system. An
+existing obs-studio development environment is not required, as
+`install-build-obs-macos.sh` will install it for you. If you already have a
+working obs-studio development environment and have built obs-studio, you can
+skip that script.
+
+Of course, you're encouraged to dig through the contents of these scripts to
+look for issues or specificities.
+
 ```
 git clone --recursive https://github.com/Palakis/obs-websocket.git
 cd obs-websocket
 ./CI/install-dependencies-macos.sh
+./CI/install-build-obs-macos.sh
 ./CI/build-macos.sh
 ./CI/package-macos.sh
 ```
 This will result in a ready-to-use `obs-websocket.pkg` installer in the `release` subfolder.
 
 ## Automated Builds
-- Windows : [![Automated Build status for Windows](https://ci.appveyor.com/api/projects/status/github/Palakis/obs-websocket)](https://ci.appveyor.com/project/Palakis/obs-websocket/history)
-- Linux & OS X : [![Automated Build status for Linux & OS X](https://travis-ci.org/Palakis/obs-websocket.svg?branch=master)](https://travis-ci.org/Palakis/obs-websocket)
+
+- Windows: [![Automated Build status for Windows](https://ci.appveyor.com/api/projects/status/github/Palakis/obs-websocket)](https://ci.appveyor.com/project/Palakis/obs-websocket/history)
+- Linux: [![Automated Build status for Linux](https://travis-ci.org/Palakis/obs-websocket.svg?branch=master)](https://travis-ci.org/Palakis/obs-websocket)
+- macOS: [![Automated Build status for macOS](https://img.shields.io/azure-devops/build/Palakis/obs-websocket/Palakis.obs-websocket.svg)](https://dev.azure.com/Palakis/obs-websocket/_build)

CI/build-macos.sh

@@ -1,13 +1,28 @@
 #!/bin/sh
-set -ex
+
+OSTYPE=$(uname)
+
+if [ "${OSTYPE}" != "Darwin" ]; then
+    echo "[obs-websocket - Error] macOS build script can be run on Darwin-type OS only."
+    exit 1
+fi
+
+HAS_CMAKE=$(type cmake 2>/dev/null)
+
+if [ "${HAS_CMAKE}" = "" ]; then
+    echo "[obs-websocket - Error] CMake not installed - please run 'install-dependencies-macos.sh' first."
+    exit 1
+fi
 
 #export QT_PREFIX="$(find /usr/local/Cellar/qt5 -d 1 | tail -n 1)"
 
-mkdir build && cd build
+echo "[obs-websocket] Building 'obs-websocket' for macOS."
+mkdir -p build && cd build
 cmake .. \
-  -DQTDIR=/usr/local/opt/qt \
-  -DLIBOBS_INCLUDE_DIR=../../obs-studio/libobs \
-  -DLIBOBS_LIB=../../obs-studio/libobs \
-  -DOBS_FRONTEND_LIB="$(pwd)/../../obs-studio/build/UI/obs-frontend-api/libobs-frontend-api.dylib" \
-  -DCMAKE_INSTALL_PREFIX=/usr \
+	-DQTDIR=/usr/local/opt/qt \
+	-DLIBOBS_INCLUDE_DIR=../../obs-studio/libobs \
+	-DLIBOBS_LIB=../../obs-studio/libobs \
+	-DOBS_FRONTEND_LIB="$(pwd)/../../obs-studio/build/UI/obs-frontend-api/libobs-frontend-api.dylib" \
+	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+	-DCMAKE_INSTALL_PREFIX=/usr \
 && make -j4

CI/build-xenial.sh

@@ -4,5 +4,5 @@ set -ex
 cd /root/obs-websocket
 
 mkdir build && cd build
-cmake -DLIBOBS_INCLUDE_DIR="../../obs-studio/libobs" -DCMAKE_INSTALL_PREFIX=/usr ..
+cmake -DCMAKE_INSTALL_PREFIX=/usr ..
 make -j4

CI/generate-docs.sh

@@ -11,13 +11,13 @@ npm run build
 echo "-- Documentation successfully generated."
 
 if git diff --quiet; then
-    echo "-- No documentation changes to commit."
-    exit 0
+	echo "-- No documentation changes to commit."
+	exit 0
 fi
 
-if [ "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_BRANCH" != "master" ]; then
-    echo "-- Skipping documentation deployment because this is either a pull request or a non-master branch."
-    exit 0
+if [ "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_BRANCH" != "4.x-current" ]; then
+	echo "-- Skipping documentation deployment because this is either a pull request or a non-master branch."
+	exit 0
 fi
 
 REMOTE_URL="$(git config remote.origin.url)"

CI/install-build-obs-macos.sh

@@ -0,0 +1,41 @@
+#!/bin/sh
+
+OSTYPE=$(uname)
+
+if [ "${OSTYPE}" != "Darwin" ]; then
+    echo "[obs-websocket - Error] macOS obs-studio build script can be run on Darwin-type OS only."
+    exit 1
+fi
+
+HAS_CMAKE=$(type cmake 2>/dev/null)
+HAS_GIT=$(type git 2>/dev/null)
+
+if [ "${HAS_CMAKE}" = "" ]; then
+    echo "[obs-websocket - Error] CMake not installed - please run 'install-dependencies-macos.sh' first."
+    exit 1
+fi
+
+if [ "${HAS_GIT}" = "" ]; then
+    echo "[obs-websocket - Error] Git not installed - please install Xcode developer tools or via Homebrew."
+    exit 1
+fi
+
+echo "[obs-websocket] Downloading and unpacking OBS dependencies"
+wget --quiet --retry-connrefused --waitretry=1 https://obs-nightly.s3.amazonaws.com/osx-deps-2018-08-09.tar.gz
+tar -xf ./osx-deps-2018-08-09.tar.gz -C /tmp
+
+# Build obs-studio
+cd ..
+echo "[obs-websocket] Cloning obs-studio from GitHub.."
+git clone https://github.com/obsproject/obs-studio
+cd obs-studio
+OBSLatestTag=$(git describe --tags --abbrev=0)
+git checkout $OBSLatestTag
+mkdir build && cd build
+echo "[obs-websocket] Building obs-studio.."
+cmake .. \
+	-DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 \
+	-DDISABLE_PLUGINS=true \
+	-DDepsPath=/tmp/obsdeps \
+	-DCMAKE_PREFIX_PATH=/usr/local/opt/qt/lib/cmake \
+&& make -j4

CI/install-build-obs.cmd

@@ -19,52 +19,63 @@ set "BuildOBS="
 
 REM Check the last tag successfully built by CI.
 if exist C:\projects\obs-studio-last-tag-built.txt (
-  set /p OBSLastTagBuilt=<C:\projects\obs-studio-last-tag-built.txt
+	set /p OBSLastTagBuilt=<C:\projects\obs-studio-last-tag-built.txt
 ) else (
-  set OBSLastTagBuilt=0
+	set OBSLastTagBuilt=0
 )
 
 REM If obs-studio directory exists, run git pull and get the latest tag number.
 if exist C:\projects\obs-studio\ (
-  echo obs-studio directory exists
-  echo   Updating tag info
-  cd C:\projects\obs-studio\
-  git describe --tags --abbrev=0 > C:\projects\latest-obs-studio-tag-pre-pull.txt
-  set /p OBSLatestTagPrePull=<C:\projects\latest-obs-studio-tag-pre-pull.txt
-  git checkout master
-  git pull
-  git describe --tags --abbrev=0 > C:\projects\latest-obs-studio-tag-post-pull.txt
-  set /p OBSLatestTagPostPull=<C:\projects\latest-obs-studio-tag-post-pull.txt
-  set /p OBSLatestTag=<C:\projects\latest-obs-studio-tag-post-pull.txt
-  echo %OBSLatestTagPostPull%> C:\projects\latest-obs-studio-tag.txt
+	echo obs-studio directory exists
+	echo   Updating tag info
+	cd C:\projects\obs-studio\
+	git describe --tags --abbrev=0 > C:\projects\latest-obs-studio-tag-pre-pull.txt
+	set /p OBSLatestTagPrePull=<C:\projects\latest-obs-studio-tag-pre-pull.txt
+	git checkout master
+	git pull
+	git describe --tags --abbrev=0 > C:\projects\latest-obs-studio-tag-post-pull.txt
+	set /p OBSLatestTagPostPull=<C:\projects\latest-obs-studio-tag-post-pull.txt
+	set /p OBSLatestTag=<C:\projects\latest-obs-studio-tag-post-pull.txt
+	echo %OBSLatestTagPostPull%> C:\projects\latest-obs-studio-tag.txt
 )
 
 REM Check the obs-studio tags for mismatches.
 REM If a new tag was pulled, set the build flag.
 if not %OBSLatestTagPrePull%==%OBSLatestTagPostPull% (
-  echo Latest tag pre-pull: %OBSLatestTagPrePull%
-  echo Latest tag post-pull: %OBSLatestTagPostPull%
-  echo Tags do not match.  Need to rebuild OBS.
-  set BuildOBS=true
+	echo Latest tag pre-pull: %OBSLatestTagPrePull%
+	echo Latest tag post-pull: %OBSLatestTagPostPull%
+	echo Tags do not match.  Need to rebuild OBS.
+	set BuildOBS=true
 )
 
 REM If the latest git tag doesn't match the last built tag, set the build flag.
 if not %OBSLatestTagPostPull%==%OBSLastTagBuilt% (
-  echo Last built OBS tag: %OBSLastTagBuilt%
-  echo Latest tag post-pull: %OBSLatestTagPostPull%
-  echo Tags do not match.  Need to rebuild OBS.
-  set BuildOBS=true
+	echo Last built OBS tag: %OBSLastTagBuilt%
+	echo Latest tag post-pull: %OBSLatestTagPostPull%
+	echo Tags do not match.  Need to rebuild OBS.
+	set BuildOBS=true
 )
 
 REM If obs-studio directory does not exist, clone the git repo, get the latest
 REM tag number, and set the build flag.
 if not exist C:\projects\obs-studio (
-  echo obs-studio directory does not exist
-  git clone --recursive https://github.com/jp9000/obs-studio
-  cd C:\projects\obs-studio\
-  git describe --tags --abbrev=0 > C:\projects\obs-studio-latest-tag.txt
-  set /p OBSLatestTag=<C:\projects\obs-studio-latest-tag.txt
-  set BuildOBS=true
+	echo obs-studio directory does not exist
+	git clone https://github.com/obsproject/obs-studio
+	cd C:\projects\obs-studio\
+	git describe --tags --abbrev=0 > C:\projects\obs-studio-latest-tag.txt
+	set /p OBSLatestTag=<C:\projects\obs-studio-latest-tag.txt
+	set BuildOBS=true
+)
+
+REM If the needed obs-studio libs for this build_config do not exist,
+REM set the build flag.
+if not exist C:\projects\obs-studio\build32\libobs\%build_config%\obs.lib (
+	echo obs-studio\build32\libobs\%build_config%\obs.lib does not exist
+	set BuildOBS=true
+)
+if not exist C:\projects\obs-studio\build32\UI\obs-frontend-api\%build_config%\obs-frontend-api.lib (
+	echo obs-studio\build32\UI\obs-frontend-api\%build_config%\obs-frontend-api.lib does not exist
+	set BuildOBS=true
 )
 
 REM Some debug info
@@ -75,44 +86,44 @@ echo Latest tag: %OBSLatestTag%
 echo Last built OBS tag: %OBSLastTagBuilt%
 
 if defined BuildOBS (
-  echo BuildOBS: true
+	echo BuildOBS: true
 ) else (
-  echo BuildOBS: false
+	echo BuildOBS: false
 )
 echo:
 
 REM If the build flag is set, build obs-studio.
 if defined BuildOBS (
-  echo Building obs-studio...
-  echo   git checkout %OBSLatestTag%
-  git checkout %OBSLatestTag%
-  echo:
-  echo   Removing previous build dirs...
-  if exist build rmdir /s /q C:\projects\obs-studio\build
-  if exist build32 rmdir /s /q C:\projects\obs-studio\build32
-  if exist build64 rmdir /s /q C:\projects\obs-studio\build64
-  echo   Making new build dirs...
-  mkdir build
-  mkdir build32
-  mkdir build64
-  echo   Running cmake for obs-studio %OBSLatestTag% 32-bit...
-  cd ./build32
-  cmake -G "Visual Studio 12 2013" -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true ..
-  echo:
-  echo:
-  echo   Running cmake for obs-studio %OBSLatestTag% 64-bit...
-  cd ../build64
-  cmake -G "Visual Studio 12 2013 Win64" -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true ..
-  echo:
-  echo:
-  echo   Building obs-studio %OBSLatestTag% 32-bit ^(Build Config: %build_config%^)...
-  call msbuild /m /p:Configuration=%build_config% C:\projects\obs-studio\build32\obs-studio.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-  echo   Building obs-studio %OBSLatestTag% 64-bit ^(Build Config: %build_config%^)...
-  call msbuild /m /p:Configuration=%build_config% C:\projects\obs-studio\build64\obs-studio.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-  cd ..
-  git describe --tags --abbrev=0 > C:\projects\obs-studio-last-tag-built.txt
-  set /p OBSLastTagBuilt=<C:\projects\obs-studio-last-tag-built.txt
+	echo Building obs-studio...
+	echo   git checkout %OBSLatestTag%
+	git checkout %OBSLatestTag%
+	echo:
+	echo   Removing previous build dirs...
+	if exist build rmdir /s /q C:\projects\obs-studio\build
+	if exist build32 rmdir /s /q C:\projects\obs-studio\build32
+	if exist build64 rmdir /s /q C:\projects\obs-studio\build64
+	echo   Making new build dirs...
+	mkdir build
+	mkdir build32
+	mkdir build64
+	echo   Running cmake for obs-studio %OBSLatestTag% 32-bit...
+	cd ./build32
+	cmake -G "Visual Studio 14 2015" -DDISABLE_PLUGINS=true -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true ..
+	echo:
+	echo:
+	echo   Running cmake for obs-studio %OBSLatestTag% 64-bit...
+	cd ../build64
+	cmake -G "Visual Studio 14 2015 Win64" -DDISABLE_PLUGINS=true -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true ..
+	echo:
+	echo:
+	echo   Building obs-studio %OBSLatestTag% 32-bit ^(Build Config: %build_config%^)...
+	call msbuild /m /p:Configuration=%build_config% C:\projects\obs-studio\build32\obs-studio.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+	echo   Building obs-studio %OBSLatestTag% 64-bit ^(Build Config: %build_config%^)...
+	call msbuild /m /p:Configuration=%build_config% C:\projects\obs-studio\build64\obs-studio.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+	cd ..
+	git describe --tags --abbrev=0 > C:\projects\obs-studio-last-tag-built.txt
+	set /p OBSLastTagBuilt=<C:\projects\obs-studio-last-tag-built.txt
 ) else (
-  echo Last OBS tag built is:  %OBSLastTagBuilt%
-  echo No need to rebuild OBS.
+	echo Last OBS tag built is:  %OBSLastTagBuilt%
+	echo No need to rebuild OBS.
 )

CI/install-dependencies-macos.sh

@@ -1,32 +1,61 @@
 #!/bin/sh
-set -ex
+
+
+
+OSTYPE=$(uname)
+
+if [ "${OSTYPE}" != "Darwin" ]; then
+    echo "[obs-websocket - Error] macOS install dependencies script can be run on Darwin-type OS only."
+    exit 1
+fi
+
+HAS_BREW=$(type brew 2>/dev/null)
+
+if [ "${HAS_BREW}" = "" ]; then
+    echo "[obs-websocket - Error] Please install Homebrew (https://www.brew.sh/) to build obs-websocket on macOS."
+    exit 1
+fi
 
 # OBS Studio deps
-brew update
-brew install ffmpeg
-brew install libav
+echo "[obs-websocket] Updating Homebrew.."
+brew update >/dev/null
+echo "[obs-websocket] Checking installed Homebrew formulas.."
+BREW_PACKAGES=$(brew list)
+BREW_DEPENDENCIES="jack speexdsp ccache swig mbedtls"
+
+for DEPENDENCY in ${BREW_DEPENDENCIES}; do
+    if echo "${BREW_PACKAGES}" | grep -q "^${DEPENDENCY}\$"; then
+        echo "[obs-websocket] Upgrading OBS-Studio dependency '${DEPENDENCY}'.."
+        brew upgrade ${DEPENDENCY} 2>/dev/null
+    else
+        echo "[obs-websocket] Installing OBS-Studio dependency '${DEPENDENCY}'.."
+        brew install ${DEPENDENCY} 2>/dev/null
+    fi
+done
 
 # qtwebsockets deps
-# qt latest
-#brew install qt5
+echo "[obs-websocket] Installing obs-websocket dependency 'QT 5.10.1'.."
+# =!= NOTICE =!=
+# When building QT5 from sources on macOS 10.13+, use local qt5 formula:
+# brew install ./CI/macos/qt.rb
+# Pouring from the bottle is much quicker though, so use bottle for now.
+# =!= NOTICE =!=
 
-# qt 5.9.2
-brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/2b121c9a96e58a5da14228630cb71d5bead7137e/Formula/qt.rb
+brew install https://gist.githubusercontent.com/DDRBoxman/b3956fab6073335a4bf151db0dcbd4ad/raw/ed1342a8a86793ea8c10d8b4d712a654da121ace/qt.rb
 
-#echo "Qt path: $(find /usr/local/Cellar/qt5 -d 1 | tail -n 1)"
+# Pin this version of QT5 to avoid `brew upgrade`
+# upgrading it to incompatible version
+brew pin qt
 
-# Build obs-studio
-cd ..
-git clone --recursive https://github.com/jp9000/obs-studio
-cd obs-studio
-git checkout 21.0.0
-mkdir build && cd build
-cmake .. \
-  -DCMAKE_PREFIX_PATH=/usr/local/opt/qt/lib/cmake \
-&& make -j4
+# Fetch and install Packages app
+# =!= NOTICE =!=
+# Installs a LaunchDaemon under /Library/LaunchDaemons/fr.whitebox.packages.build.dispatcher.plist
+# =!= NOTICE =!=
 
-# Packages app
-cd ..
-curl -L -O  http://s.sudre.free.fr/Software/files/Packages.dmg -f --retry 5 -C -
-hdiutil attach ./Packages.dmg
-sudo installer -pkg /Volumes/Packages\ 1.2.2/packages/Packages.pkg -target /
+HAS_PACKAGES=$(type packagesbuild 2>/dev/null)
+
+if [ "${HAS_PACKAGES}" = "" ]; then
+    echo "[obs-websocket] Installing Packaging app (might require password due to 'sudo').."
+    curl -o './Packages.pkg' --retry-connrefused -s --retry-delay 1 'https://s3-us-west-2.amazonaws.com/obs-nightly/Packages.pkg'
+    sudo installer -pkg ./Packages.pkg -target /
+fi

CI/install-dependencies-xenial.sh

@@ -1,57 +1,19 @@
 #!/bin/sh
 set -ex
 
-# OBS Studio deps
+add-apt-repository -y ppa:obsproject/obs-studio
 apt-get -qq update
-apt-get install -y \
-        libc-dev-bin libc6-dev \
-        git \
-        build-essential
 
 apt-get install -y \
-        build-essential \
-        checkinstall \
-        cmake \
-        libasound2-dev \
-        libavcodec-dev \
-        libavdevice-dev \
-        libavfilter-dev \
-        libavformat-dev \
-        libavutil-dev \
-        libcurl4-openssl-dev \
-        libfontconfig-dev \
-        libfreetype6-dev \
-        libgl1-mesa-dev \
-        libjack-jackd2-dev \
-        libjansson-dev \
-        libpulse-dev \
-        libqt5x11extras5-dev \
-        libspeexdsp-dev \
-        libswresample-dev \
-        libswscale-dev \
-        libudev-dev \
-        libv4l-dev \
-        libvlc-dev \
-        libx11-dev \
-        libx264-dev \
-        libxcb-shm0-dev \
-        libxcb-xinerama0-dev \
-        libxcomposite-dev \
-        libxinerama-dev \
-        pkg-config \
-        qtbase5-dev
+	libc-dev-bin \
+	libc6-dev git \
+	build-essential \
+	checkinstall \
+	cmake \
+	obs-studio \
+	libqt5websockets5-dev
 
-# obs-websocket deps
-apt-get install -y libqt5websockets5-dev
-
-# Build obs-studio
-cd /root
-git clone https://github.com/jp9000/obs-studio ./obs-studio
-cd obs-studio
-git checkout 21.0.0
-mkdir build && cd build
-cmake -DUNIX_STRUCTURE=1 -DCMAKE_INSTALL_PREFIX=/usr ..
-make -j4
-make install
+# Dirty hack
+wget -O /usr/include/obs/obs-frontend-api.h https://raw.githubusercontent.com/obsproject/obs-studio/master/UI/obs-frontend-api/obs-frontend-api.h
 
 ldconfig

CI/install-setup-qt.cmd

@@ -1,20 +1,6 @@
 @echo off
 
 REM Set default values to use AppVeyor's built-in Qt.
-set QTDIR32=C:\Qt\5.7\msvc2013
-set QTDIR64=C:\Qt\5.7\msvc2013_64
-set QTCompileVersion=5.7.1
-
-REM If the AppVeyor cache couldn't recover qt570.7z,
-REM try to fetch Qt 5.7.0 from slepin.fr.
-if not exist qt570.7z (
-  curl -kLO https://www.slepin.fr/obs-plugins/deps/qt570.7z -f --retry 5 -C -
-)
-
-REM If qt570.7z exists now, use that instead of AppVeyor's built-in Qt.
-if exist qt570.7z (
-  7z x qt570.7z -o"Qt5.7.0"
-  set QTDIR32=%CD%\Qt5.7.0\msvc2013
-  set QTDIR64=%CD%\Qt5.7.0\msvc2013_64
-  set QTCompileVersion=5.7.0
-)
+set QTDIR32=C:\Qt\5.10.1\msvc2015
+set QTDIR64=C:\Qt\5.10.1\msvc2015_64
+set QTCompileVersion=5.10.1

CI/macos/obs-websocket.pkgproj

@@ -635,7 +635,7 @@
 			<key>OVERWRITE_PERMISSIONS</key>
 			<false/>
 			<key>VERSION</key>
-			<string>4.3.2</string>
+			<string>4.5.1</string>
 		</dict>
 		<key>PROJECT_COMMENTS</key>
 		<dict>

CI/macos/qt.rb

@@ -0,0 +1,163 @@
+# Patches for Qt must be at the very least submitted to Qt's Gerrit codereview
+# rather than their bug-report Jira. The latter is rarely reviewed by Qt.
+class Qt < Formula
+	desc "Cross-platform application and UI framework"
+	homepage "https://www.qt.io/"
+	url "https://download.qt.io/archive/qt/5.10/5.10.1/single/qt-everywhere-src-5.10.1.tar.xz"
+	mirror "https://mirrorservice.org/sites/download.qt-project.org/official_releases/qt/5.10/5.10.1/single/qt-everywhere-src-5.10.1.tar.xz"
+	sha256 "05ffba7b811b854ed558abf2be2ddbd3bb6ddd0b60ea4b5da75d277ac15e740a"
+	head "https://code.qt.io/qt/qt5.git", :branch => "5.10.1", :shallow => false
+
+	bottle do
+		sha256 "8b4bad005596a5f8790150fe455db998ac2406f4e0f04140d6656205d844d266" => :high_sierra
+		sha256 "9c488554935fb573554a4e36d36d3c81e47245b7fefc4b61edef894e67ba1740" => :sierra
+		sha256 "c0407afba5951df6cc4c6f6c1c315972bd41c99cecb4e029919c4c15ab6f7bdc" => :el_capitan
+	end
+
+	keg_only "Qt 5 has CMake issues when linked"
+
+	option "with-docs", "Build documentation"
+	option "with-examples", "Build examples"
+
+	deprecated_option "with-mysql" => "with-mysql-client"
+
+	# OS X 10.7 Lion is still supported in Qt 5.5, but is no longer a reference
+	# configuration and thus untested in practice. Builds on OS X 10.7 have been
+	# reported to fail: <https://github.com/Homebrew/homebrew/issues/45284>.
+	depends_on :macos => :mountain_lion
+
+	depends_on "pkg-config" => :build
+	depends_on :xcode => :build
+	depends_on "mysql-client" => :optional
+	depends_on "postgresql" => :optional
+
+	# Restore `.pc` files for framework-based build of Qt 5 on OS X. This
+	# partially reverts <https://codereview.qt-project.org/#/c/140954/> merged
+	# between the 5.5.1 and 5.6.0 releases. (Remove this as soon as feasible!)
+	#
+	# Core formulae known to fail without this patch (as of 2016-10-15):
+	#   * gnuplot  (with `--with-qt` option)
+	#   * mkvtoolnix (with `--with-qt` option, silent build failure)
+	#   * poppler    (with `--with-qt` option)
+	patch do
+		url "https://raw.githubusercontent.com/Homebrew/formula-patches/e8fe6567/qt5/restore-pc-files.patch"
+		sha256 "48ff18be2f4050de7288bddbae7f47e949512ac4bcd126c2f504be2ac701158b"
+	end
+
+	# Fix compile error on macOS 10.13 around QFixed:
+	# https://github.com/Homebrew/homebrew-core/issues/27095
+	# https://bugreports.qt.io/browse/QTBUG-67545
+	patch do
+		url "https://raw.githubusercontent.com/z00m1n/formula-patches/0de0e229/qt/QTBUG-67545.patch"
+		sha256 "4a115097c7582c7dce4207f5500d13feb8c990eb8a05a43f41953985976ebe6c"
+	end
+
+	# Fix compile error on macOS 10.13 caused by qtlocation dependency
+	# mapbox-gl-native using Boost 1.62.0 does not build with C++ 17:
+	# https://github.com/Homebrew/homebrew-core/issues/27095
+	# https://bugreports.qt.io/browse/QTBUG-67810
+	patch do
+		url "https://raw.githubusercontent.com/z00m1n/formula-patches/a1a1f0dd/qt/QTBUG-67810.patch"
+		sha256 "8ee0bf71df1043f08ebae3aa35036be29c4d9ebff8a27e3b0411a6bd635e9382"
+	end
+
+	def install
+		args = %W[
+			-verbose
+			-prefix #{prefix}
+			-release
+			-opensource -confirm-license
+			-system-zlib
+			-qt-libpng
+			-qt-libjpeg
+			-qt-freetype
+			-qt-pcre
+			-nomake tests
+			-no-rpath
+			-pkg-config
+			-dbus-runtime
+			-no-assimp
+		]
+
+		args << "-nomake" << "examples" if build.without? "examples"
+
+		if build.with? "mysql-client"
+			args << "-plugin-sql-mysql"
+			(buildpath/"brew_shim/mysql_config").write <<~EOS
+				#!/bin/sh
+				if [ x"$1" = x"--libs" ]; then
+					mysql_config --libs | sed "s/-lssl -lcrypto//"
+				else
+					exec mysql_config "$@"
+				fi
+			EOS
+			chmod 0755, "brew_shim/mysql_config"
+			args << "-mysql_config" << buildpath/"brew_shim/mysql_config"
+		end
+
+		args << "-plugin-sql-psql" if build.with? "postgresql"
+
+		system "./configure", *args
+		system "make"
+		ENV.deparallelize
+		system "make", "install"
+
+		if build.with? "docs"
+			system "make", "docs"
+			system "make", "install_docs"
+		end
+
+		# Some config scripts will only find Qt in a "Frameworks" folder
+		frameworks.install_symlink Dir["#{lib}/*.framework"]
+
+		# The pkg-config files installed suggest that headers can be found in the
+		# `include` directory. Make this so by creating symlinks from `include` to
+		# the Frameworks' Headers folders.
+		Pathname.glob("#{lib}/*.framework/Headers") do |path|
+			include.install_symlink path => path.parent.basename(".framework")
+		end
+
+		# Move `*.app` bundles into `libexec` to expose them to `brew linkapps` and
+		# because we don't like having them in `bin`.
+		# (Note: This move breaks invocation of Assistant via the Help menu
+		# of both Designer and Linguist as that relies on Assistant being in `bin`.)
+		libexec.mkpath
+		Pathname.glob("#{bin}/*.app") { |app| mv app, libexec }
+	end
+
+	def caveats; <<~EOS
+		We agreed to the Qt opensource license for you.
+		If this is unacceptable you should uninstall.
+		EOS
+	end
+
+	test do
+		(testpath/"hello.pro").write <<~EOS
+			QT       += core
+			QT       -= gui
+			TARGET = hello
+			CONFIG   += console
+			CONFIG   -= app_bundle
+			TEMPLATE = app
+			SOURCES += main.cpp
+		EOS
+
+		(testpath/"main.cpp").write <<~EOS
+			#include <QCoreApplication>
+			#include <QDebug>
+
+			int main(int argc, char *argv[])
+			{
+				QCoreApplication a(argc, argv);
+				qDebug() << "Hello World!";
+				return 0;
+			}
+		EOS
+
+		system bin/"qmake", testpath/"hello.pro"
+		system "make"
+		assert_predicate testpath/"hello", :exist?
+		assert_predicate testpath/"main.o", :exist?
+		system "./hello"
+	end
+end

CI/package-macos.sh

@@ -2,44 +2,50 @@
 
 set -e
 
-echo "-- Preparing package build"
-export QT_CELLAR_PREFIX="$(find /usr/local/Cellar/qt -d 1 | tail -n 1)"
+OSTYPE=$(uname)
+
+if [ "${OSTYPE}" != "Darwin" ]; then
+    echo "[obs-websocket - Error] macOS package script can be run on Darwin-type OS only."
+    exit 1
+fi
+
+echo "[obs-websocket] Preparing package build"
+export QT_CELLAR_PREFIX="$(/usr/bin/find /usr/local/Cellar/qt -d 1 | sort -t '.' -k 1,1n -k 2,2n -k 3,3n | tail -n 1)"
 
 export WS_LIB="/usr/local/opt/qt/lib/QtWebSockets.framework/QtWebSockets"
 export NET_LIB="/usr/local/opt/qt/lib/QtNetwork.framework/QtNetwork"
 
 export GIT_HASH=$(git rev-parse --short HEAD)
+export GIT_BRANCH_OR_TAG=$(git name-rev --name-only HEAD | awk -F/ '{print $NF}')
 
-export VERSION="$GIT_HASH-$TRAVIS_BRANCH"
-export LATEST_VERSION="$TRAVIS_BRANCH"
-if [ -n "${TRAVIS_TAG}" ]; then
-	export VERSION="$TRAVIS_TAG"
-	export LATEST_VERSION="$TRAVIS_TAG"
-fi
+export VERSION="$GIT_HASH-$GIT_BRANCH_OR_TAG"
+export LATEST_VERSION="$GIT_BRANCH_OR_TAG"
 
 export FILENAME="obs-websocket-$VERSION.pkg"
 export LATEST_FILENAME="obs-websocket-latest-$LATEST_VERSION.pkg"
 
-echo "-- Copying Qt dependencies"
-cp $WS_LIB ./build
-cp $NET_LIB ./build
+echo "[obs-websocket] Copying Qt dependencies"
+if [ ! -f ./build/$(basename $WS_LIB) ]; then cp $WS_LIB ./build; fi
+if [ ! -f ./build/$(basename $NET_LIB) ]; then cp $NET_LIB ./build; fi
 
 chmod +rw ./build/QtWebSockets ./build/QtNetwork
 
-echo "-- Modifying QtNetwork"
+echo "[obs-websocket] Modifying QtNetwork"
 install_name_tool \
+	-id @rpath/QtNetwork \
 	-change /usr/local/opt/qt/lib/QtNetwork.framework/Versions/5/QtNetwork @rpath/QtNetwork \
 	-change $QT_CELLAR_PREFIX/lib/QtCore.framework/Versions/5/QtCore @rpath/QtCore \
 	./build/QtNetwork
 
-echo "-- Modifying QtWebSockets"
+echo "[obs-websocket] Modifying QtWebSockets"
 install_name_tool \
+	-id @rpath/QtWebSockets \
 	-change /usr/local/opt/qt/lib/QtWebSockets.framework/Versions/5/QtWebSockets @rpath/QtWebSockets \
 	-change $QT_CELLAR_PREFIX/lib/QtNetwork.framework/Versions/5/QtNetwork @rpath/QtNetwork \
 	-change $QT_CELLAR_PREFIX/lib/QtCore.framework/Versions/5/QtCore @rpath/QtCore \
 	./build/QtWebSockets
 
-echo "-- Modifying obs-websocket.so"
+echo "[obs-websocket] Modifying obs-websocket.so"
 install_name_tool \
 	-change /usr/local/opt/qt/lib/QtWebSockets.framework/Versions/5/QtWebSockets @rpath/QtWebSockets \
 	-change /usr/local/opt/qt/lib/QtWidgets.framework/Versions/5/QtWidgets @rpath/QtWidgets \
@@ -49,18 +55,18 @@ install_name_tool \
 	./build/obs-websocket.so
 
 # Check if replacement worked
-echo "-- Dependencies for QtNetwork"
+echo "[obs-websocket] Dependencies for QtNetwork"
 otool -L ./build/QtNetwork
-echo "-- Dependencies for QtWebSockets"
+echo "[obs-websocket] Dependencies for QtWebSockets"
 otool -L ./build/QtWebSockets
-echo "-- Dependencies for obs-websocket"
+echo "[obs-websocket] Dependencies for obs-websocket"
 otool -L ./build/obs-websocket.so
 
 chmod -w ./build/QtWebSockets ./build/QtNetwork
 
-echo "-- Actual package build"
+echo "[obs-websocket] Actual package build"
 packagesbuild ./CI/macos/obs-websocket.pkgproj
 
-echo "-- Renaming obs-websocket.pkg to $FILENAME"
+echo "[obs-websocket] Renaming obs-websocket.pkg to $FILENAME"
 mv ./release/obs-websocket.pkg ./release/$FILENAME
 cp ./release/$FILENAME ./release/$LATEST_FILENAME

CMakeLists.txt

@@ -6,17 +6,16 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTOUIC ON)
 
+if (WIN32 OR APPLE)
 include(external/FindLibObs.cmake)
+endif()
 
 find_package(LibObs REQUIRED)
 find_package(Qt5Core REQUIRED)
 find_package(Qt5WebSockets REQUIRED)
 find_package(Qt5Widgets REQUIRED)
 
-add_subdirectory(deps/mbedtls EXCLUDE_FROM_ALL)
-set(ENABLE_PROGRAMS false)
-
-set(obs-websocket_SOURCES 
+set(obs-websocket_SOURCES
 	src/obs-websocket.cpp
 	src/WSServer.cpp
 	src/WSRequestHandler.cpp
@@ -46,26 +45,21 @@ set(obs-websocket_HEADERS
 	src/forms/settings-dialog.h)
 
 # --- Platform-independent build settings ---
-add_library(obs-websocket MODULE 
+add_library(obs-websocket MODULE
 	${obs-websocket_SOURCES}
 	${obs-websocket_HEADERS})
 
-add_dependencies(obs-websocket mbedcrypto)
-
-include_directories( 
+include_directories(
 	"${LIBOBS_INCLUDE_DIR}/../UI/obs-frontend-api"
 	${Qt5Core_INCLUDES}
 	${Qt5WebSockets_INCLUDES}
-	${Qt5Widgets_INCLUDES}
-	${mbedcrypto_INCLUDES}
-	"${CMAKE_SOURCE_DIR}/deps/mbedtls/include")
+	${Qt5Widgets_INCLUDES})
 
-target_link_libraries(obs-websocket 
+target_link_libraries(obs-websocket
 	libobs
 	Qt5::Core
 	Qt5::WebSockets
-	Qt5::Widgets
-	mbedcrypto)
+	Qt5::Widgets)
 
 # --- End of section ---
 
@@ -73,7 +67,7 @@ target_link_libraries(obs-websocket
 if(WIN32)
 	if(NOT DEFINED OBS_FRONTEND_LIB)
 		set(OBS_FRONTEND_LIB "OBS_FRONTEND_LIB-NOTFOUND" CACHE FILEPATH "OBS frontend library")
-		message(FATAL_ERROR "Could not find OBS Frontend API\'s library !")
+		message(FATAL_ERROR "Could not find OBS Frontend API's library !")
 	endif()
 
 	if(CMAKE_SIZEOF_VOID_P EQUAL 8)
@@ -91,36 +85,45 @@ if(WIN32)
 	target_link_libraries(obs-websocket
 		"${OBS_FRONTEND_LIB}")
 
-	add_custom_command(TARGET obs-websocket POST_BUILD
-		COMMAND if $<CONFIG:Release>==1 ("${CMAKE_COMMAND}" -E copy
-			"${QTDIR}/bin/Qt5WebSockets.dll"
-			"${QTDIR}/bin/Qt5Network.dll"
-			"${CMAKE_BINARY_DIR}/$<CONFIG>")
-
-		COMMAND if $<CONFIG:Debug>==1 ("${CMAKE_COMMAND}" -E copy
-			"${QTDIR}/bin/Qt5WebSocketsd.dll"
-			"${QTDIR}/bin/Qt5Networkd.dll"
-			"${CMAKE_BINARY_DIR}/$<CONFIG>")
-	)
-
 	# --- Release package helper ---
 	# The "release" folder has a structure similar OBS' one on Windows
 	set(RELEASE_DIR "${PROJECT_SOURCE_DIR}/release")
 
 	add_custom_command(TARGET obs-websocket POST_BUILD
+		# If config is Release, package release files
 		COMMAND if $<CONFIG:Release>==1 (
 			"${CMAKE_COMMAND}" -E make_directory
 			"${RELEASE_DIR}/data/obs-plugins/obs-websocket"
 			"${RELEASE_DIR}/obs-plugins/${ARCH_NAME}")
-			
+
 		COMMAND if $<CONFIG:Release>==1 ("${CMAKE_COMMAND}" -E copy_directory
 			"${PROJECT_SOURCE_DIR}/data"
 			"${RELEASE_DIR}/data/obs-plugins/obs-websocket")
 
-		COMMAND if $<CONFIG:Release>==1 ("${CMAKE_COMMAND}" -E copy 
+		COMMAND if $<CONFIG:Release>==1 ("${CMAKE_COMMAND}" -E copy
 			"$<TARGET_FILE:obs-websocket>"
-			"${QTDIR}/bin/Qt5WebSockets.dll" 
-			"${QTDIR}/bin/Qt5Network.dll" 
+			"${QTDIR}/bin/Qt5WebSockets.dll"
+			"${QTDIR}/bin/Qt5Network.dll"
+			"${RELEASE_DIR}/obs-plugins/${ARCH_NAME}")
+
+		# If config is RelWithDebInfo, package release files
+		COMMAND if $<CONFIG:RelWithDebInfo>==1 (
+			"${CMAKE_COMMAND}" -E make_directory
+			"${RELEASE_DIR}/data/obs-plugins/obs-websocket"
+			"${RELEASE_DIR}/obs-plugins/${ARCH_NAME}")
+
+		COMMAND if $<CONFIG:RelWithDebInfo>==1 ("${CMAKE_COMMAND}" -E copy_directory
+			"${PROJECT_SOURCE_DIR}/data"
+			"${RELEASE_DIR}/data/obs-plugins/obs-websocket")
+
+		COMMAND if $<CONFIG:RelWithDebInfo>==1 ("${CMAKE_COMMAND}" -E copy
+			"$<TARGET_FILE:obs-websocket>"
+			"${QTDIR}/bin/Qt5WebSockets.dll"
+			"${QTDIR}/bin/Qt5Network.dll"
+			"${RELEASE_DIR}/obs-plugins/${ARCH_NAME}")
+
+		COMMAND if $<CONFIG:RelWithDebInfo>==1 ("${CMAKE_COMMAND}" -E copy
+			"$<TARGET_PDB_FILE:obs-websocket>"
 			"${RELEASE_DIR}/obs-plugins/${ARCH_NAME}")
 
 		# Copy to obs-studio dev environment for immediate testing
@@ -131,6 +134,11 @@ if(WIN32)
 				"${QTDIR}/bin/Qt5Networkd.dll"
 				"${LIBOBS_INCLUDE_DIR}/../${OBS_BUILDDIR_ARCH}/rundir/$<CONFIG>/obs-plugins/${ARCH_NAME}")
 
+		COMMAND if $<CONFIG:Debug>==1 (
+			"${CMAKE_COMMAND}" -E copy
+				"$<TARGET_PDB_FILE:obs-websocket>"
+				"${LIBOBS_INCLUDE_DIR}/../${OBS_BUILDDIR_ARCH}/rundir/$<CONFIG>/obs-plugins/${ARCH_NAME}")
+
 		COMMAND if $<CONFIG:Debug>==1 (
 			"${CMAKE_COMMAND}" -E make_directory
 				"${LIBOBS_INCLUDE_DIR}/../${OBS_BUILDDIR_ARCH}/rundir/$<CONFIG>/data/obs-plugins/obs-websocket")
@@ -149,15 +157,19 @@ endif()
 if(UNIX AND NOT APPLE)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 
-	target_compile_options(mbedcrypto PRIVATE -fPIC)
 	set_target_properties(obs-websocket PROPERTIES PREFIX "")
 	target_link_libraries(obs-websocket
 		obs-frontend-api)
 
 	file(GLOB locale_files data/locale/*.ini)
+	execute_process(COMMAND uname -m COMMAND tr -d '\n' OUTPUT_VARIABLE UNAME_MACHINE)
 
 	install(TARGETS obs-websocket
 		LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/obs-plugins")
+	# Dirty fix for Ubuntu
+        install(TARGETS obs-websocket
+                LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/${UNAME_MACHINE}-linux-gnu/obs-plugins")
+
 	install(FILES ${locale_files}
 		DESTINATION "${CMAKE_INSTALL_PREFIX}/share/obs/obs-plugins/obs-websocket/locale")
 endif()
@@ -167,6 +179,7 @@ endif()
 if(APPLE)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -fvisibility=default")
 
+	set(CMAKE_SKIP_RPATH TRUE)
 	set_target_properties(obs-websocket PROPERTIES PREFIX "")
 	target_link_libraries(obs-websocket "${OBS_FRONTEND_LIB}")
 endif()

appveyor.yml

@@ -4,20 +4,20 @@ environment:
 install:
   - git submodule update --init --recursive
   - cd C:\projects\
-  - if not exist dependencies2013.zip curl -kLO https://obsproject.com/downloads/dependencies2013.zip -f --retry 5 -C -
-  - 7z x dependencies2013.zip -odependencies2013
-  - set DepsPath32=%CD%\dependencies2013\win32
-  - set DepsPath64=%CD%\dependencies2013\win64
+  - if not exist dependencies2015.zip curl -kLO https://obsproject.com/downloads/dependencies2015.zip -f --retry 5 -C -
+  - 7z x dependencies2015.zip -odependencies2015
+  - set DepsPath32=%CD%\dependencies2015\win32
+  - set DepsPath64=%CD%\dependencies2015\win64
   - call C:\projects\obs-websocket\CI\install-setup-qt.cmd
-  - set build_config=Release
+  - set build_config=RelWithDebInfo
   - call C:\projects\obs-websocket\CI\install-build-obs.cmd
   - cd C:\projects\obs-websocket\
   - mkdir build32
   - mkdir build64
   - cd ./build32
-  - cmake -G "Visual Studio 12 2013" -DQTDIR="%QTDIR32%" -DLibObs_DIR="C:\projects\obs-studio\build32\libobs" -DLIBOBS_INCLUDE_DIR="C:\projects\obs-studio\libobs" -DLIBOBS_LIB="C:\projects\obs-studio\build32\libobs\%build_config%\obs.lib" -DOBS_FRONTEND_LIB="C:\projects\obs-studio\build32\UI\obs-frontend-api\%build_config%\obs-frontend-api.lib" ..
+  - cmake -G "Visual Studio 14 2015" -DQTDIR="%QTDIR32%" -DLibObs_DIR="C:\projects\obs-studio\build32\libobs" -DLIBOBS_INCLUDE_DIR="C:\projects\obs-studio\libobs" -DLIBOBS_LIB="C:\projects\obs-studio\build32\libobs\%build_config%\obs.lib" -DOBS_FRONTEND_LIB="C:\projects\obs-studio\build32\UI\obs-frontend-api\%build_config%\obs-frontend-api.lib" ..
   - cd ../build64
-  - cmake -G "Visual Studio 12 2013 Win64" -DQTDIR="%QTDIR64%" -DLibObs_DIR="C:\projects\obs-studio\build64\libobs" -DLIBOBS_INCLUDE_DIR="C:\projects\obs-studio\libobs" -DLIBOBS_LIB="C:\projects\obs-studio\build64\libobs\%build_config%\obs.lib" -DOBS_FRONTEND_LIB="C:\projects\obs-studio\build64\UI\obs-frontend-api\%build_config%\obs-frontend-api.lib" ..
+  - cmake -G "Visual Studio 14 2015 Win64" -DQTDIR="%QTDIR64%" -DLibObs_DIR="C:\projects\obs-studio\build64\libobs" -DLIBOBS_INCLUDE_DIR="C:\projects\obs-studio\libobs" -DLIBOBS_LIB="C:\projects\obs-studio\build64\libobs\%build_config%\obs.lib" -DOBS_FRONTEND_LIB="C:\projects\obs-studio\build64\UI\obs-frontend-api\%build_config%\obs-frontend-api.lib" ..
 
 build_script:
   - call msbuild /m /p:Configuration=%build_config% C:\projects\obs-websocket\build32\obs-websocket.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
@@ -25,14 +25,16 @@ build_script:
 
 before_deploy:
   - 7z a "C:\projects\obs-websocket\build.zip" C:\projects\obs-websocket\release\*
+  - set PATH=%PATH%;"C:\\Program Files (x86)\\Inno Setup 5"
+  - iscc "C:\projects\obs-websocket\installer\installer.iss"
 
 deploy_script:
-  - ps: Push-AppveyorArtifact "C:\projects\obs-websocket\build.zip" -FileName "obs-websocket-$(git log --pretty=format:'%h' -n 1).zip"
+  - ps: Push-AppveyorArtifact "C:\projects\obs-websocket\build.zip" -FileName "obs-websocket-$(git log --pretty=format:'%h' -n 1)-Windows.zip"
+  - ps: Push-AppveyorArtifact "C:\projects\obs-websocket\installer\Output\obs-websocket-Windows-Installer.exe" -FileName "obs-websocket-$(git log --pretty=format:'%h' -n 1)-Windows-Installer.exe"
 
 test: off
 
 cache:
-  - C:\projects\dependencies2013.zip
-  - C:\projects\qt570.7z
+  - C:\projects\dependencies2015.zip
   - C:\projects\obs-studio-last-tag-built.txt
   - C:\projects\obs-studio\

azure-pipelines.yml

@@ -0,0 +1,20 @@
+pool:
+  vmImage: 'macOS-10.13'
+
+steps:
+- script: ./CI/install-dependencies-macos.sh
+  displayName: 'Install Dependencies'
+
+- script: ./CI/install-build-obs-macos.sh
+  displayName: 'Build OBS'
+
+- script: ./CI/build-macos.sh
+  displayName: 'Build obs-websocket'
+
+- script: ./CI/package-macos.sh
+  displayName: 'Package'
+
+- task: PublishBuildArtifacts@1
+  inputs:
+    pathtoPublish: './release'
+    artifactName: 'build'

docs/comments.js

@@ -30,6 +30,14 @@ const processComments = comments => {
     let errors = [];
 
     comments.forEach(comment => {
+        if (comment.typedef) {
+            comment.comment = undefined;
+            comment.context = undefined;
+            sorted['typedefs'] = sorted['typedefs'] || [];
+            sorted['typedefs'].push(comment);
+            return;
+        }
+
         if (typeof comment.api === 'undefined') return;
         let validationFailures = validateComment(comment);
 
@@ -84,9 +92,7 @@ const validateComment = comment => {
             fullContext: Object.assign({}, comment)
         };
     }
-
-    return;
-}
+};
 
 const files = glob.sync(config.srcGlob);
 const comments = processComments(parseFiles(files));

docs/generated/protocol.md

@@ -1,19 +1,13 @@
 <!-- This file was generated based on handlebars templates. Do not edit directly! -->
 
-# obs-websocket 4.2.1 protocol reference
-
-**This is the reference for the unreleased obs-websocket 4.2.1. See the list below for older versions.**
-- [4.2.0 protocol reference](https://github.com/Palakis/obs-websocket/blob/4.2.0/docs/generated/protocol.md)
-- [4.1.0 protocol reference](https://github.com/Palakis/obs-websocket/blob/4.1.0/PROTOCOL.md)
-- [4.0.0 protocol reference](https://github.com/Palakis/obs-websocket/blob/4.0.0/PROTOCOL.md)
+# obs-websocket 4.5.0 protocol reference
 
 # General Introduction
 Messages are exchanged between the client and the server as JSON objects.
 This protocol is based on the original OBS Remote protocol created by Bill Hamilton, with new commands specific to OBS Studio.
 
-
 # Authentication
-OBSWebSocket uses SHA256 to transmit credentials.
+`obs-websocket` uses SHA256 to transmit credentials.
 
 A request for [`GetAuthRequired`](#getauthrequired) returns two elements:
 - A `challenge`: a random string that will be used to generate the auth response.
@@ -48,6 +42,9 @@ auth_response = base64_encode(auth_response_hash)
 
 <!-- toc -->
 
+- [Typedefs](#typedefs)
+  * [Scene](#scene)
+  * [Source](#source)
 - [Events](#events)
   * [Scenes](#scenes)
     + [SwitchScenes](#switchscenes)
@@ -125,10 +122,13 @@ auth_response = base64_encode(auth_response_hash)
     + [SetSceneItemPosition](#setsceneitemposition)
     + [SetSceneItemTransform](#setsceneitemtransform)
     + [SetSceneItemCrop](#setsceneitemcrop)
+    + [DeleteSceneItem](#deletesceneitem)
+    + [DuplicateSceneItem](#duplicatesceneitem)
   * [Scenes](#scenes-1)
     + [SetCurrentScene](#setcurrentscene)
     + [GetCurrentScene](#getcurrentscene)
     + [GetSceneList](#getscenelist)
+    + [ReorderSceneItems](#reordersceneitems)
   * [Sources](#sources-1)
     + [GetSourcesList](#getsourceslist)
     + [GetSourcesTypesList](#getsourcestypeslist)
@@ -143,9 +143,17 @@ auth_response = base64_encode(auth_response_hash)
     + [SetSourceSettings](#setsourcesettings)
     + [GetTextGDIPlusProperties](#gettextgdiplusproperties)
     + [SetTextGDIPlusProperties](#settextgdiplusproperties)
+    + [GetTextFreetype2Properties](#gettextfreetype2properties)
+    + [SetTextFreetype2Properties](#settextfreetype2properties)
     + [GetBrowserSourceProperties](#getbrowsersourceproperties)
     + [SetBrowserSourceProperties](#setbrowsersourceproperties)
     + [GetSpecialSources](#getspecialsources)
+    + [GetSourceFilters](#getsourcefilters)
+    + [AddFilterToSource](#addfiltertosource)
+    + [RemoveFilterFromSource](#removefilterfromsource)
+    + [ReorderSourceFilter](#reordersourcefilter)
+    + [MoveSourceFilter](#movesourcefilter)
+    + [SetSourceFilterSettings](#setsourcefiltersettings)
   * [Streaming](#streaming-1)
     + [GetStreamingStatus](#getstreamingstatus)
     + [StartStopStreaming](#startstopstreaming)
@@ -171,6 +179,31 @@ auth_response = base64_encode(auth_response_hash)
 
 <!-- tocstop -->
 
+# Typedefs
+These are complex types, such as `Source` and `Scene`, which are used as arguments or return values in multiple requests and/or events. 
+
+
+## Scene
+| Name | Type  | Description |
+| ---- | :---: | ------------|
+| `name` | _String_ | Name of the currently active scene. |
+| `sources` | _Array&lt;Source&gt;_ | Ordered list of the current scene's source items. |
+## Source
+| Name | Type  | Description |
+| ---- | :---: | ------------|
+| `cy` | _Number_ |  |
+| `cx` | _Number_ |  |
+| `name` | _String_ | The name of this Scene Item. |
+| `render` | _Boolean_ | Whether or not this Scene Item is set to "visible". |
+| `source_cx` | _Number_ |  |
+| `source_cy` | _Number_ |  |
+| `type` | _String_ | Source type. Value is one of the following: "input", "filter", "transition", "scene" or "unknown" |
+| `volume` | _Number_ |  |
+| `x` | _Number_ |  |
+| `y` | _Number_ |  |
+
+
+
 # Events
 Events are broadcast by the server to each connected client when a recognized action occurs within OBS.
 
@@ -198,7 +231,7 @@ Indicates a scene change.
 | Name | Type  | Description |
 | ---- | :---: | ------------|
 | `scene-name` | _String_ | The new scene. |
-| `sources` | _Array_ | List of sources in the new scene. |
+| `sources` | _Array&lt;Source&gt;_ | List of sources in the new scene. Same specification as [`GetCurrentScene`](#getcurrentscene). |
 
 
 ---
@@ -304,6 +337,8 @@ A transition (other than "cut") has begun.
 | ---- | :---: | ------------|
 | `name` | _String_ | Transition name. |
 | `duration` | _int_ | Transition duration (in milliseconds). |
+| `from-scene` | _String_ | Source scene of the transition |
+| `to-scene` | _String_ | Destination scene of the transition |
 
 
 ---
@@ -508,7 +543,7 @@ _No additional response items._
 
 - Added in v4.2.0
 
-A request to start the replay buffer has been issued.
+A request to stop the replay buffer has been issued.
 
 **Response Items:**
 
@@ -557,7 +592,7 @@ Emitted every 2 seconds after enabling it by calling SetHeartbeat.
 
 | Name | Type  | Description |
 | ---- | :---: | ------------|
-| `pulse` | _boolean_ | Toggles between every JSON meassage as an "I am alive" indicator. |
+| `pulse` | _boolean_ | Toggles between every JSON message as an "I am alive" indicator. |
 | `current-profile` | _string (optional)_ | Current active profile. |
 | `current-scene` | _string (optional)_ | Current active scene. |
 | `streaming` | _boolean (optional)_ | Current streaming state. |
@@ -656,7 +691,7 @@ The selected preview scene has changed (only available in Studio Mode).
 | Name | Type  | Description |
 | ---- | :---: | ------------|
 | `scene-name` | _String_ | Name of the scene being previewed. |
-| `sources` | _Source\|Array_ | List of sources composing the scene. Same specification as [`GetCurrentScene`](#getcurrentscene). |
+| `sources` | _Array&lt;Source&gt;_ | List of sources composing the scene. Same specification as [`GetCurrentScene`](#getcurrentscene). |
 
 
 ---
@@ -878,7 +913,7 @@ _No specified parameters._
 
 | Name | Type  | Description |
 | ---- | :---: | ------------|
-| `profiles` | _Object\|Array_ | List of available profiles. |
+| `profiles` | _Array&lt;Object&gt;_ | List of available profiles. |
 
 
 ---
@@ -1112,8 +1147,7 @@ _No specified parameters._
 
 | Name | Type  | Description |
 | ---- | :---: | ------------|
-| `scene-collections` | _Object\|Array_ | Scene collections list |
-| `scene-collections.*.` | _String_ |  |
+| `scene-collections` | _Array&lt;String&gt;_ | Scene collections list |
 
 
 ---
@@ -1206,7 +1240,7 @@ Reset a scene item.
 
 | Name | Type  | Description |
 | ---- | :---: | ------------|
-| `scene-name` | _String (optional)_ | Name of the scene the source belogns to. Defaults to the current scene. |
+| `scene-name` | _String (optional)_ | Name of the scene the source belongs to. Defaults to the current scene. |
 | `item` | _String_ | Name of the source item. |
 
 
@@ -1312,6 +1346,59 @@ Sets the crop coordinates of the specified source item.
 
 _No additional response items._
 
+---
+
+### DeleteSceneItem
+
+
+- Added in v4.5.0
+
+Deletes a scene item.
+
+**Request Fields:**
+
+| Name | Type  | Description |
+| ---- | :---: | ------------|
+| `scene` | _String (optional)_ | Name of the scene the source belongs to. Defaults to the current scene. |
+| `item` | _Object_ | item to delete (required) |
+| `item.name` | _String_ | name of the scene item (prefer `id`, including both is acceptable). |
+| `item.id` | _int_ | id of the scene item. |
+
+
+**Response Items:**
+
+_No additional response items._
+
+---
+
+### DuplicateSceneItem
+
+
+- Added in v4.5.0
+
+Duplicates a scene item.
+
+**Request Fields:**
+
+| Name | Type  | Description |
+| ---- | :---: | ------------|
+| `fromScene` | _String (optional)_ | Name of the scene to copy the item from. Defaults to the current scene. |
+| `toScene` | _String (optional)_ | Name of the scene to create the item in. Defaults to the current scene. |
+| `item` | _Object_ | item to duplicate (required) |
+| `item.name` | _String_ | name of the scene item (prefer `id`, including both is acceptable). |
+| `item.id` | _int_ | id of the scene item. |
+
+
+**Response Items:**
+
+| Name | Type  | Description |
+| ---- | :---: | ------------|
+| `scene` | _String_ | Name of the scene where the new item was created |
+| `item` | _Object_ | New item info |
+| `̀item.id` | _int_ | New item ID |
+| `item.name` | _String_ | New item name |
+
+
 ---
 
 ## Scenes
@@ -1352,7 +1439,7 @@ _No specified parameters._
 | Name | Type  | Description |
 | ---- | :---: | ------------|
 | `name` | _String_ | Name of the currently active scene. |
-| `sources` | _Source\|Array_ | Ordered list of the current scene's source items. |
+| `sources` | _Array&lt;Source&gt;_ | Ordered list of the current scene's source items. |
 
 
 ---
@@ -1373,9 +1460,32 @@ _No specified parameters._
 | Name | Type  | Description |
 | ---- | :---: | ------------|
 | `current-scene` | _String_ | Name of the currently active scene. |
-| `scenes` | _Scene\|Array_ | Ordered list of the current profile's scenes (See `[GetCurrentScene](#getcurrentscene)` for more information). |
+| `scenes` | _Array&lt;Scene&gt;_ | Ordered list of the current profile's scenes (See `[GetCurrentScene](#getcurrentscene)` for more information). |
 
 
+---
+
+### ReorderSceneItems
+
+
+- Added in v4.5.0
+
+Changes the order of scene items in the requested scene.
+
+**Request Fields:**
+
+| Name | Type  | Description |
+| ---- | :---: | ------------|
+| `scene` | _String (optional)_ | Name of the scene to reorder (defaults to current). |
+| `items` | _Array&lt;Scene&gt;_ | Ordered list of objects with name and/or id specified. Id preferred due to uniqueness per scene |
+| `items[].id` | _int (optional)_ | Id of a specific scene item. Unique on a scene by scene basis. |
+| `items[].name` | _String (optional)_ | Name of a scene item. Sufficiently unique if no scene items share sources within the scene. |
+
+
+**Response Items:**
+
+_No additional response items._
+
 ---
 
 ## Sources
@@ -1395,7 +1505,7 @@ _No specified parameters._
 
 | Name | Type  | Description |
 | ---- | :---: | ------------|
-| `sources` | _Array of Objects_ | Array of sources as objects |
+| `sources` | _Array&lt;Object&gt;_ | Array of sources |
 | `sources.*.name` | _String_ | Unique source name |
 | `sources.*.typeId` | _String_ | Non-unique source internal type (a.k.a type id) |
 | `sources.*.type` | _String_ | Source type. Value is one of the following: "input", "filter", "transition", "scene" or "unknown" |
@@ -1418,7 +1528,7 @@ _No specified parameters._
 
 | Name | Type  | Description |
 | ---- | :---: | ------------|
-| `ids` | _Array of Objects_ | Array of sources as objects |
+| `ids` | _Array&lt;Object&gt;_ | Array of source types |
 | `ids.*.typeId` | _String_ | Non-unique internal source type ID |
 | `ids.*.displayName` | _String_ | Display name of the source type |
 | `ids.*.type` | _String_ | Type. Value is one of the following: "input", "filter", "transition" or "other" |
@@ -1446,16 +1556,16 @@ Get the volume of the specified source.
 
 | Name | Type  | Description |
 | ---- | :---: | ------------|
-| `source` | _String_ | Name of the source. |
+| `source` | _String_ | Source name. |
 
 
 **Response Items:**
 
 | Name | Type  | Description |
 | ---- | :---: | ------------|
-| `name` | _String_ | Name of the source. |
+| `name` | _String_ | Source name. |
 | `volume` | _double_ | Volume of the source. Between `0.0` and `1.0`. |
-| `mute` | _boolean_ | Indicates whether the source is muted. |
+| `muted` | _boolean_ | Indicates whether the source is muted. |
 
 
 ---
@@ -1471,7 +1581,7 @@ Set the volume of the specified source.
 
 | Name | Type  | Description |
 | ---- | :---: | ------------|
-| `source` | _String_ | Name of the source. |
+| `source` | _String_ | Source name. |
 | `volume` | _double_ | Desired volume. Must be between `0.0` and `1.0`. |
 
 
@@ -1492,14 +1602,14 @@ Get the mute status of a specified source.
 
 | Name | Type  | Description |
 | ---- | :---: | ------------|
-| `source` | _String_ | The name of the source. |
+| `source` | _String_ | Source name. |
 
 
 **Response Items:**
 
 | Name | Type  | Description |
 | ---- | :---: | ------------|
-| `name` | _String_ | The name of the source. |
+| `name` | _String_ | Source name. |
 | `muted` | _boolean_ | Mute status of the source. |
 
 
@@ -1516,7 +1626,7 @@ Sets the mute status of a specified source.
 
 | Name | Type  | Description |
 | ---- | :---: | ------------|
-| `source` | _String_ | The name of the source. |
+| `source` | _String_ | Source name. |
 | `mute` | _boolean_ | Desired mute status. |
 
 
@@ -1537,7 +1647,7 @@ Inverts the mute status of a specified source.
 
 | Name | Type  | Description |
 | ---- | :---: | ------------|
-| `source` | _String_ | The name of the source. |
+| `source` | _String_ | Source name. |
 
 
 **Response Items:**
@@ -1557,7 +1667,7 @@ Set the audio sync offset of a specified source.
 
 | Name | Type  | Description |
 | ---- | :---: | ------------|
-| `source` | _String_ | The name of the source. |
+| `source` | _String_ | Source name. |
 | `offset` | _int_ | The desired audio sync offset (in nanoseconds). |
 
 
@@ -1578,14 +1688,14 @@ Get the audio sync offset of a specified source.
 
 | Name | Type  | Description |
 | ---- | :---: | ------------|
-| `source` | _String_ | The name of the source. |
+| `source` | _String_ | Source name. |
 
 
 **Response Items:**
 
 | Name | Type  | Description |
 | ---- | :---: | ------------|
-| `name` | _String_ | The name of the source. |
+| `name` | _String_ | Source name. |
 | `offset` | _int_ | The audio sync offset (in nanoseconds). |
 
 
@@ -1602,7 +1712,7 @@ Get settings of the specified source
 
 | Name | Type  | Description |
 | ---- | :---: | ------------|
-| `sourceName` | _String_ | Name of the source item. |
+| `sourceName` | _String_ | Source name. |
 | `sourceType` | _String (optional)_ | Type of the specified source. Useful for type-checking if you expect a specific settings schema. |
 
 
@@ -1612,7 +1722,7 @@ Get settings of the specified source
 | ---- | :---: | ------------|
 | `sourceName` | _String_ | Source name |
 | `sourceType` | _String_ | Type of the specified source |
-| `sourceSettings` | _Object_ | Source settings. Varying between source types. |
+| `sourceSettings` | _Object_ | Source settings (varies between source types, may require some probing around). |
 
 
 ---
@@ -1628,9 +1738,9 @@ Set settings of the specified source.
 
 | Name | Type  | Description |
 | ---- | :---: | ------------|
-| `sourceName` | _String_ | Name of the source item. |
+| `sourceName` | _String_ | Source name. |
 | `sourceType` | _String (optional)_ | Type of the specified source. Useful for type-checking to avoid settings a set of settings incompatible with the actual source's type. |
-| `sourceSettings` | _Object_ | Source settings. Varying between source types. |
+| `sourceSettings` | _Object_ | Source settings (varies between source types, may require some probing around). |
 
 
 **Response Items:**
@@ -1639,7 +1749,7 @@ Set settings of the specified source.
 | ---- | :---: | ------------|
 | `sourceName` | _String_ | Source name |
 | `sourceType` | _String_ | Type of the specified source |
-| `sourceSettings` | _Object_ | Source settings. Varying between source types. |
+| `sourceSettings` | _Object_ | Updated source settings |
 
 
 ---
@@ -1655,14 +1765,14 @@ Get the current properties of a Text GDI Plus source.
 
 | Name | Type  | Description |
 | ---- | :---: | ------------|
-| `scene-name` | _String (optional)_ | Name of the scene to retrieve. Defaults to the current scene. |
-| `source` | _String_ | Name of the source. |
+| `source` | _String_ | Source name. |
 
 
 **Response Items:**
 
 | Name | Type  | Description |
 | ---- | :---: | ------------|
+| `source` | _String_ | Source name. |
 | `align` | _String_ | Text Alignment ("left", "center", "right"). |
 | `bk-color` | _int_ | Background color. |
 | `bk-opacity` | _int_ | Background opacity (0-100). |
@@ -1690,7 +1800,6 @@ Get the current properties of a Text GDI Plus source.
 | `text` | _String_ | Text content to be displayed. |
 | `valign` | _String_ | Text vertical alignment ("top", "center", "bottom"). |
 | `vertical` | _boolean_ | Vertical text enabled. |
-| `render` | _boolean_ | Visibility of the scene item. |
 
 
 ---
@@ -1700,13 +1809,12 @@ Get the current properties of a Text GDI Plus source.
 
 - Added in v4.1.0
 
-Get the current properties of a Text GDI Plus source.
+Set the current properties of a Text GDI Plus source.
 
 **Request Fields:**
 
 | Name | Type  | Description |
 | ---- | :---: | ------------|
-| `scene-name` | _String (optional)_ | Name of the scene to retrieve. Defaults to the current scene. |
 | `source` | _String_ | Name of the source. |
 | `align` | _String (optional)_ | Text Alignment ("left", "center", "right"). |
 | `bk-color` | _int (optional)_ | Background color. |
@@ -1738,6 +1846,79 @@ Get the current properties of a Text GDI Plus source.
 | `render` | _boolean (optional)_ | Visibility of the scene item. |
 
 
+**Response Items:**
+
+_No additional response items._
+
+---
+
+### GetTextFreetype2Properties
+
+
+- Added in v4.5.0
+
+Get the current properties of a Text Freetype 2 source.
+
+**Request Fields:**
+
+| Name | Type  | Description |
+| ---- | :---: | ------------|
+| `source` | _String_ | Source name. |
+
+
+**Response Items:**
+
+| Name | Type  | Description |
+| ---- | :---: | ------------|
+| `source` | _String_ | Source name |
+| `color1` | _int_ | Gradient top color. |
+| `color2` | _int_ | Gradient bottom color. |
+| `custom_width` | _int_ | Custom width (0 to disable). |
+| `drop_shadow` | _boolean_ | Drop shadow. |
+| `font` | _Object_ | Holds data for the font. Ex: `"font": { "face": "Arial", "flags": 0, "size": 150, "style": "" }` |
+| `font.face` | _String_ | Font face. |
+| `font.flags` | _int_ | Font text styling flag. `Bold=1, Italic=2, Bold Italic=3, Underline=5, Strikeout=8` |
+| `font.size` | _int_ | Font text size. |
+| `font.style` | _String_ | Font Style (unknown function). |
+| `from_file` | _boolean_ | Read text from the specified file. |
+| `log_mode` | _boolean_ | Chat log. |
+| `outline` | _boolean_ | Outline. |
+| `text` | _String_ | Text content to be displayed. |
+| `text_file` | _String_ | File path. |
+| `word_wrap` | _boolean_ | Word wrap. |
+
+
+---
+
+### SetTextFreetype2Properties
+
+
+- Added in v4.5.0
+
+Set the current properties of a Text Freetype 2 source.
+
+**Request Fields:**
+
+| Name | Type  | Description |
+| ---- | :---: | ------------|
+| `source` | _String_ | Source name. |
+| `color1` | _int (optional)_ | Gradient top color. |
+| `color2` | _int (optional)_ | Gradient bottom color. |
+| `custom_width` | _int (optional)_ | Custom width (0 to disable). |
+| `drop_shadow` | _boolean (optional)_ | Drop shadow. |
+| `font` | _Object (optional)_ | Holds data for the font. Ex: `"font": { "face": "Arial", "flags": 0, "size": 150, "style": "" }` |
+| `font.face` | _String (optional)_ | Font face. |
+| `font.flags` | _int (optional)_ | Font text styling flag. `Bold=1, Italic=2, Bold Italic=3, Underline=5, Strikeout=8` |
+| `font.size` | _int (optional)_ | Font text size. |
+| `font.style` | _String (optional)_ | Font Style (unknown function). |
+| `from_file` | _boolean (optional)_ | Read text from the specified file. |
+| `log_mode` | _boolean (optional)_ | Chat log. |
+| `outline` | _boolean (optional)_ | Outline. |
+| `text` | _String (optional)_ | Text content to be displayed. |
+| `text_file` | _String (optional)_ | File path. |
+| `word_wrap` | _boolean (optional)_ | Word wrap. |
+
+
 **Response Items:**
 
 _No additional response items._
@@ -1755,14 +1936,14 @@ Get current properties for a Browser Source.
 
 | Name | Type  | Description |
 | ---- | :---: | ------------|
-| `scene-name` | _String (optional)_ | Name of the scene that the source belongs to. Defaults to the current scene. |
-| `source` | _String_ | Name of the source. |
+| `source` | _String_ | Source name. |
 
 
 **Response Items:**
 
 | Name | Type  | Description |
 | ---- | :---: | ------------|
+| `source` | _String_ | Source name. |
 | `is_local_file` | _boolean_ | Indicates that a local file is in use. |
 | `local_file` | _String_ | file path. |
 | `url` | _String_ | Url. |
@@ -1771,7 +1952,6 @@ Get current properties for a Browser Source.
 | `height` | _int_ | Height. |
 | `fps` | _int_ | Framerate. |
 | `shutdown` | _boolean_ | Indicates whether the source should be shutdown when not visible. |
-| `render` | _boolean (optional)_ | Visibility of the scene item. |
 
 
 ---
@@ -1787,7 +1967,6 @@ Set current properties for a Browser Source.
 
 | Name | Type  | Description |
 | ---- | :---: | ------------|
-| `scene-name` | _String (optional)_ | Name of the scene that the source belongs to. Defaults to the current scene. |
 | `source` | _String_ | Name of the source. |
 | `is_local_file` | _boolean (optional)_ | Indicates that a local file is in use. |
 | `local_file` | _String (optional)_ | file path. |
@@ -1828,6 +2007,142 @@ _No specified parameters._
 | `mic-3` | _String (optional)_ | NAme of the third Mic/Aux input source. |
 
 
+---
+
+### GetSourceFilters
+
+
+- Added in v4.5.0
+
+List filters applied to a source
+
+**Request Fields:**
+
+| Name | Type  | Description |
+| ---- | :---: | ------------|
+| `sourceName` | _String_ | Source name |
+
+
+**Response Items:**
+
+| Name | Type  | Description |
+| ---- | :---: | ------------|
+| `filters` | _Array&lt;Object&gt;_ | List of filters for the specified source |
+| `filters.*.type` | _String_ | Filter type |
+| `filters.*.name` | _String_ | Filter name |
+| `filters.*.settings` | _Object_ | Filter settings |
+
+
+---
+
+### AddFilterToSource
+
+
+- Added in v4.5.0
+
+Add a new filter to a source. Available source types along with their settings properties are available from `GetSourceTypesList`.
+
+**Request Fields:**
+
+| Name | Type  | Description |
+| ---- | :---: | ------------|
+| `sourceName` | _String_ | Name of the source on which the filter is added |
+| `filterName` | _String_ | Name of the new filter |
+| `filterType` | _String_ | Filter type |
+| `filterSettings` | _Object_ | Filter settings |
+
+
+**Response Items:**
+
+_No additional response items._
+
+---
+
+### RemoveFilterFromSource
+
+
+- Added in v4.5.0
+
+Remove a filter from a source
+
+**Request Fields:**
+
+| Name | Type  | Description |
+| ---- | :---: | ------------|
+| `sourceName` | _String_ | Name of the source from which the specified filter is removed |
+| `filterName` | _String_ | Name of the filter to remove |
+
+
+**Response Items:**
+
+_No additional response items._
+
+---
+
+### ReorderSourceFilter
+
+
+- Added in v4.5.0
+
+Move a filter in the chain (absolute index positioning)
+
+**Request Fields:**
+
+| Name | Type  | Description |
+| ---- | :---: | ------------|
+| `sourceName` | _String_ | Name of the source to which the filter belongs |
+| `filterName` | _String_ | Name of the filter to reorder |
+| `newIndex` | _Integer_ | Desired position of the filter in the chain |
+
+
+**Response Items:**
+
+_No additional response items._
+
+---
+
+### MoveSourceFilter
+
+
+- Added in v4.5.0
+
+Move a filter in the chain (relative positioning)
+
+**Request Fields:**
+
+| Name | Type  | Description |
+| ---- | :---: | ------------|
+| `sourceName` | _String_ | Name of the source to which the filter belongs |
+| `filterName` | _String_ | Name of the filter to reorder |
+| `movementType` | _String_ | How to move the filter around in the source's filter chain. Either "up", "down", "top" or "bottom". |
+
+
+**Response Items:**
+
+_No additional response items._
+
+---
+
+### SetSourceFilterSettings
+
+
+- Added in v4.5.0
+
+Update settings of a filter
+
+**Request Fields:**
+
+| Name | Type  | Description |
+| ---- | :---: | ------------|
+| `sourceName` | _String_ | Name of the source to which the filter belongs |
+| `filterName` | _String_ | Name of the filter to reconfigure |
+| `filterSettings` | _Object_ | New settings. These will be merged to the current filter settings. |
+
+
+**Response Items:**
+
+_No additional response items._
+
 ---
 
 ## Streaming
@@ -1966,7 +2281,7 @@ _No specified parameters._
 | `settings` | _Object_ | Stream settings object. |
 | `settings.server` | _String_ | The publish URL. |
 | `settings.key` | _String_ | The publish key of the stream. |
-| `settings.use-auth` | _boolean_ | Indicates whether audentication should be used when connecting to the streaming server. |
+| `settings.use-auth` | _boolean_ | Indicates whether authentication should be used when connecting to the streaming server. |
 | `settings.username` | _String_ | The username to use when accessing the streaming server. Only present if `use-auth` is `true`. |
 | `settings.password` | _String_ | The password to use when accessing the streaming server. Only present if `use-auth` is `true`. |
 
@@ -2029,7 +2344,7 @@ _No specified parameters._
 | Name | Type  | Description |
 | ---- | :---: | ------------|
 | `name` | _String_ | The name of the active preview scene. |
-| `sources` | _Source\|Array_ |  |
+| `sources` | _Array&lt;Source&gt;_ |  |
 
 
 ---
@@ -2147,8 +2462,8 @@ _No specified parameters._
 | Name | Type  | Description |
 | ---- | :---: | ------------|
 | `current-transition` | _String_ | Name of the currently active transition. |
-| `transitions` | _Object\|Array_ | List of transitions. |
-| `transitions[].name` | _String_ | Name of the transition. |
+| `transitions` | _Array&lt;Object&gt;_ | List of transitions. |
+| `transitions.*.name` | _String_ | Name of the transition. |
 
 
 ---

docs/partials/introduction.md

@@ -1,12 +1,11 @@
-# obs-websocket 4.3.2 protocol reference
+# obs-websocket 4.5.0 protocol reference
 
 # General Introduction
 Messages are exchanged between the client and the server as JSON objects.
 This protocol is based on the original OBS Remote protocol created by Bill Hamilton, with new commands specific to OBS Studio.
 
-
 # Authentication
-OBSWebSocket uses SHA256 to transmit credentials.
+`obs-websocket` uses SHA256 to transmit credentials.
 
 A request for [`GetAuthRequired`](#getauthrequired) returns two elements:
 - A `challenge`: a random string that will be used to generate the auth response.

docs/partials/typedefsHeader.md

@@ -0,0 +1,2 @@
+# Typedefs
+These are complex types, such as `Source` and `Scene`, which are used as arguments or return values in multiple requests and/or events. 

docs/protocol.hbs

@@ -7,6 +7,19 @@
 
 
 
+{{#read "partials/typedefsHeader.md"}}{{/read}}
+
+{{#each typedefs}}
+## {{typedefs.0.name}}
+| Name | Type  | Description |
+| ---- | :---: | ------------|
+{{#each properties}}
+| `{{name}}` | _{{depipe type}}_ | {{{depipe description}}} |
+{{/each}}
+{{/each}}
+
+
+
 {{#read "partials/eventsHeader.md"}}{{/read}}
 
 {{#each events}}

installer/installer.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "obs-websocket"
-#define MyAppVersion "4.3.2"
+#define MyAppVersion "4.5.1"
 #define MyAppPublisher "Stephane Lepin"
 #define MyAppURL "http://github.com/Palakis/obs-websocket"
 
@@ -20,7 +20,7 @@ AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
 DefaultDirName={code:GetDirName}
 DefaultGroupName={#MyAppName}
-OutputBaseFilename=obs-websocket-{#MyAppVersion}-Windows-Installer
+OutputBaseFilename=obs-websocket-Windows-Installer
 Compression=lzma
 SolidCompression=yes
 LicenseFile=..\LICENSE
@@ -42,13 +42,13 @@ Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
 // following function come from https://github.com/Xaymar/obs-studio_amf-encoder-plugin/blob/master/%23Resources/Installer.in.iss#L45
 function GetDirName(Value: string): string;
 var
-  InstallPath: string;
+	InstallPath: string;
 begin
-  // initialize default path, which will be returned when the following registry
-  // key queries fail due to missing keys or for some different reason
-  Result := '{pf}\obs-studio';
-  // query the first registry value; if this succeeds, return the obtained value
-  if RegQueryStringValue(HKLM32, 'SOFTWARE\OBS Studio', '', InstallPath) then
-    Result := InstallPath
+	// initialize default path, which will be returned when the following registry
+	// key queries fail due to missing keys or for some different reason
+	Result := '{pf}\obs-studio';
+	// query the first registry value; if this succeeds, return the obtained value
+	if RegQueryStringValue(HKLM32, 'SOFTWARE\OBS Studio', '', InstallPath) then
+		Result := InstallPath
 end;
 

src/Config.cpp

@@ -16,11 +16,11 @@ You should have received a copy of the GNU General Public License along
 with this program. If not, see <https://www.gnu.org/licenses/>
 */
 
-#include <mbedtls/base64.h>
-#include <mbedtls/sha256.h>
 #include <obs-frontend-api.h>
 #include <util/config-file.h>
-#include <string>
+
+#include <QCryptographicHash>
+#include <QTime>
 
 #define SECTION_NAME "WebsocketAPI"
 #define PARAM_ENABLE "ServerEnabled"
@@ -39,158 +39,148 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 Config* Config::_instance = new Config();
 
 Config::Config() :
-    ServerEnabled(true),
-    ServerPort(4444),
-    DebugEnabled(false),
-    AlertsEnabled(true),
-    AuthRequired(false),
-    Secret(""),
-    Salt(""),
-    SettingsLoaded(false)
+	ServerEnabled(true),
+	ServerPort(4444),
+	DebugEnabled(false),
+	AlertsEnabled(true),
+	AuthRequired(false),
+	Secret(""),
+	Salt(""),
+	SettingsLoaded(false)
 {
-    // OBS Config defaults
-    config_t* obsConfig = obs_frontend_get_global_config();
-    if (obsConfig) {
-        config_set_default_bool(obsConfig,
-            SECTION_NAME, PARAM_ENABLE, ServerEnabled);
-        config_set_default_uint(obsConfig,
-            SECTION_NAME, PARAM_PORT, ServerPort);
+	qsrand(QTime::currentTime().msec());
 
-        config_set_default_bool(obsConfig,
-            SECTION_NAME, PARAM_DEBUG, DebugEnabled);
-        config_set_default_bool(obsConfig,
-            SECTION_NAME, PARAM_ALERT, AlertsEnabled);
+	// OBS Config defaults
+	config_t* obsConfig = obs_frontend_get_global_config();
+	if (obsConfig) {
+		config_set_default_bool(obsConfig,
+			SECTION_NAME, PARAM_ENABLE, ServerEnabled);
+		config_set_default_uint(obsConfig,
+			SECTION_NAME, PARAM_PORT, ServerPort);
 
-        config_set_default_bool(obsConfig,
-            SECTION_NAME, PARAM_AUTHREQUIRED, AuthRequired);
-        config_set_default_string(obsConfig,
-            SECTION_NAME, PARAM_SECRET, QT_TO_UTF8(Secret));
-        config_set_default_string(obsConfig,
-            SECTION_NAME, PARAM_SALT, QT_TO_UTF8(Salt));
-    }
+		config_set_default_bool(obsConfig,
+			SECTION_NAME, PARAM_DEBUG, DebugEnabled);
+		config_set_default_bool(obsConfig,
+			SECTION_NAME, PARAM_ALERT, AlertsEnabled);
 
-    mbedtls_entropy_init(&entropy);
-    mbedtls_ctr_drbg_init(&rng);
-    mbedtls_ctr_drbg_seed(&rng, mbedtls_entropy_func, &entropy, nullptr, 0);
+		config_set_default_bool(obsConfig,
+			SECTION_NAME, PARAM_AUTHREQUIRED, AuthRequired);
+		config_set_default_string(obsConfig,
+			SECTION_NAME, PARAM_SECRET, QT_TO_UTF8(Secret));
+		config_set_default_string(obsConfig,
+			SECTION_NAME, PARAM_SALT, QT_TO_UTF8(Salt));
+	}
 
-    SessionChallenge = GenerateSalt();
+	SessionChallenge = GenerateSalt();
 }
 
-Config::~Config() {
-    mbedtls_ctr_drbg_free(&rng);
-    mbedtls_entropy_free(&entropy);
+Config::~Config()
+{
 }
 
-void Config::Load() {
-    config_t* obsConfig = obs_frontend_get_global_config();
+void Config::Load()
+{
+	config_t* obsConfig = obs_frontend_get_global_config();
 
-    ServerEnabled = config_get_bool(obsConfig, SECTION_NAME, PARAM_ENABLE);
-    ServerPort = config_get_uint(obsConfig, SECTION_NAME, PARAM_PORT);
+	ServerEnabled = config_get_bool(obsConfig, SECTION_NAME, PARAM_ENABLE);
+	ServerPort = config_get_uint(obsConfig, SECTION_NAME, PARAM_PORT);
 
-    DebugEnabled = config_get_bool(obsConfig, SECTION_NAME, PARAM_DEBUG);
-    AlertsEnabled = config_get_bool(obsConfig, SECTION_NAME, PARAM_ALERT);
+	DebugEnabled = config_get_bool(obsConfig, SECTION_NAME, PARAM_DEBUG);
+	AlertsEnabled = config_get_bool(obsConfig, SECTION_NAME, PARAM_ALERT);
 
-    AuthRequired = config_get_bool(obsConfig, SECTION_NAME, PARAM_AUTHREQUIRED);
-    Secret = config_get_string(obsConfig, SECTION_NAME, PARAM_SECRET);
-    Salt = config_get_string(obsConfig, SECTION_NAME, PARAM_SALT);
+	AuthRequired = config_get_bool(obsConfig, SECTION_NAME, PARAM_AUTHREQUIRED);
+	Secret = config_get_string(obsConfig, SECTION_NAME, PARAM_SECRET);
+	Salt = config_get_string(obsConfig, SECTION_NAME, PARAM_SALT);
 }
 
-void Config::Save() {
-    config_t* obsConfig = obs_frontend_get_global_config();
+void Config::Save() 
+{
+	config_t* obsConfig = obs_frontend_get_global_config();
 
-    config_set_bool(obsConfig, SECTION_NAME, PARAM_ENABLE, ServerEnabled);
-    config_set_uint(obsConfig, SECTION_NAME, PARAM_PORT, ServerPort);
+	config_set_bool(obsConfig, SECTION_NAME, PARAM_ENABLE, ServerEnabled);
+	config_set_uint(obsConfig, SECTION_NAME, PARAM_PORT, ServerPort);
 
-    config_set_bool(obsConfig, SECTION_NAME, PARAM_DEBUG, DebugEnabled);
-    config_set_bool(obsConfig, SECTION_NAME, PARAM_ALERT, AlertsEnabled);
+	config_set_bool(obsConfig, SECTION_NAME, PARAM_DEBUG, DebugEnabled);
+	config_set_bool(obsConfig, SECTION_NAME, PARAM_ALERT, AlertsEnabled);
 
-    config_set_bool(obsConfig, SECTION_NAME, PARAM_AUTHREQUIRED, AuthRequired);
-    config_set_string(obsConfig, SECTION_NAME, PARAM_SECRET,
-        QT_TO_UTF8(Secret));
-    config_set_string(obsConfig, SECTION_NAME, PARAM_SALT,
-        QT_TO_UTF8(Salt));
+	config_set_bool(obsConfig, SECTION_NAME, PARAM_AUTHREQUIRED, AuthRequired);
+	config_set_string(obsConfig, SECTION_NAME, PARAM_SECRET,
+		QT_TO_UTF8(Secret));
+	config_set_string(obsConfig, SECTION_NAME, PARAM_SALT,
+		QT_TO_UTF8(Salt));
 
-    config_save(obsConfig);
+	config_save(obsConfig);
 }
 
-QString Config::GenerateSalt() {
-    // Generate 32 random chars
-    unsigned char* randomChars = (unsigned char*)bzalloc(32);
-    mbedtls_ctr_drbg_random(&rng, randomChars, 32);
+QString Config::GenerateSalt()
+{
+	// Generate 32 random chars
+	const size_t randomCount = 32;
+	QByteArray randomChars;
+	for (size_t i = 0; i < randomCount; i++) {
+		randomChars.append((char)qrand());
+	}
 
-    // Convert the 32 random chars to a base64 string
-    char* salt = (char*)bzalloc(64);
-    size_t saltBytes;
-    mbedtls_base64_encode(
-        (unsigned char*)salt, 64, &saltBytes,
-        randomChars, 32);
+	// Convert the 32 random chars to a base64 string
+	QString salt = randomChars.toBase64();
 
-    bfree(randomChars);
-    return salt;
+	return salt;
 }
 
-QString Config::GenerateSecret(QString password, QString salt) {
-    // Concatenate the password and the salt
-    QString passAndSalt = "";
-    passAndSalt += password;
-    passAndSalt += salt;
+QString Config::GenerateSecret(QString password, QString salt)
+{
+	// Concatenate the password and the salt
+	QString passAndSalt = "";
+	passAndSalt += password;
+	passAndSalt += salt;
 
-    // Generate a SHA256 hash of the password
-    unsigned char* challengeHash = (unsigned char*)bzalloc(32);
-    mbedtls_sha256(
-        (unsigned char*)passAndSalt.toUtf8().constData(), passAndSalt.length(),
-        challengeHash, 0);
+	// Generate a SHA256 hash of the password and salt
+	auto challengeHash = QCryptographicHash::hash(
+		passAndSalt.toUtf8(),
+		QCryptographicHash::Algorithm::Sha256
+	);
 
-    // Encode SHA256 hash to Base64
-    char* challenge = (char*)bzalloc(64);
-    size_t challengeBytes = 0;
-    mbedtls_base64_encode(
-        (unsigned char*)challenge, 64, &challengeBytes,
-        challengeHash, 32);
+	// Encode SHA256 hash to Base64
+	QString challenge = challengeHash.toBase64();
 
-    bfree(challengeHash);
-    return challenge;
+	return challenge;
 }
 
-void Config::SetPassword(QString password) {
-    QString newSalt = GenerateSalt();
-    QString newChallenge = GenerateSecret(password, newSalt);
+void Config::SetPassword(QString password)
+{
+	QString newSalt = GenerateSalt();
+	QString newChallenge = GenerateSecret(password, newSalt);
 
-    this->Salt = newSalt;
-    this->Secret = newChallenge;
+	this->Salt = newSalt;
+	this->Secret = newChallenge;
 }
 
-bool Config::CheckAuth(QString response) {
-    // Concatenate auth secret with the challenge sent to the user
-    QString challengeAndResponse = "";
-    challengeAndResponse += Secret;
-    challengeAndResponse += SessionChallenge;
+bool Config::CheckAuth(QString response)
+{
+	// Concatenate auth secret with the challenge sent to the user
+	QString challengeAndResponse = "";
+	challengeAndResponse += Secret;
+	challengeAndResponse += SessionChallenge;
 
-    // Generate a SHA256 hash of challengeAndResponse
-    unsigned char* hash = (unsigned char*)bzalloc(32);
-    mbedtls_sha256(
-        (unsigned char*)challengeAndResponse.toUtf8().constData(),
-        challengeAndResponse.length(),
-        hash, 0);
+	// Generate a SHA256 hash of challengeAndResponse
+	auto hash = QCryptographicHash::hash(
+		challengeAndResponse.toUtf8(),
+		QCryptographicHash::Algorithm::Sha256
+	);
 
-    // Encode the SHA256 hash to Base64
-    char* expectedResponse = (char*)bzalloc(64);
-    size_t base64_size = 0;
-    mbedtls_base64_encode(
-        (unsigned char*)expectedResponse, 64, &base64_size,
-        hash, 32);
+	// Encode the SHA256 hash to Base64
+	QString expectedResponse = hash.toBase64();
 
-    bool authSuccess = false;
-    if (response == QString(expectedResponse)) {
-        SessionChallenge = GenerateSalt();
-        authSuccess = true;
-    }
+	bool authSuccess = false;
+	if (response == expectedResponse) {
+		SessionChallenge = GenerateSalt();
+		authSuccess = true;
+	}
 
-    bfree(hash);
-    bfree(expectedResponse);
-    return authSuccess;
+	return authSuccess;
 }
 
-Config* Config::Current() {
-    return _instance;
+Config* Config::Current()
+{
+	return _instance;
 }

src/Config.h

@@ -21,40 +21,35 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 #include <QString>
 
-#include <mbedtls/entropy.h>
-#include <mbedtls/ctr_drbg.h>
-
 class Config {
-  public:
-    Config();
-    ~Config();
-    void Load();
-    void Save();
+	public:
+		Config();
+		~Config();
+		void Load();
+		void Save();
 
-    void SetPassword(QString password);
-    bool CheckAuth(QString userChallenge);
-    QString GenerateSalt();
-    static QString GenerateSecret(
-        QString password, QString salt);
+		void SetPassword(QString password);
+		bool CheckAuth(QString userChallenge);
+		QString GenerateSalt();
+		static QString GenerateSecret(
+				QString password, QString salt);
 
-    bool ServerEnabled;
-    uint64_t ServerPort;
+		bool ServerEnabled;
+		uint64_t ServerPort;
 
-    bool DebugEnabled;
-    bool AlertsEnabled;
+		bool DebugEnabled;
+		bool AlertsEnabled;
 
-    bool AuthRequired;
-    QString Secret;
-    QString Salt;
-    QString SessionChallenge;
-    bool SettingsLoaded;
+		bool AuthRequired;
+		QString Secret;
+		QString Salt;
+		QString SessionChallenge;
+		bool SettingsLoaded;
 
-    static Config* Current();
+		static Config* Current();
 
-  private:
-    static Config* _instance;
-    mbedtls_entropy_context entropy;
-    mbedtls_ctr_drbg_context rng;
+	private:
+		static Config* _instance;
 };
 
-#endif // CONFIG_H
+#endif // CONFIG_H

src/Utils.cpp

@@ -29,487 +29,536 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 Q_DECLARE_METATYPE(OBSScene);
 
 obs_data_array_t* Utils::StringListToArray(char** strings, char* key) {
-    if (!strings)
-        return obs_data_array_create();
+	if (!strings)
+		return obs_data_array_create();
 
-    obs_data_array_t* list = obs_data_array_create();
+	obs_data_array_t* list = obs_data_array_create();
 
-    char* value = "";
-    for (int i = 0; value != nullptr; i++) {
-        value = strings[i];
+	char* value = "";
+	for (int i = 0; value != nullptr; i++) {
+		value = strings[i];
 
-        OBSDataAutoRelease item = obs_data_create();
-        obs_data_set_string(item, key, value);
+		OBSDataAutoRelease item = obs_data_create();
+		obs_data_set_string(item, key, value);
 
-        if (value)
-            obs_data_array_push_back(list, item);
-    }
+		if (value)
+			obs_data_array_push_back(list, item);
+	}
 
-    return list;
+	return list;
 }
 
 obs_data_array_t* Utils::GetSceneItems(obs_source_t* source) {
-    obs_data_array_t* items = obs_data_array_create();
-    OBSScene scene = obs_scene_from_source(source);
+	obs_data_array_t* items = obs_data_array_create();
+	OBSScene scene = obs_scene_from_source(source);
 
-    if (!scene)
-        return nullptr;
+	if (!scene)
+		return nullptr;
 
-    obs_scene_enum_items(scene, [](
-            obs_scene_t* scene,
-            obs_sceneitem_t* currentItem,
-            void* param)
-    {
-        obs_data_array_t* data = static_cast<obs_data_array_t*>(param);
+	obs_scene_enum_items(scene, [](
+			obs_scene_t* scene,
+			obs_sceneitem_t* currentItem,
+			void* param)
+	{
+		obs_data_array_t* data = static_cast<obs_data_array_t*>(param);
 
-        OBSDataAutoRelease itemData = GetSceneItemData(currentItem);
-        obs_data_array_insert(data, 0, itemData);
-        return true;
-    }, items);
+		OBSDataAutoRelease itemData = GetSceneItemData(currentItem);
+		obs_data_array_insert(data, 0, itemData);
+		return true;
+	}, items);
 
-    return items;
+	return items;
 }
 
 obs_data_t* Utils::GetSceneItemData(obs_sceneitem_t* item) {
-    if (!item)
-        return nullptr;
+	if (!item)
+		return nullptr;
 
-    vec2 pos;
-    obs_sceneitem_get_pos(item, &pos);
+	vec2 pos;
+	obs_sceneitem_get_pos(item, &pos);
 
-    vec2 scale;
-    obs_sceneitem_get_scale(item, &scale);
+	vec2 scale;
+	obs_sceneitem_get_scale(item, &scale);
 
-    // obs_sceneitem_get_source doesn't increase the refcount
-    OBSSource itemSource = obs_sceneitem_get_source(item);
-    float item_width = float(obs_source_get_width(itemSource));
-    float item_height = float(obs_source_get_height(itemSource));
+	// obs_sceneitem_get_source doesn't increase the refcount
+	OBSSource itemSource = obs_sceneitem_get_source(item);
+	float item_width = float(obs_source_get_width(itemSource));
+	float item_height = float(obs_source_get_height(itemSource));
 
-    obs_data_t* data = obs_data_create();
-    obs_data_set_string(data, "name",
-        obs_source_get_name(obs_sceneitem_get_source(item)));
-    obs_data_set_string(data, "type",
-        obs_source_get_id(obs_sceneitem_get_source(item)));
-    obs_data_set_double(data, "volume",
-        obs_source_get_volume(obs_sceneitem_get_source(item)));
-    obs_data_set_double(data, "x", pos.x);
-    obs_data_set_double(data, "y", pos.y);
-    obs_data_set_int(data, "source_cx", (int)item_width);
-    obs_data_set_int(data, "source_cy", (int)item_height);
-    obs_data_set_double(data, "cx", item_width*  scale.x);
-    obs_data_set_double(data, "cy", item_height*  scale.y);
-    obs_data_set_bool(data, "render", obs_sceneitem_visible(item));
+	obs_data_t* data = obs_data_create();
+	obs_data_set_string(data, "name",
+		obs_source_get_name(obs_sceneitem_get_source(item)));
+	obs_data_set_string(data, "type",
+		obs_source_get_id(obs_sceneitem_get_source(item)));
+	obs_data_set_double(data, "volume",
+		obs_source_get_volume(obs_sceneitem_get_source(item)));
+	obs_data_set_double(data, "x", pos.x);
+	obs_data_set_double(data, "y", pos.y);
+	obs_data_set_int(data, "source_cx", (int)item_width);
+	obs_data_set_int(data, "source_cy", (int)item_height);
+	obs_data_set_double(data, "cx", item_width*  scale.x);
+	obs_data_set_double(data, "cy", item_height*  scale.y);
+	obs_data_set_bool(data, "render", obs_sceneitem_visible(item));
 
-    return data;
+	return data;
+}
+
+obs_sceneitem_t* Utils::GetSceneItemFromItem(obs_source_t* source, obs_data_t* item) {
+        OBSSceneItem sceneItem;
+        if (obs_data_has_user_value(item, "id")) {
+                sceneItem = GetSceneItemFromId(source, obs_data_get_int(item, "id"));
+                if (obs_data_has_user_value(item, "name") &&
+                   (QString)obs_source_get_name(obs_sceneitem_get_source(sceneItem)) !=
+                   (QString)obs_data_get_string(item, "name")) {
+                        return nullptr; 
+                }
+        }
+        else if (obs_data_has_user_value(item, "name")) {
+                sceneItem = GetSceneItemFromName(source, obs_data_get_string(item, "name"));
+        }
+        return sceneItem;
 }
 
 obs_sceneitem_t* Utils::GetSceneItemFromName(obs_source_t* source, QString name) {
-    struct current_search {
-        QString query;
-        obs_sceneitem_t* result;
-    };
+	struct current_search {
+		QString query;
+		obs_sceneitem_t* result;
+	};
 
-    current_search search;
-    search.query = name;
-    search.result = nullptr;
+	current_search search;
+	search.query = name;
+	search.result = nullptr;
 
-    OBSScene scene = obs_scene_from_source(source);
-    if (!scene)
-        return nullptr;
+	OBSScene scene = obs_scene_from_source(source);
+	if (!scene)
+		return nullptr;
 
-    obs_scene_enum_items(scene, [](
-            obs_scene_t* scene,
-            obs_sceneitem_t* currentItem,
-            void* param)
-    {
-        current_search* search = static_cast<current_search*>(param);
+	obs_scene_enum_items(scene, [](
+			obs_scene_t* scene,
+			obs_sceneitem_t* currentItem,
+			void* param)
+	{
+		current_search* search = static_cast<current_search*>(param);
 
-        QString currentItemName =
-            obs_source_get_name(obs_sceneitem_get_source(currentItem));
+		QString currentItemName =
+			obs_source_get_name(obs_sceneitem_get_source(currentItem));
 
-        if (currentItemName == search->query) {
-            search->result = currentItem;
-            obs_sceneitem_addref(search->result);
-            return false;
-        }
+		if (currentItemName == search->query) {
+			search->result = currentItem;
+			obs_sceneitem_addref(search->result);
+			return false;
+		}
 
-        return true;
-    }, &search);
+		return true;
+	}, &search);
 
-    return search.result;
+	return search.result;
+}
+
+obs_sceneitem_t* Utils::GetSceneItemFromId(obs_source_t* source, size_t id) {
+	struct current_search {
+		size_t query;
+		obs_sceneitem_t* result;
+	};
+
+	current_search search;
+	search.query = id;
+	search.result = nullptr;
+
+	OBSScene scene = obs_scene_from_source(source);
+	if (!scene)
+		return nullptr;
+
+	obs_scene_enum_items(scene, [](
+			obs_scene_t* scene,
+			obs_sceneitem_t* currentItem,
+			void* param)
+	{
+		current_search* search = static_cast<current_search*>(param);
+
+		if (obs_sceneitem_get_id(currentItem) == search->query) {
+			search->result = currentItem;
+			obs_sceneitem_addref(search->result);
+			return false;
+		}
+
+		return true;
+	}, &search);
+
+	return search.result;
 }
 
 bool Utils::IsValidAlignment(const uint32_t alignment) {
-    switch (alignment) {
-        case OBS_ALIGN_CENTER:
-        case OBS_ALIGN_LEFT:
-        case OBS_ALIGN_RIGHT:
-        case OBS_ALIGN_TOP:
-        case OBS_ALIGN_BOTTOM:
-        case OBS_ALIGN_TOP | OBS_ALIGN_LEFT:
-        case OBS_ALIGN_TOP | OBS_ALIGN_RIGHT:
-        case OBS_ALIGN_BOTTOM | OBS_ALIGN_LEFT:
-        case OBS_ALIGN_BOTTOM | OBS_ALIGN_RIGHT: {
-            return true;
-        }
-    }
-    return false;
+	switch (alignment) {
+		case OBS_ALIGN_CENTER:
+		case OBS_ALIGN_LEFT:
+		case OBS_ALIGN_RIGHT:
+		case OBS_ALIGN_TOP:
+		case OBS_ALIGN_BOTTOM:
+		case OBS_ALIGN_TOP | OBS_ALIGN_LEFT:
+		case OBS_ALIGN_TOP | OBS_ALIGN_RIGHT:
+		case OBS_ALIGN_BOTTOM | OBS_ALIGN_LEFT:
+		case OBS_ALIGN_BOTTOM | OBS_ALIGN_RIGHT: {
+			return true;
+		}
+	}
+	return false;
 }
 
 obs_source_t* Utils::GetTransitionFromName(QString searchName) {
-    obs_source_t* foundTransition = nullptr;
+	obs_source_t* foundTransition = nullptr;
 
-    obs_frontend_source_list transition_list = {};
-    obs_frontend_get_transitions(&transition_list);
+	obs_frontend_source_list transition_list = {};
+	obs_frontend_get_transitions(&transition_list);
 
-    for (size_t i = 0; i < transition_list.sources.num; i++) {
-        obs_source_t* transition = transition_list.sources.array[i];
-        QString transitionName = obs_source_get_name(transition);
+	for (size_t i = 0; i < transition_list.sources.num; i++) {
+		obs_source_t* transition = transition_list.sources.array[i];
+		QString transitionName = obs_source_get_name(transition);
 
-        if (transitionName == searchName) {
-            foundTransition = transition;
-            obs_source_addref(foundTransition);
-            break;
-        }
-    }
+		if (transitionName == searchName) {
+			foundTransition = transition;
+			obs_source_addref(foundTransition);
+			break;
+		}
+	}
 
-    obs_frontend_source_list_free(&transition_list);
-    return foundTransition;
+	obs_frontend_source_list_free(&transition_list);
+	return foundTransition;
 }
 
 obs_source_t* Utils::GetSceneFromNameOrCurrent(QString sceneName) {
-    // Both obs_frontend_get_current_scene() and obs_get_source_by_name()
-    // do addref on the return source, so no need to use an OBSSource helper
-    obs_source_t* scene = nullptr;
+	// Both obs_frontend_get_current_scene() and obs_get_source_by_name()
+	// do addref on the return source, so no need to use an OBSSource helper
+	obs_source_t* scene = nullptr;
 
-    if (sceneName.isEmpty() || sceneName.isNull())
-        scene = obs_frontend_get_current_scene();
-    else
-        scene = obs_get_source_by_name(sceneName.toUtf8());
+	if (sceneName.isEmpty() || sceneName.isNull())
+		scene = obs_frontend_get_current_scene();
+	else
+		scene = obs_get_source_by_name(sceneName.toUtf8());
 
-    return scene;
+	return scene;
 }
 
 obs_data_array_t* Utils::GetScenes() {
-    obs_frontend_source_list sceneList = {};
-    obs_frontend_get_scenes(&sceneList);
+	obs_frontend_source_list sceneList = {};
+	obs_frontend_get_scenes(&sceneList);
 
-    obs_data_array_t* scenes = obs_data_array_create();
-    for (size_t i = 0; i < sceneList.sources.num; i++) {
-        obs_source_t* scene = sceneList.sources.array[i];
-        OBSDataAutoRelease sceneData = GetSceneData(scene);
-        obs_data_array_push_back(scenes, sceneData);
-    }
+	obs_data_array_t* scenes = obs_data_array_create();
+	for (size_t i = 0; i < sceneList.sources.num; i++) {
+		obs_source_t* scene = sceneList.sources.array[i];
+		OBSDataAutoRelease sceneData = GetSceneData(scene);
+		obs_data_array_push_back(scenes, sceneData);
+	}
 
-    obs_frontend_source_list_free(&sceneList);
-    return scenes;
+	obs_frontend_source_list_free(&sceneList);
+	return scenes;
 }
 
 obs_data_t* Utils::GetSceneData(obs_source_t* source) {
-    OBSDataArrayAutoRelease sceneItems = GetSceneItems(source);
+	OBSDataArrayAutoRelease sceneItems = GetSceneItems(source);
 
-    obs_data_t* sceneData = obs_data_create();
-    obs_data_set_string(sceneData, "name", obs_source_get_name(source));
-    obs_data_set_array(sceneData, "sources", sceneItems);
+	obs_data_t* sceneData = obs_data_create();
+	obs_data_set_string(sceneData, "name", obs_source_get_name(source));
+	obs_data_set_array(sceneData, "sources", sceneItems);
 
-    return sceneData;
+	return sceneData;
 }
 
 QSpinBox* Utils::GetTransitionDurationControl() {
-    QMainWindow* window = (QMainWindow*)obs_frontend_get_main_window();
-    return window->findChild<QSpinBox*>("transitionDuration");
+	QMainWindow* window = (QMainWindow*)obs_frontend_get_main_window();
+	return window->findChild<QSpinBox*>("transitionDuration");
 }
 
 int Utils::GetTransitionDuration() {
-    QSpinBox* control = GetTransitionDurationControl();
-    if (control)
-        return control->value();
-    else
-        return -1;
+	QSpinBox* control = GetTransitionDurationControl();
+	if (control)
+		return control->value();
+	else
+		return -1;
 }
 
 void Utils::SetTransitionDuration(int ms) {
-    QSpinBox* control = GetTransitionDurationControl();
-    if (control && ms >= 0)
-        control->setValue(ms);
+	QSpinBox* control = GetTransitionDurationControl();
+	if (control && ms >= 0)
+		control->setValue(ms);
 }
 
 bool Utils::SetTransitionByName(QString transitionName) {
-    OBSSourceAutoRelease transition = GetTransitionFromName(transitionName);
+	OBSSourceAutoRelease transition = GetTransitionFromName(transitionName);
 
-    if (transition) {
-        obs_frontend_set_current_transition(transition);
-        return true;
-    } else {
-        return false;
-    }
+	if (transition) {
+		obs_frontend_set_current_transition(transition);
+		return true;
+	} else {
+		return false;
+	}
 }
 
 QPushButton* Utils::GetPreviewModeButtonControl() {
-    QMainWindow* main = (QMainWindow*)obs_frontend_get_main_window();
-    return main->findChild<QPushButton*>("modeSwitch");
+	QMainWindow* main = (QMainWindow*)obs_frontend_get_main_window();
+	return main->findChild<QPushButton*>("modeSwitch");
 }
 
 QListWidget* Utils::GetSceneListControl() {
-    QMainWindow* main = (QMainWindow*)obs_frontend_get_main_window();
-    return main->findChild<QListWidget*>("scenes");
+	QMainWindow* main = (QMainWindow*)obs_frontend_get_main_window();
+	return main->findChild<QListWidget*>("scenes");
 }
 
 obs_scene_t* Utils::SceneListItemToScene(QListWidgetItem* item) {
-    if (!item)
-        return nullptr;
+	if (!item)
+		return nullptr;
 
-    QVariant itemData = item->data(static_cast<int>(Qt::UserRole));
-    return itemData.value<OBSScene>();
+	QVariant itemData = item->data(static_cast<int>(Qt::UserRole));
+	return itemData.value<OBSScene>();
 }
 
 QLayout* Utils::GetPreviewLayout() {
-    QMainWindow* main = (QMainWindow*)obs_frontend_get_main_window();
-    return main->findChild<QLayout*>("previewLayout");
+	QMainWindow* main = (QMainWindow*)obs_frontend_get_main_window();
+	return main->findChild<QLayout*>("previewLayout");
 }
 
 void Utils::TransitionToProgram() {
-    if (!obs_frontend_preview_program_mode_active())
-        return;
+	if (!obs_frontend_preview_program_mode_active())
+		return;
 
-    // WARNING : if the layout created in OBS' CreateProgramOptions() changes
-    // then this won't work as expected
+	// WARNING : if the layout created in OBS' CreateProgramOptions() changes
+	// then this won't work as expected
 
-    QMainWindow* main = (QMainWindow*)obs_frontend_get_main_window();
+	QMainWindow* main = (QMainWindow*)obs_frontend_get_main_window();
 
-    // The program options widget is the second item in the left-to-right layout
-    QWidget* programOptions = GetPreviewLayout()->itemAt(1)->widget();
+	// The program options widget is the second item in the left-to-right layout
+	QWidget* programOptions = GetPreviewLayout()->itemAt(1)->widget();
 
-    // The "Transition" button lies in the mainButtonLayout
-    // which is the first itemin the program options' layout
-    QLayout* mainButtonLayout = programOptions->layout()->itemAt(1)->layout();
-    QWidget* transitionBtnWidget = mainButtonLayout->itemAt(0)->widget();
+	// The "Transition" button lies in the mainButtonLayout
+	// which is the first itemin the program options' layout
+	QLayout* mainButtonLayout = programOptions->layout()->itemAt(1)->layout();
+	QWidget* transitionBtnWidget = mainButtonLayout->itemAt(0)->widget();
 
-    // Try to cast that widget into a button
-    QPushButton* transitionBtn = qobject_cast<QPushButton*>(transitionBtnWidget);
+	// Try to cast that widget into a button
+	QPushButton* transitionBtn = qobject_cast<QPushButton*>(transitionBtnWidget);
 
-    // Perform a click on that button
-    transitionBtn->click();
+	// Perform a click on that button
+	transitionBtn->click();
 }
 
 QString Utils::OBSVersionString() {
-    uint32_t version = obs_get_version();
+	uint32_t version = obs_get_version();
 
-    uint8_t major, minor, patch;
-    major = (version >> 24) & 0xFF;
-    minor = (version >> 16) & 0xFF;
-    patch = version & 0xFF;
+	uint8_t major, minor, patch;
+	major = (version >> 24) & 0xFF;
+	minor = (version >> 16) & 0xFF;
+	patch = version & 0xFF;
 
-    QString result = QString("%1.%2.%3")
-        .arg(major).arg(minor).arg(patch);
+	QString result = QString("%1.%2.%3")
+		.arg(major).arg(minor).arg(patch);
 
-    return result;
+	return result;
 }
 
 QSystemTrayIcon* Utils::GetTrayIcon() {
-    QMainWindow* main = (QMainWindow*)obs_frontend_get_main_window();
-    if (!main) return nullptr;
+	QMainWindow* main = (QMainWindow*)obs_frontend_get_main_window();
+	if (!main) return nullptr;
 
-    return main->findChildren<QSystemTrayIcon*>().first();
+	return main->findChildren<QSystemTrayIcon*>().first();
 }
 
 void Utils::SysTrayNotify(QString &text,
-    QSystemTrayIcon::MessageIcon icon, QString title) {
-    if (!Config::Current()->AlertsEnabled ||
-        !QSystemTrayIcon::isSystemTrayAvailable() ||
-        !QSystemTrayIcon::supportsMessages())
-    {
-        return;
-    }
+	QSystemTrayIcon::MessageIcon icon, QString title) {
+	if (!Config::Current()->AlertsEnabled ||
+		!QSystemTrayIcon::isSystemTrayAvailable() ||
+		!QSystemTrayIcon::supportsMessages())
+	{
+		return;
+	}
 
-    QSystemTrayIcon* trayIcon = GetTrayIcon();
-    if (trayIcon)
-        trayIcon->showMessage(title, text, icon);
+	QSystemTrayIcon* trayIcon = GetTrayIcon();
+	if (trayIcon)
+		trayIcon->showMessage(title, text, icon);
 }
 
 QString Utils::FormatIPAddress(QHostAddress &addr) {
-    QRegExp v4regex("(::ffff:)(((\\d).){3})", Qt::CaseInsensitive);
-    QString addrString = addr.toString();
-    if (addrString.contains(v4regex)) {
-        addrString = QHostAddress(addr.toIPv4Address()).toString();
-    }
-    return addrString;
+	QRegExp v4regex("(::ffff:)(((\\d).){3})", Qt::CaseInsensitive);
+	QString addrString = addr.toString();
+	if (addrString.contains(v4regex)) {
+		addrString = QHostAddress(addr.toIPv4Address()).toString();
+	}
+	return addrString;
 }
 
 const char* Utils::GetRecordingFolder() {
-    config_t* profile = obs_frontend_get_profile_config();
-    QString outputMode = config_get_string(profile, "Output", "Mode");
+	config_t* profile = obs_frontend_get_profile_config();
+	QString outputMode = config_get_string(profile, "Output", "Mode");
 
-    if (outputMode == "Advanced") {
-        // Advanced mode
-        return config_get_string(profile, "AdvOut", "RecFilePath");
-    } else {
-        // Simple mode
-        return config_get_string(profile, "SimpleOutput", "FilePath");
-    }
+	if (outputMode == "Advanced") {
+		// Advanced mode
+		return config_get_string(profile, "AdvOut", "RecFilePath");
+	} else {
+		// Simple mode
+		return config_get_string(profile, "SimpleOutput", "FilePath");
+	}
 }
 
 bool Utils::SetRecordingFolder(const char* path) {
-    QDir dir(path);
-    if (!dir.exists())
-        dir.mkpath(".");
+	QDir dir(path);
+	if (!dir.exists())
+		dir.mkpath(".");
 
-    config_t* profile = obs_frontend_get_profile_config();
-    QString outputMode = config_get_string(profile, "Output", "Mode");
+	config_t* profile = obs_frontend_get_profile_config();
+	QString outputMode = config_get_string(profile, "Output", "Mode");
 
-    if (outputMode == "Advanced") {
-        config_set_string(profile, "AdvOut", "RecFilePath", path);
-    } else {
-        config_set_string(profile, "SimpleOutput", "FilePath", path);
-    }
+	if (outputMode == "Advanced") {
+		config_set_string(profile, "AdvOut", "RecFilePath", path);
+	} else {
+		config_set_string(profile, "SimpleOutput", "FilePath", path);
+	}
 
-    config_save(profile);
-    return true;
+	config_save(profile);
+	return true;
 }
 
 QString Utils::ParseDataToQueryString(obs_data_t* data) {
-    if (!data)
-        return QString();
+	if (!data)
+		return QString();
 
-    QString query;
+	QString query;
 
-    obs_data_item_t* item = obs_data_first(data);
-    if (item) {
-        bool isFirst = true;
-        do {
-            if (!obs_data_item_has_user_value(item))
-                continue;
+	obs_data_item_t* item = obs_data_first(data);
+	if (item) {
+		bool isFirst = true;
+		do {
+			if (!obs_data_item_has_user_value(item))
+				continue;
 
-            if (!isFirst)
-                query += "&";
-            else
-                isFirst = false;
+			if (!isFirst)
+				query += "&";
+			else
+				isFirst = false;
 
-            QString attrName = obs_data_item_get_name(item);
-            query += (attrName + "=");
+			QString attrName = obs_data_item_get_name(item);
+			query += (attrName + "=");
 
-            switch (obs_data_item_gettype(item)) {
-                case OBS_DATA_BOOLEAN:
-                    query += (obs_data_item_get_bool(item) ? "true" : "false");
-                    break;
+			switch (obs_data_item_gettype(item)) {
+				case OBS_DATA_BOOLEAN:
+					query += (obs_data_item_get_bool(item) ? "true" : "false");
+					break;
 
-                case OBS_DATA_NUMBER:
-                    switch (obs_data_item_numtype(item)) {
-                        case OBS_DATA_NUM_DOUBLE:
-                            query +=
-                                QString::number(obs_data_item_get_double(item));
-                            break;
-                        case OBS_DATA_NUM_INT:
-                            query +=
-                                QString::number(obs_data_item_get_int(item));
-                            break;
-                        case OBS_DATA_NUM_INVALID:
-                            break;
-                    }
-                    break;
+				case OBS_DATA_NUMBER:
+					switch (obs_data_item_numtype(item)) {
+						case OBS_DATA_NUM_DOUBLE:
+							query +=
+								QString::number(obs_data_item_get_double(item));
+							break;
+						case OBS_DATA_NUM_INT:
+							query +=
+								QString::number(obs_data_item_get_int(item));
+							break;
+						case OBS_DATA_NUM_INVALID:
+							break;
+					}
+					break;
 
-                case OBS_DATA_STRING:
-                    query +=
-                        QUrl::toPercentEncoding(
-                            QString(obs_data_item_get_string(item)));
-                    break;
+				case OBS_DATA_STRING:
+					query +=
+						QUrl::toPercentEncoding(
+							QString(obs_data_item_get_string(item)));
+					break;
 
-                default:
-                    //other types are not supported
-                    break;
-            }
-        } while (obs_data_item_next(&item));
-    }
+				default:
+					//other types are not supported
+					break;
+			}
+		} while (obs_data_item_next(&item));
+	}
 
-    return query;
+	return query;
 }
 
 obs_hotkey_t* Utils::FindHotkeyByName(QString name) {
-    struct current_search {
-        QString query;
-        obs_hotkey_t* result;
-    };
+	struct current_search {
+		QString query;
+		obs_hotkey_t* result;
+	};
 
-    current_search search;
-    search.query = name;
-    search.result = nullptr;
+	current_search search;
+	search.query = name;
+	search.result = nullptr;
 
-    obs_enum_hotkeys([](void* data, obs_hotkey_id id, obs_hotkey_t* hotkey) {
-        current_search* search = static_cast<current_search*>(data);
+	obs_enum_hotkeys([](void* data, obs_hotkey_id id, obs_hotkey_t* hotkey) {
+		current_search* search = static_cast<current_search*>(data);
 
-        const char* hk_name = obs_hotkey_get_name(hotkey);
-        if (hk_name == search->query) {
-            search->result = hotkey;
-            return false;
-        }
+		const char* hk_name = obs_hotkey_get_name(hotkey);
+		if (hk_name == search->query) {
+			search->result = hotkey;
+			return false;
+		}
 
-        return true;
-    }, &search);
+		return true;
+	}, &search);
 
-    return search.result;
+	return search.result;
 }
 
 bool Utils::ReplayBufferEnabled() {
-    config_t* profile = obs_frontend_get_profile_config();
-    QString outputMode = config_get_string(profile, "Output", "Mode");
+	config_t* profile = obs_frontend_get_profile_config();
+	QString outputMode = config_get_string(profile, "Output", "Mode");
 
-    if (outputMode == "Simple") {
-        return config_get_bool(profile, "SimpleOutput", "RecRB");
-    }
-    else if (outputMode == "Advanced") {
-        return config_get_bool(profile, "AdvOut", "RecRB");
-    }
+	if (outputMode == "Simple") {
+		return config_get_bool(profile, "SimpleOutput", "RecRB");
+	}
+	else if (outputMode == "Advanced") {
+		return config_get_bool(profile, "AdvOut", "RecRB");
+	}
 
-    return false;
+	return false;
 }
 
 void Utils::StartReplayBuffer() {
-    if (obs_frontend_replay_buffer_active())
-        return;
+	if (obs_frontend_replay_buffer_active())
+		return;
 
-    if (!IsRPHotkeySet()) {
-        obs_output_t* rpOutput = obs_frontend_get_replay_buffer_output();
-        OBSData outputHotkeys = obs_hotkeys_save_output(rpOutput);
+	if (!IsRPHotkeySet()) {
+		obs_output_t* rpOutput = obs_frontend_get_replay_buffer_output();
+		OBSData outputHotkeys = obs_hotkeys_save_output(rpOutput);
 
-        OBSData dummyBinding = obs_data_create();
-        obs_data_set_bool(dummyBinding, "control", true);
-        obs_data_set_bool(dummyBinding, "alt", true);
-        obs_data_set_bool(dummyBinding, "shift", true);
-        obs_data_set_bool(dummyBinding, "command", true);
-        obs_data_set_string(dummyBinding, "key", "OBS_KEY_0");
+		OBSData dummyBinding = obs_data_create();
+		obs_data_set_bool(dummyBinding, "control", true);
+		obs_data_set_bool(dummyBinding, "alt", true);
+		obs_data_set_bool(dummyBinding, "shift", true);
+		obs_data_set_bool(dummyBinding, "command", true);
+		obs_data_set_string(dummyBinding, "key", "OBS_KEY_0");
 
-        OBSDataArray rpSaveHotkey = obs_data_get_array(
-            outputHotkeys, "ReplayBuffer.Save");
-        obs_data_array_push_back(rpSaveHotkey, dummyBinding);
+		OBSDataArray rpSaveHotkey = obs_data_get_array(
+			outputHotkeys, "ReplayBuffer.Save");
+		obs_data_array_push_back(rpSaveHotkey, dummyBinding);
 
-        obs_hotkeys_load_output(rpOutput, outputHotkeys);
-        obs_frontend_replay_buffer_start();
+		obs_hotkeys_load_output(rpOutput, outputHotkeys);
+		obs_frontend_replay_buffer_start();
 
-        obs_output_release(rpOutput);
-    }
-    else {
-        obs_frontend_replay_buffer_start();
-    }
+		obs_output_release(rpOutput);
+	}
+	else {
+		obs_frontend_replay_buffer_start();
+	}
 }
 
 bool Utils::IsRPHotkeySet() {
-    OBSOutputAutoRelease rpOutput = obs_frontend_get_replay_buffer_output();
-    OBSDataAutoRelease hotkeys = obs_hotkeys_save_output(rpOutput);
-    OBSDataArrayAutoRelease bindings = obs_data_get_array(hotkeys,
-        "ReplayBuffer.Save");
+	OBSOutputAutoRelease rpOutput = obs_frontend_get_replay_buffer_output();
+	OBSDataAutoRelease hotkeys = obs_hotkeys_save_output(rpOutput);
+	OBSDataArrayAutoRelease bindings = obs_data_get_array(hotkeys,
+		"ReplayBuffer.Save");
 
-    size_t count = obs_data_array_count(bindings);
-    return (count > 0);
+	size_t count = obs_data_array_count(bindings);
+	return (count > 0);
 }
 
 const char* Utils::GetFilenameFormatting() {
-    config_t* profile = obs_frontend_get_profile_config();
-    return config_get_string(profile, "Output", "FilenameFormatting");
+	config_t* profile = obs_frontend_get_profile_config();
+	return config_get_string(profile, "Output", "FilenameFormatting");
 }
 
 bool Utils::SetFilenameFormatting(const char* filenameFormatting) {
-    config_t* profile = obs_frontend_get_profile_config();
-    config_set_string(profile, "Output", "FilenameFormatting", filenameFormatting);
-    config_save(profile);
-    return true;
+	config_t* profile = obs_frontend_get_profile_config();
+	config_set_string(profile, "Output", "FilenameFormatting", filenameFormatting);
+	config_save(profile);
+	return true;
 }

src/Utils.h

@@ -34,52 +34,54 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 class Utils {
   public:
-    static obs_data_array_t* StringListToArray(char** strings, char* key);
-    static obs_data_array_t* GetSceneItems(obs_source_t* source);
-    static obs_data_t* GetSceneItemData(obs_sceneitem_t* item);
-    static obs_sceneitem_t* GetSceneItemFromName(
-        obs_source_t* source, QString name);
-    static obs_source_t* GetTransitionFromName(QString transitionName);
-    static obs_source_t* GetSceneFromNameOrCurrent(QString sceneName);
+	static obs_data_array_t* StringListToArray(char** strings, char* key);
+	static obs_data_array_t* GetSceneItems(obs_source_t* source);
+	static obs_data_t* GetSceneItemData(obs_sceneitem_t* item);
+	static obs_sceneitem_t* GetSceneItemFromName(
+		obs_source_t* source, QString name);
+        static obs_sceneitem_t* GetSceneItemFromId(obs_source_t* source, size_t id);
+	static obs_sceneitem_t* GetSceneItemFromItem(obs_source_t* source, obs_data_t* item);
+	static obs_source_t* GetTransitionFromName(QString transitionName);
+	static obs_source_t* GetSceneFromNameOrCurrent(QString sceneName);
 
-    static bool IsValidAlignment(const uint32_t alignment);
+	static bool IsValidAlignment(const uint32_t alignment);
 
-    static obs_data_array_t* GetScenes();
-    static obs_data_t* GetSceneData(obs_source_t* source);
+	static obs_data_array_t* GetScenes();
+	static obs_data_t* GetSceneData(obs_source_t* source);
 
-    static QSpinBox* GetTransitionDurationControl();
-    static int GetTransitionDuration();
-    static void SetTransitionDuration(int ms);
+	static QSpinBox* GetTransitionDurationControl();
+	static int GetTransitionDuration();
+	static void SetTransitionDuration(int ms);
 
-    static bool SetTransitionByName(QString transitionName);
+	static bool SetTransitionByName(QString transitionName);
 
-    static QPushButton* GetPreviewModeButtonControl();
-    static QLayout* GetPreviewLayout();
-    static QListWidget* GetSceneListControl();
-    static obs_scene_t* SceneListItemToScene(QListWidgetItem* item);
+	static QPushButton* GetPreviewModeButtonControl();
+	static QLayout* GetPreviewLayout();
+	static QListWidget* GetSceneListControl();
+	static obs_scene_t* SceneListItemToScene(QListWidgetItem* item);
 
-    static void TransitionToProgram();
+	static void TransitionToProgram();
 
-    static QString OBSVersionString();
+	static QString OBSVersionString();
 
-    static QSystemTrayIcon* GetTrayIcon();
-    static void SysTrayNotify(
-        QString &text,
-        QSystemTrayIcon::MessageIcon n,
-        QString title = QString("obs-websocket"));
+	static QSystemTrayIcon* GetTrayIcon();
+	static void SysTrayNotify(
+		QString &text,
+		QSystemTrayIcon::MessageIcon n,
+		QString title = QString("obs-websocket"));
 
-    static QString FormatIPAddress(QHostAddress &addr);
+	static QString FormatIPAddress(QHostAddress &addr);
 
-    static const char* GetRecordingFolder();
-    static bool SetRecordingFolder(const char* path);
+	static const char* GetRecordingFolder();
+	static bool SetRecordingFolder(const char* path);
 
-    static QString ParseDataToQueryString(obs_data_t* data);
-    static obs_hotkey_t* FindHotkeyByName(QString name);
-    static bool ReplayBufferEnabled();
-    static void StartReplayBuffer();
-    static bool IsRPHotkeySet();
-    static const char* GetFilenameFormatting();
-    static bool SetFilenameFormatting(const char* filenameFormatting);
+	static QString ParseDataToQueryString(obs_data_t* data);
+	static obs_hotkey_t* FindHotkeyByName(QString name);
+	static bool ReplayBufferEnabled();
+	static void StartReplayBuffer();
+	static bool IsRPHotkeySet();
+	static const char* GetFilenameFormatting();
+	static bool SetFilenameFormatting(const char* filenameFormatting);
 };
 
 #endif // UTILS_H

src/WSEvents.h

@@ -28,84 +28,83 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 class WSEvents : public QObject {
   Q_OBJECT
   public:
-    explicit WSEvents(WSServer* srv);
-    ~WSEvents();
-    static void FrontendEventHandler(
-        enum obs_frontend_event event, void* privateData);
-    static WSEvents* Instance;
-    void connectTransitionSignals(obs_source_t* transition);
-    void connectSceneSignals(obs_source_t* scene);
+	explicit WSEvents(WSServer* srv);
+	~WSEvents();
+	static void FrontendEventHandler(
+		enum obs_frontend_event event, void* privateData);
+	static WSEvents* Instance;
+	void connectSceneSignals(obs_source_t* scene);
 
-    uint64_t GetStreamingTime();
-    const char* GetStreamingTimecode();
-    uint64_t GetRecordingTime();
-    const char* GetRecordingTimecode();
+	void hookTransitionBeginEvent();
 
-    bool HeartbeatIsActive;
+	uint64_t GetStreamingTime();
+	const char* GetStreamingTimecode();
+	uint64_t GetRecordingTime();
+	const char* GetRecordingTimecode();
+
+	bool HeartbeatIsActive;
 
   private slots:
-    void deferredInitOperations();
-    void StreamStatus();
-    void Heartbeat();
-    void TransitionDurationChanged(int ms);
-    void SelectedSceneChanged(
-        QListWidgetItem* current, QListWidgetItem* prev);
+	void deferredInitOperations();
+	void StreamStatus();
+	void Heartbeat();
+	void TransitionDurationChanged(int ms);
 
   private:
-    WSServer* _srv;
-    OBSSource currentScene;
-    OBSSource currentTransition;
+	WSServer* _srv;
+	OBSSource currentScene;
 
-    bool pulse;
+	bool pulse;
 
-    bool _streamingActive;
-    bool _recordingActive;
+	bool _streamingActive;
+	bool _recordingActive;
 
-    uint64_t _streamStarttime;
-    uint64_t _recStarttime;
+	uint64_t _streamStarttime;
+	uint64_t _recStarttime;
 
-    uint64_t _lastBytesSent;
-    uint64_t _lastBytesSentTime;
+	uint64_t _lastBytesSent;
+	uint64_t _lastBytesSentTime;
 
-    void broadcastUpdate(const char* updateType,
-        obs_data_t* additionalFields);
+	void broadcastUpdate(const char* updateType,
+		obs_data_t* additionalFields);
 
-    void OnSceneChange();
-    void OnSceneListChange();
-    void OnSceneCollectionChange();
-    void OnSceneCollectionListChange();
+	void OnSceneChange();
+	void OnSceneListChange();
+	void OnSceneCollectionChange();
+	void OnSceneCollectionListChange();
 
-    void OnTransitionChange();
-    void OnTransitionListChange();
+	void OnTransitionChange();
+	void OnTransitionListChange();
 
-    void OnProfileChange();
-    void OnProfileListChange();
+	void OnProfileChange();
+	void OnProfileListChange();
 
-    void OnStreamStarting();
-    void OnStreamStarted();
-    void OnStreamStopping();
-    void OnStreamStopped();
+	void OnStreamStarting();
+	void OnStreamStarted();
+	void OnStreamStopping();
+	void OnStreamStopped();
 
-    void OnRecordingStarting();
-    void OnRecordingStarted();
-    void OnRecordingStopping();
-    void OnRecordingStopped();
+	void OnRecordingStarting();
+	void OnRecordingStarted();
+	void OnRecordingStopping();
+	void OnRecordingStopped();
 
-    void OnReplayStarting();
-    void OnReplayStarted();
-    void OnReplayStopping();
-    void OnReplayStopped();
+	void OnReplayStarting();
+	void OnReplayStarted();
+	void OnReplayStopping();
+	void OnReplayStopped();
 
-    void OnStudioModeSwitched(bool enabled);
+	void OnStudioModeSwitched(bool enabled);
+	void OnPreviewSceneChanged();
 
-    void OnExit();
+	void OnExit();
 
-    static void OnTransitionBegin(void* param, calldata_t* data);
+	static void OnTransitionBegin(void* param, calldata_t* data);
 
-    static void OnSceneReordered(void* param, calldata_t* data);
-    static void OnSceneItemAdd(void* param, calldata_t* data);
-    static void OnSceneItemDelete(void* param, calldata_t* data);
-    static void OnSceneItemVisibilityChanged(void* param, calldata_t* data);
+	static void OnSceneReordered(void* param, calldata_t* data);
+	static void OnSceneItemAdd(void* param, calldata_t* data);
+	static void OnSceneItemDelete(void* param, calldata_t* data);
+	static void OnSceneItemVisibilityChanged(void* param, calldata_t* data);
 };
 
-#endif // WSEVENTS_H
+#endif // WSEVENTS_H

src/WSRequestHandler.cpp

@@ -25,193 +25,206 @@
 #include "WSRequestHandler.h"
 
 QHash<QString, void(*)(WSRequestHandler*)> WSRequestHandler::messageMap {
-    { "GetVersion", WSRequestHandler::HandleGetVersion },
-    { "GetAuthRequired", WSRequestHandler::HandleGetAuthRequired },
-    { "Authenticate", WSRequestHandler::HandleAuthenticate },
+	{ "GetVersion", WSRequestHandler::HandleGetVersion },
+	{ "GetAuthRequired", WSRequestHandler::HandleGetAuthRequired },
+	{ "Authenticate", WSRequestHandler::HandleAuthenticate },
 
-    { "SetHeartbeat", WSRequestHandler::HandleSetHeartbeat },
+	{ "SetHeartbeat", WSRequestHandler::HandleSetHeartbeat },
 
-    { "SetFilenameFormatting", WSRequestHandler::HandleSetFilenameFormatting },
-    { "GetFilenameFormatting", WSRequestHandler::HandleGetFilenameFormatting },
+	{ "SetFilenameFormatting", WSRequestHandler::HandleSetFilenameFormatting },
+	{ "GetFilenameFormatting", WSRequestHandler::HandleGetFilenameFormatting },
 
-    { "SetCurrentScene", WSRequestHandler::HandleSetCurrentScene },
-    { "GetCurrentScene", WSRequestHandler::HandleGetCurrentScene },
-    { "GetSceneList", WSRequestHandler::HandleGetSceneList },
+	{ "SetCurrentScene", WSRequestHandler::HandleSetCurrentScene },
+	{ "GetCurrentScene", WSRequestHandler::HandleGetCurrentScene },
+	{ "GetSceneList", WSRequestHandler::HandleGetSceneList },
 
-    { "SetSourceRender", WSRequestHandler::HandleSetSceneItemRender }, // Retrocompat
-    { "SetSceneItemRender", WSRequestHandler::HandleSetSceneItemRender },
-    { "SetSceneItemPosition", WSRequestHandler::HandleSetSceneItemPosition },
-    { "SetSceneItemTransform", WSRequestHandler::HandleSetSceneItemTransform },
-    { "SetSceneItemCrop", WSRequestHandler::HandleSetSceneItemCrop },
-    { "GetSceneItemProperties", WSRequestHandler::HandleGetSceneItemProperties },
-    { "SetSceneItemProperties", WSRequestHandler::HandleSetSceneItemProperties },
-    { "ResetSceneItem", WSRequestHandler::HandleResetSceneItem },
+	{ "SetSourceRender", WSRequestHandler::HandleSetSceneItemRender }, // Retrocompat
+	{ "SetSceneItemRender", WSRequestHandler::HandleSetSceneItemRender },
+	{ "SetSceneItemPosition", WSRequestHandler::HandleSetSceneItemPosition },
+	{ "SetSceneItemTransform", WSRequestHandler::HandleSetSceneItemTransform },
+	{ "SetSceneItemCrop", WSRequestHandler::HandleSetSceneItemCrop },
+	{ "GetSceneItemProperties", WSRequestHandler::HandleGetSceneItemProperties },
+	{ "SetSceneItemProperties", WSRequestHandler::HandleSetSceneItemProperties },
+	{ "ResetSceneItem", WSRequestHandler::HandleResetSceneItem },
+	{ "DeleteSceneItem", WSRequestHandler::HandleDeleteSceneItem },
+	{ "DuplicateSceneItem", WSRequestHandler::HandleDuplicateSceneItem },
+	{ "ReorderSceneItems", WSRequestHandler::HandleReorderSceneItems },
 
-    { "GetStreamingStatus", WSRequestHandler::HandleGetStreamingStatus },
-    { "StartStopStreaming", WSRequestHandler::HandleStartStopStreaming },
-    { "StartStopRecording", WSRequestHandler::HandleStartStopRecording },
-    { "StartStreaming", WSRequestHandler::HandleStartStreaming },
-    { "StopStreaming", WSRequestHandler::HandleStopStreaming },
-    { "StartRecording", WSRequestHandler::HandleStartRecording },
-    { "StopRecording", WSRequestHandler::HandleStopRecording },
+	{ "GetStreamingStatus", WSRequestHandler::HandleGetStreamingStatus },
+	{ "StartStopStreaming", WSRequestHandler::HandleStartStopStreaming },
+	{ "StartStopRecording", WSRequestHandler::HandleStartStopRecording },
+	{ "StartStreaming", WSRequestHandler::HandleStartStreaming },
+	{ "StopStreaming", WSRequestHandler::HandleStopStreaming },
+	{ "StartRecording", WSRequestHandler::HandleStartRecording },
+	{ "StopRecording", WSRequestHandler::HandleStopRecording },
 
-    { "StartStopReplayBuffer", WSRequestHandler::HandleStartStopReplayBuffer },
-    { "StartReplayBuffer", WSRequestHandler::HandleStartReplayBuffer },
-    { "StopReplayBuffer", WSRequestHandler::HandleStopReplayBuffer },
-    { "SaveReplayBuffer", WSRequestHandler::HandleSaveReplayBuffer },
+	{ "StartStopReplayBuffer", WSRequestHandler::HandleStartStopReplayBuffer },
+	{ "StartReplayBuffer", WSRequestHandler::HandleStartReplayBuffer },
+	{ "StopReplayBuffer", WSRequestHandler::HandleStopReplayBuffer },
+	{ "SaveReplayBuffer", WSRequestHandler::HandleSaveReplayBuffer },
 
-    { "SetRecordingFolder", WSRequestHandler::HandleSetRecordingFolder },
-    { "GetRecordingFolder", WSRequestHandler::HandleGetRecordingFolder },
+	{ "SetRecordingFolder", WSRequestHandler::HandleSetRecordingFolder },
+	{ "GetRecordingFolder", WSRequestHandler::HandleGetRecordingFolder },
 
-    { "GetTransitionList", WSRequestHandler::HandleGetTransitionList },
-    { "GetCurrentTransition", WSRequestHandler::HandleGetCurrentTransition },
-    { "SetCurrentTransition", WSRequestHandler::HandleSetCurrentTransition },
-    { "SetTransitionDuration", WSRequestHandler::HandleSetTransitionDuration },
-    { "GetTransitionDuration", WSRequestHandler::HandleGetTransitionDuration },
+	{ "GetTransitionList", WSRequestHandler::HandleGetTransitionList },
+	{ "GetCurrentTransition", WSRequestHandler::HandleGetCurrentTransition },
+	{ "SetCurrentTransition", WSRequestHandler::HandleSetCurrentTransition },
+	{ "SetTransitionDuration", WSRequestHandler::HandleSetTransitionDuration },
+	{ "GetTransitionDuration", WSRequestHandler::HandleGetTransitionDuration },
 
-    { "SetVolume", WSRequestHandler::HandleSetVolume },
-    { "GetVolume", WSRequestHandler::HandleGetVolume },
-    { "ToggleMute", WSRequestHandler::HandleToggleMute },
-    { "SetMute", WSRequestHandler::HandleSetMute },
-    { "GetMute", WSRequestHandler::HandleGetMute },
-    { "SetSyncOffset", WSRequestHandler::HandleSetSyncOffset },
-    { "GetSyncOffset", WSRequestHandler::HandleGetSyncOffset },
-    { "GetSpecialSources", WSRequestHandler::HandleGetSpecialSources },
-    { "GetSourcesList", WSRequestHandler::HandleGetSourcesList },
-    { "GetSourceTypesList", WSRequestHandler::HandleGetSourceTypesList },
-    { "GetSourceSettings", WSRequestHandler::HandleGetSourceSettings },
-    { "SetSourceSettings", WSRequestHandler::HandleSetSourceSettings },
+	{ "SetVolume", WSRequestHandler::HandleSetVolume },
+	{ "GetVolume", WSRequestHandler::HandleGetVolume },
+	{ "ToggleMute", WSRequestHandler::HandleToggleMute },
+	{ "SetMute", WSRequestHandler::HandleSetMute },
+	{ "GetMute", WSRequestHandler::HandleGetMute },
+	{ "SetSyncOffset", WSRequestHandler::HandleSetSyncOffset },
+	{ "GetSyncOffset", WSRequestHandler::HandleGetSyncOffset },
+	{ "GetSpecialSources", WSRequestHandler::HandleGetSpecialSources },
+	{ "GetSourcesList", WSRequestHandler::HandleGetSourcesList },
+	{ "GetSourceTypesList", WSRequestHandler::HandleGetSourceTypesList },
+	{ "GetSourceSettings", WSRequestHandler::HandleGetSourceSettings },
+	{ "SetSourceSettings", WSRequestHandler::HandleSetSourceSettings },
 
-    { "SetCurrentSceneCollection", WSRequestHandler::HandleSetCurrentSceneCollection },
-    { "GetCurrentSceneCollection", WSRequestHandler::HandleGetCurrentSceneCollection },
-    { "ListSceneCollections", WSRequestHandler::HandleListSceneCollections },
+	{ "GetSourceFilters", WSRequestHandler::HandleGetSourceFilters },
+	{ "AddFilterToSource", WSRequestHandler::HandleAddFilterToSource },
+	{ "RemoveFilterFromSource", WSRequestHandler::HandleRemoveFilterFromSource },
+	{ "ReorderSourceFilter", WSRequestHandler::HandleReorderSourceFilter },
+	{ "MoveSourceFilter", WSRequestHandler::HandleMoveSourceFilter },
+	{ "SetSourceFilterSettings", WSRequestHandler::HandleSetSourceFilterSettings },
 
-    { "SetCurrentProfile", WSRequestHandler::HandleSetCurrentProfile },
-    { "GetCurrentProfile", WSRequestHandler::HandleGetCurrentProfile },
-    { "ListProfiles", WSRequestHandler::HandleListProfiles },
+	{ "SetCurrentSceneCollection", WSRequestHandler::HandleSetCurrentSceneCollection },
+	{ "GetCurrentSceneCollection", WSRequestHandler::HandleGetCurrentSceneCollection },
+	{ "ListSceneCollections", WSRequestHandler::HandleListSceneCollections },
 
-    { "SetStreamSettings", WSRequestHandler::HandleSetStreamSettings },
-    { "GetStreamSettings", WSRequestHandler::HandleGetStreamSettings },
-    { "SaveStreamSettings", WSRequestHandler::HandleSaveStreamSettings },
+	{ "SetCurrentProfile", WSRequestHandler::HandleSetCurrentProfile },
+	{ "GetCurrentProfile", WSRequestHandler::HandleGetCurrentProfile },
+	{ "ListProfiles", WSRequestHandler::HandleListProfiles },
 
-    { "GetStudioModeStatus", WSRequestHandler::HandleGetStudioModeStatus },
-    { "GetPreviewScene", WSRequestHandler::HandleGetPreviewScene },
-    { "SetPreviewScene", WSRequestHandler::HandleSetPreviewScene },
-    { "TransitionToProgram", WSRequestHandler::HandleTransitionToProgram },
-    { "EnableStudioMode", WSRequestHandler::HandleEnableStudioMode },
-    { "DisableStudioMode", WSRequestHandler::HandleDisableStudioMode },
-    { "ToggleStudioMode", WSRequestHandler::HandleToggleStudioMode },
+	{ "SetStreamSettings", WSRequestHandler::HandleSetStreamSettings },
+	{ "GetStreamSettings", WSRequestHandler::HandleGetStreamSettings },
+	{ "SaveStreamSettings", WSRequestHandler::HandleSaveStreamSettings },
 
-    { "SetTextGDIPlusProperties", WSRequestHandler::HandleSetTextGDIPlusProperties },
-    { "GetTextGDIPlusProperties", WSRequestHandler::HandleGetTextGDIPlusProperties },
+	{ "GetStudioModeStatus", WSRequestHandler::HandleGetStudioModeStatus },
+	{ "GetPreviewScene", WSRequestHandler::HandleGetPreviewScene },
+	{ "SetPreviewScene", WSRequestHandler::HandleSetPreviewScene },
+	{ "TransitionToProgram", WSRequestHandler::HandleTransitionToProgram },
+	{ "EnableStudioMode", WSRequestHandler::HandleEnableStudioMode },
+	{ "DisableStudioMode", WSRequestHandler::HandleDisableStudioMode },
+	{ "ToggleStudioMode", WSRequestHandler::HandleToggleStudioMode },
 
-    { "GetBrowserSourceProperties", WSRequestHandler::HandleGetBrowserSourceProperties },
-    { "SetBrowserSourceProperties", WSRequestHandler::HandleSetBrowserSourceProperties }
+	{ "SetTextGDIPlusProperties", WSRequestHandler::HandleSetTextGDIPlusProperties },
+	{ "GetTextGDIPlusProperties", WSRequestHandler::HandleGetTextGDIPlusProperties },
+
+	{ "SetTextFreetype2Properties", WSRequestHandler::HandleSetTextFreetype2Properties },
+	{ "GetTextFreetype2Properties", WSRequestHandler::HandleGetTextFreetype2Properties },
+
+	{ "GetBrowserSourceProperties", WSRequestHandler::HandleGetBrowserSourceProperties },
+	{ "SetBrowserSourceProperties", WSRequestHandler::HandleSetBrowserSourceProperties }
 };
 
 QSet<QString> WSRequestHandler::authNotRequired {
-    "GetVersion",
-    "GetAuthRequired",
-    "Authenticate"
+	"GetVersion",
+	"GetAuthRequired",
+	"Authenticate"
 };
 
 WSRequestHandler::WSRequestHandler(QWebSocket* client) :
-    _messageId(0),
-    _requestType(""),
-    data(nullptr),
-    _client(client)
+	_messageId(0),
+	_requestType(""),
+	data(nullptr),
+	_client(client)
 {
 }
 
 void WSRequestHandler::processIncomingMessage(QString textMessage) {
-    QByteArray msgData = textMessage.toUtf8();
-    const char* msg = msgData.constData();
+	QByteArray msgData = textMessage.toUtf8();
+	const char* msg = msgData.constData();
 
-    data = obs_data_create_from_json(msg);
-    if (!data) {
-        if (!msg)
-            msg = "<null pointer>";
+	data = obs_data_create_from_json(msg);
+	if (!data) {
+		if (!msg)
+			msg = "<null pointer>";
 
-        blog(LOG_ERROR, "invalid JSON payload received for '%s'", msg);
-        SendErrorResponse("invalid JSON payload");
-        return;
-    }
+		blog(LOG_ERROR, "invalid JSON payload received for '%s'", msg);
+		SendErrorResponse("invalid JSON payload");
+		return;
+	}
 
-    if (Config::Current()->DebugEnabled) {
-        blog(LOG_DEBUG, "Request >> '%s'", msg);
-    }
+	if (Config::Current()->DebugEnabled) {
+		blog(LOG_DEBUG, "Request >> '%s'", msg);
+	}
 
-    if (!hasField("request-type")
-        || !hasField("message-id"))
-    {
-        SendErrorResponse("missing request parameters");
-        return;
-    }
+	if (!hasField("request-type")
+		|| !hasField("message-id"))
+	{
+		SendErrorResponse("missing request parameters");
+		return;
+	}
 
-    _requestType = obs_data_get_string(data, "request-type");
-    _messageId = obs_data_get_string(data, "message-id");
+	_requestType = obs_data_get_string(data, "request-type");
+	_messageId = obs_data_get_string(data, "message-id");
 
-    if (Config::Current()->AuthRequired
-        && (_client->property(PROP_AUTHENTICATED).toBool() == false)
-        && (authNotRequired.find(_requestType) == authNotRequired.end()))
-    {
-        SendErrorResponse("Not Authenticated");
-        return;
-    }
+	if (Config::Current()->AuthRequired
+		&& (_client->property(PROP_AUTHENTICATED).toBool() == false)
+		&& (authNotRequired.find(_requestType) == authNotRequired.end()))
+	{
+		SendErrorResponse("Not Authenticated");
+		return;
+	}
 
-    void (*handlerFunc)(WSRequestHandler*) = (messageMap[_requestType]);
+	void (*handlerFunc)(WSRequestHandler*) = (messageMap[_requestType]);
 
-    if (handlerFunc != nullptr)
-        handlerFunc(this);
-    else
-        SendErrorResponse("invalid request type");
+	if (handlerFunc != nullptr)
+		handlerFunc(this);
+	else
+		SendErrorResponse("invalid request type");
 }
 
 WSRequestHandler::~WSRequestHandler() {
 }
 
 void WSRequestHandler::SendOKResponse(obs_data_t* additionalFields) {
-    OBSDataAutoRelease response = obs_data_create();
-    obs_data_set_string(response, "status", "ok");
-    obs_data_set_string(response, "message-id", _messageId);
+	OBSDataAutoRelease response = obs_data_create();
+	obs_data_set_string(response, "status", "ok");
+	obs_data_set_string(response, "message-id", _messageId);
 
-    if (additionalFields)
-        obs_data_apply(response, additionalFields);
+	if (additionalFields)
+		obs_data_apply(response, additionalFields);
 
-    SendResponse(response);
+	SendResponse(response);
 }
 
 void WSRequestHandler::SendErrorResponse(const char* errorMessage) {
-    OBSDataAutoRelease response = obs_data_create();
-    obs_data_set_string(response, "status", "error");
-    obs_data_set_string(response, "error", errorMessage);
-    obs_data_set_string(response, "message-id", _messageId);
+	OBSDataAutoRelease response = obs_data_create();
+	obs_data_set_string(response, "status", "error");
+	obs_data_set_string(response, "error", errorMessage);
+	obs_data_set_string(response, "message-id", _messageId);
 
-    SendResponse(response);
+	SendResponse(response);
 }
 
 void WSRequestHandler::SendErrorResponse(obs_data_t* additionalFields) {
-    OBSDataAutoRelease response = obs_data_create();
-    obs_data_set_string(response, "status", "error");
-    obs_data_set_string(response, "message-id", _messageId);
+	OBSDataAutoRelease response = obs_data_create();
+	obs_data_set_string(response, "status", "error");
+	obs_data_set_string(response, "message-id", _messageId);
 
-    if (additionalFields)
-        obs_data_set_obj(response, "error", additionalFields);
+	if (additionalFields)
+		obs_data_set_obj(response, "error", additionalFields);
 
-    SendResponse(response);
+	SendResponse(response);
 }
 
 void WSRequestHandler::SendResponse(obs_data_t* response)  {
-    QString json = obs_data_get_json(response);
-    _client->sendTextMessage(json);
+	QString json = obs_data_get_json(response);
+	_client->sendTextMessage(json);
 
-    if (Config::Current()->DebugEnabled)
-        blog(LOG_DEBUG, "Response << '%s'", json.toUtf8().constData());
+	if (Config::Current()->DebugEnabled)
+		blog(LOG_DEBUG, "Response << '%s'", json.toUtf8().constData());
 }
 
 bool WSRequestHandler::hasField(QString name) {
-    if (!data || name.isEmpty() || name.isNull())
-        return false;
+	if (!data || name.isEmpty() || name.isNull())
+		return false;
 
-    return obs_data_has_user_value(data, name.toUtf8());
+	return obs_data_has_user_value(data, name.toUtf8());
 }

src/WSRequestHandler.h

@@ -31,109 +31,123 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include "obs-websocket.h"
 
 class WSRequestHandler : public QObject {
-  Q_OBJECT
+	Q_OBJECT
 
-  public:
-    explicit WSRequestHandler(QWebSocket* client);
-    ~WSRequestHandler();
-    void processIncomingMessage(QString textMessage);
-    bool hasField(QString name);
+	public:
+		explicit WSRequestHandler(QWebSocket* client);
+		~WSRequestHandler();
+		void processIncomingMessage(QString textMessage);
+		bool hasField(QString name);
 
-  private:
-    QWebSocket* _client;
-    const char* _messageId;
-    const char* _requestType;
-    OBSDataAutoRelease data;
+	private:
+		QWebSocket* _client;
+		const char* _messageId;
+		const char* _requestType;
+		OBSDataAutoRelease data;
 
-    void SendOKResponse(obs_data_t* additionalFields = NULL);
-    void SendErrorResponse(const char* errorMessage);
-    void SendErrorResponse(obs_data_t* additionalFields = NULL);
-    void SendResponse(obs_data_t* response);
+		void SendOKResponse(obs_data_t* additionalFields = NULL);
+		void SendErrorResponse(const char* errorMessage);
+		void SendErrorResponse(obs_data_t* additionalFields = NULL);
+		void SendResponse(obs_data_t* response);
 
-    static QHash<QString, void(*)(WSRequestHandler*)> messageMap;
-    static QSet<QString> authNotRequired;
+		static QHash<QString, void(*)(WSRequestHandler*)> messageMap;
+		static QSet<QString> authNotRequired;
 
-    static void HandleGetVersion(WSRequestHandler* req);
-    static void HandleGetAuthRequired(WSRequestHandler* req);
-    static void HandleAuthenticate(WSRequestHandler* req);
+		static void HandleGetVersion(WSRequestHandler* req);
+		static void HandleGetAuthRequired(WSRequestHandler* req);
+		static void HandleAuthenticate(WSRequestHandler* req);
 
-    static void HandleSetHeartbeat(WSRequestHandler* req);
+		static void HandleSetHeartbeat(WSRequestHandler* req);
 
-    static void HandleSetFilenameFormatting(WSRequestHandler* req);
-    static void HandleGetFilenameFormatting(WSRequestHandler* req);
+		static void HandleSetFilenameFormatting(WSRequestHandler* req);
+		static void HandleGetFilenameFormatting(WSRequestHandler* req);
 
-    static void HandleSetCurrentScene(WSRequestHandler* req);
-    static void HandleGetCurrentScene(WSRequestHandler* req);
-    static void HandleGetSceneList(WSRequestHandler* req);
+		static void HandleSetCurrentScene(WSRequestHandler* req);
+		static void HandleGetCurrentScene(WSRequestHandler* req);
+		static void HandleGetSceneList(WSRequestHandler* req);
 
-    static void HandleSetSceneItemRender(WSRequestHandler* req);
-    static void HandleSetSceneItemPosition(WSRequestHandler* req);
-    static void HandleSetSceneItemTransform(WSRequestHandler* req);
-    static void HandleSetSceneItemCrop(WSRequestHandler* req);
-    static void HandleGetSceneItemProperties(WSRequestHandler* req);
-    static void HandleSetSceneItemProperties(WSRequestHandler* req);
-    static void HandleResetSceneItem(WSRequestHandler* req);
+		static void HandleSetSceneItemRender(WSRequestHandler* req);
+		static void HandleSetSceneItemPosition(WSRequestHandler* req);
+		static void HandleSetSceneItemTransform(WSRequestHandler* req);
+		static void HandleSetSceneItemCrop(WSRequestHandler* req);
+		static void HandleGetSceneItemProperties(WSRequestHandler* req);
+		static void HandleSetSceneItemProperties(WSRequestHandler* req);
+		static void HandleResetSceneItem(WSRequestHandler* req);
+		static void HandleDuplicateSceneItem(WSRequestHandler* req);
+		static void HandleDeleteSceneItem(WSRequestHandler* req);
+		static void HandleReorderSceneItems(WSRequestHandler* req);
 
-    static void HandleGetStreamingStatus(WSRequestHandler* req);
-    static void HandleStartStopStreaming(WSRequestHandler* req);
-    static void HandleStartStopRecording(WSRequestHandler* req);
-    static void HandleStartStreaming(WSRequestHandler* req);
-    static void HandleStopStreaming(WSRequestHandler* req);
-    static void HandleStartRecording(WSRequestHandler* req);
-    static void HandleStopRecording(WSRequestHandler* req);
+		static void HandleGetStreamingStatus(WSRequestHandler* req);
+		static void HandleStartStopStreaming(WSRequestHandler* req);
+		static void HandleStartStopRecording(WSRequestHandler* req);
+		static void HandleStartStreaming(WSRequestHandler* req);
+		static void HandleStopStreaming(WSRequestHandler* req);
+		static void HandleStartRecording(WSRequestHandler* req);
+		static void HandleStopRecording(WSRequestHandler* req);
 
-    static void HandleStartStopReplayBuffer(WSRequestHandler* req);
-    static void HandleStartReplayBuffer(WSRequestHandler* req);
-    static void HandleStopReplayBuffer(WSRequestHandler* req);
-    static void HandleSaveReplayBuffer(WSRequestHandler* req);
+		static void HandleStartStopReplayBuffer(WSRequestHandler* req);
+		static void HandleStartReplayBuffer(WSRequestHandler* req);
+		static void HandleStopReplayBuffer(WSRequestHandler* req);
+		static void HandleSaveReplayBuffer(WSRequestHandler* req);
 
-    static void HandleSetRecordingFolder(WSRequestHandler* req);
-    static void HandleGetRecordingFolder(WSRequestHandler* req);
+		static void HandleSetRecordingFolder(WSRequestHandler* req);
+		static void HandleGetRecordingFolder(WSRequestHandler* req);
 
-    static void HandleGetTransitionList(WSRequestHandler* req);
-    static void HandleGetCurrentTransition(WSRequestHandler* req);
-    static void HandleSetCurrentTransition(WSRequestHandler* req);
+		static void HandleGetTransitionList(WSRequestHandler* req);
+		static void HandleGetCurrentTransition(WSRequestHandler* req);
+		static void HandleSetCurrentTransition(WSRequestHandler* req);
 
-    static void HandleSetVolume(WSRequestHandler* req);
-    static void HandleGetVolume(WSRequestHandler* req);
-    static void HandleToggleMute(WSRequestHandler* req);
-    static void HandleSetMute(WSRequestHandler* req);
-    static void HandleGetMute(WSRequestHandler* req);
-    static void HandleSetSyncOffset(WSRequestHandler* req);
-    static void HandleGetSyncOffset(WSRequestHandler* req);
-    static void HandleGetSpecialSources(WSRequestHandler* req);
-    static void HandleGetSourcesList(WSRequestHandler* req);
-    static void HandleGetSourceTypesList(WSRequestHandler* req);
-    static void HandleGetSourceSettings(WSRequestHandler* req);
-    static void HandleSetSourceSettings(WSRequestHandler* req);
+		static void HandleSetVolume(WSRequestHandler* req);
+		static void HandleGetVolume(WSRequestHandler* req);
+		static void HandleToggleMute(WSRequestHandler* req);
+		static void HandleSetMute(WSRequestHandler* req);
+		static void HandleGetMute(WSRequestHandler* req);
+		static void HandleSetSyncOffset(WSRequestHandler* req);
+		static void HandleGetSyncOffset(WSRequestHandler* req);
+		static void HandleGetSpecialSources(WSRequestHandler* req);
+		static void HandleGetSourcesList(WSRequestHandler* req);
+		static void HandleGetSourceTypesList(WSRequestHandler* req);
+		static void HandleGetSourceSettings(WSRequestHandler* req);
+		static void HandleSetSourceSettings(WSRequestHandler* req);
 
-    static void HandleSetCurrentSceneCollection(WSRequestHandler* req);
-    static void HandleGetCurrentSceneCollection(WSRequestHandler* req);
-    static void HandleListSceneCollections(WSRequestHandler* req);
+		static void HandleGetSourceFilters(WSRequestHandler* req);
+		static void HandleAddFilterToSource(WSRequestHandler* req);
+		static void HandleRemoveFilterFromSource(WSRequestHandler* req);
+		static void HandleReorderSourceFilter(WSRequestHandler* req);
+		static void HandleMoveSourceFilter(WSRequestHandler* req);
+		static void HandleSetSourceFilterSettings(WSRequestHandler* req);
 
-    static void HandleSetCurrentProfile(WSRequestHandler* req);
-    static void HandleGetCurrentProfile(WSRequestHandler* req);
-    static void HandleListProfiles(WSRequestHandler* req);
+		static void HandleSetCurrentSceneCollection(WSRequestHandler* req);
+		static void HandleGetCurrentSceneCollection(WSRequestHandler* req);
+		static void HandleListSceneCollections(WSRequestHandler* req);
 
-    static void HandleSetStreamSettings(WSRequestHandler* req);
-    static void HandleGetStreamSettings(WSRequestHandler* req);
-    static void HandleSaveStreamSettings(WSRequestHandler* req);
+		static void HandleSetCurrentProfile(WSRequestHandler* req);
+		static void HandleGetCurrentProfile(WSRequestHandler* req);
+		static void HandleListProfiles(WSRequestHandler* req);
 
-    static void HandleSetTransitionDuration(WSRequestHandler* req);
-    static void HandleGetTransitionDuration(WSRequestHandler* req);
+		static void HandleSetStreamSettings(WSRequestHandler* req);
+		static void HandleGetStreamSettings(WSRequestHandler* req);
+		static void HandleSaveStreamSettings(WSRequestHandler* req);
 
-    static void HandleGetStudioModeStatus(WSRequestHandler* req);
-    static void HandleGetPreviewScene(WSRequestHandler* req);
-    static void HandleSetPreviewScene(WSRequestHandler* req);
-    static void HandleTransitionToProgram(WSRequestHandler* req);
-    static void HandleEnableStudioMode(WSRequestHandler* req);
-    static void HandleDisableStudioMode(WSRequestHandler* req);
-    static void HandleToggleStudioMode(WSRequestHandler* req);
+		static void HandleSetTransitionDuration(WSRequestHandler* req);
+		static void HandleGetTransitionDuration(WSRequestHandler* req);
 
-    static void HandleSetTextGDIPlusProperties(WSRequestHandler* req);
-    static void HandleGetTextGDIPlusProperties(WSRequestHandler* req);
-    static void HandleSetBrowserSourceProperties(WSRequestHandler* req);
-    static void HandleGetBrowserSourceProperties(WSRequestHandler* req);
+		static void HandleGetStudioModeStatus(WSRequestHandler* req);
+		static void HandleGetPreviewScene(WSRequestHandler* req);
+		static void HandleSetPreviewScene(WSRequestHandler* req);
+		static void HandleTransitionToProgram(WSRequestHandler* req);
+		static void HandleEnableStudioMode(WSRequestHandler* req);
+		static void HandleDisableStudioMode(WSRequestHandler* req);
+		static void HandleToggleStudioMode(WSRequestHandler* req);
+
+		static void HandleSetTextGDIPlusProperties(WSRequestHandler* req);
+		static void HandleGetTextGDIPlusProperties(WSRequestHandler* req);
+
+		static void HandleSetTextFreetype2Properties(WSRequestHandler* req);
+		static void HandleGetTextFreetype2Properties(WSRequestHandler* req);
+
+		static void HandleSetBrowserSourceProperties(WSRequestHandler* req);
+		static void HandleGetBrowserSourceProperties(WSRequestHandler* req);
 };
 
 #endif // WSPROTOCOL_H

src/WSRequestHandler_General.cpp

@@ -20,24 +20,24 @@
  * @since 0.3
  */
  void WSRequestHandler::HandleGetVersion(WSRequestHandler* req) {
-    QString obsVersion = Utils::OBSVersionString();
+	QString obsVersion = Utils::OBSVersionString();
 
-    QList<QString> names = req->messageMap.keys();
-    names.sort(Qt::CaseInsensitive);
+	QList<QString> names = req->messageMap.keys();
+	names.sort(Qt::CaseInsensitive);
 
-    // (Palakis) OBS' data arrays only support object arrays, so I improvised.
-    QString requests;
-    requests += names.takeFirst();
-    for (QString reqName : names) {
-        requests += ("," + reqName);
-    }
+	// (Palakis) OBS' data arrays only support object arrays, so I improvised.
+	QString requests;
+	requests += names.takeFirst();
+	for (QString reqName : names) {
+		requests += ("," + reqName);
+	}
 
-    OBSDataAutoRelease data = obs_data_create();
-    obs_data_set_string(data, "obs-websocket-version", OBS_WEBSOCKET_VERSION);
-    obs_data_set_string(data, "obs-studio-version", obsVersion.toUtf8());
-    obs_data_set_string(data, "available-requests", requests.toUtf8());
+	OBSDataAutoRelease data = obs_data_create();
+	obs_data_set_string(data, "obs-websocket-version", OBS_WEBSOCKET_VERSION);
+	obs_data_set_string(data, "obs-studio-version", obsVersion.toUtf8());
+	obs_data_set_string(data, "available-requests", requests.toUtf8());
 
-    req->SendOKResponse(data);
+	req->SendOKResponse(data);
 }
 
 /**
@@ -54,19 +54,19 @@
  * @since 0.3
  */
 void WSRequestHandler::HandleGetAuthRequired(WSRequestHandler* req) {
-    bool authRequired = Config::Current()->AuthRequired;
+	bool authRequired = Config::Current()->AuthRequired;
 
-    OBSDataAutoRelease data = obs_data_create();
-    obs_data_set_bool(data, "authRequired", authRequired);
+	OBSDataAutoRelease data = obs_data_create();
+	obs_data_set_bool(data, "authRequired", authRequired);
 
-    if (authRequired) {
-        obs_data_set_string(data, "challenge",
-            Config::Current()->SessionChallenge.toUtf8());
-        obs_data_set_string(data, "salt",
-            Config::Current()->Salt.toUtf8());
-    }
+	if (authRequired) {
+		obs_data_set_string(data, "challenge",
+			Config::Current()->SessionChallenge.toUtf8());
+		obs_data_set_string(data, "salt",
+			Config::Current()->Salt.toUtf8());
+	}
 
-    req->SendOKResponse(data);
+	req->SendOKResponse(data);
 }
 
 /**
@@ -80,25 +80,25 @@ void WSRequestHandler::HandleGetAuthRequired(WSRequestHandler* req) {
  * @since 0.3
  */
 void WSRequestHandler::HandleAuthenticate(WSRequestHandler* req) {
-    if (!req->hasField("auth")) {
-        req->SendErrorResponse("missing request parameters");
-        return;
-    }
+	if (!req->hasField("auth")) {
+		req->SendErrorResponse("missing request parameters");
+		return;
+	}
 
-    QString auth = obs_data_get_string(req->data, "auth");
-    if (auth.isEmpty()) {
-        req->SendErrorResponse("auth not specified!");
-        return;
-    }
+	QString auth = obs_data_get_string(req->data, "auth");
+	if (auth.isEmpty()) {
+		req->SendErrorResponse("auth not specified!");
+		return;
+	}
 
-    if ((req->_client->property(PROP_AUTHENTICATED).toBool() == false)
-        && Config::Current()->CheckAuth(auth))
-    {
-        req->_client->setProperty(PROP_AUTHENTICATED, true);
-        req->SendOKResponse();
-    } else {
-        req->SendErrorResponse("Authentication Failed.");
-    }
+	if ((req->_client->property(PROP_AUTHENTICATED).toBool() == false)
+		&& Config::Current()->CheckAuth(auth))
+	{
+		req->_client->setProperty(PROP_AUTHENTICATED, true);
+		req->SendOKResponse();
+	} else {
+		req->SendErrorResponse("Authentication Failed.");
+	}
 }
 
 /**
@@ -112,18 +112,18 @@ void WSRequestHandler::HandleAuthenticate(WSRequestHandler* req) {
  * @since 4.3.0
  */
  void WSRequestHandler::HandleSetHeartbeat(WSRequestHandler* req) {
-    if (!req->hasField("enable")) {
-        req->SendErrorResponse("Heartbeat <enable> parameter missing");
-        return;
-    }
+	if (!req->hasField("enable")) {
+		req->SendErrorResponse("Heartbeat <enable> parameter missing");
+		return;
+	}
 
-    WSEvents::Instance->HeartbeatIsActive =
-        obs_data_get_bool(req->data, "enable");
+	WSEvents::Instance->HeartbeatIsActive =
+		obs_data_get_bool(req->data, "enable");
 
-    OBSDataAutoRelease response = obs_data_create();
-    obs_data_set_bool(response, "enable",
-        WSEvents::Instance->HeartbeatIsActive);
-    req->SendOKResponse(response);
+	OBSDataAutoRelease response = obs_data_create();
+	obs_data_set_bool(response, "enable",
+		WSEvents::Instance->HeartbeatIsActive);
+	req->SendOKResponse(response);
 }
 
 /**
@@ -137,18 +137,18 @@ void WSRequestHandler::HandleAuthenticate(WSRequestHandler* req) {
  * @since 4.3.0
  */
 void WSRequestHandler::HandleSetFilenameFormatting(WSRequestHandler* req) {
-    if (!req->hasField("filename-formatting")) {
-        req->SendErrorResponse("<filename-formatting> parameter missing");
-        return;
-    }
+	if (!req->hasField("filename-formatting")) {
+		req->SendErrorResponse("<filename-formatting> parameter missing");
+		return;
+	}
 
-    QString filenameFormatting = obs_data_get_string(req->data, "filename-formatting");
-    if (!filenameFormatting.isEmpty()) {
-        Utils::SetFilenameFormatting(filenameFormatting.toUtf8());
-        req->SendOKResponse();
-    } else {
-        req->SendErrorResponse("invalid request parameters");
-    }
+	QString filenameFormatting = obs_data_get_string(req->data, "filename-formatting");
+	if (!filenameFormatting.isEmpty()) {
+		Utils::SetFilenameFormatting(filenameFormatting.toUtf8());
+		req->SendOKResponse();
+	} else {
+		req->SendErrorResponse("invalid request parameters");
+	}
 }
 
 /**
@@ -162,7 +162,7 @@ void WSRequestHandler::HandleSetFilenameFormatting(WSRequestHandler* req) {
  * @since 4.3.0
  */
 void WSRequestHandler::HandleGetFilenameFormatting(WSRequestHandler* req) {
-    OBSDataAutoRelease response = obs_data_create();
-    obs_data_set_string(response, "filename-formatting", Utils::GetFilenameFormatting());
-    req->SendOKResponse(response);
+	OBSDataAutoRelease response = obs_data_create();
+	obs_data_set_string(response, "filename-formatting", Utils::GetFilenameFormatting());
+	req->SendOKResponse(response);
 }

src/WSRequestHandler_Profiles.cpp

@@ -14,19 +14,19 @@
  * @since 4.0.0
  */
  void WSRequestHandler::HandleSetCurrentProfile(WSRequestHandler* req) {
-    if (!req->hasField("profile-name")) {
-        req->SendErrorResponse("missing request parameters");
-        return;
-    }
+	if (!req->hasField("profile-name")) {
+		req->SendErrorResponse("missing request parameters");
+		return;
+	}
 
-    QString profileName = obs_data_get_string(req->data, "profile-name");
-    if (!profileName.isEmpty()) {
-        // TODO : check if profile exists
-        obs_frontend_set_current_profile(profileName.toUtf8());
-        req->SendOKResponse();
-    } else {
-        req->SendErrorResponse("invalid request parameters");
-    }
+	QString profileName = obs_data_get_string(req->data, "profile-name");
+	if (!profileName.isEmpty()) {
+		// TODO : check if profile exists
+		obs_frontend_set_current_profile(profileName.toUtf8());
+		req->SendOKResponse();
+	} else {
+		req->SendErrorResponse("invalid request parameters");
+	}
 }
 
  /**
@@ -40,17 +40,17 @@
  * @since 4.0.0
  */
 void WSRequestHandler::HandleGetCurrentProfile(WSRequestHandler* req) {
-    OBSDataAutoRelease response = obs_data_create();
-    obs_data_set_string(response, "profile-name",
-        obs_frontend_get_current_profile());
+	OBSDataAutoRelease response = obs_data_create();
+	obs_data_set_string(response, "profile-name",
+		obs_frontend_get_current_profile());
 
-    req->SendOKResponse(response);
+	req->SendOKResponse(response);
 }
 
 /**
  * Get a list of available profiles.
  *
- * @return {Object|Array} `profiles` List of available profiles.
+ * @return {Array<Object>} `profiles` List of available profiles.
  *
  * @api requests
  * @name ListProfiles
@@ -58,13 +58,13 @@ void WSRequestHandler::HandleGetCurrentProfile(WSRequestHandler* req) {
  * @since 4.0.0
  */
 void WSRequestHandler::HandleListProfiles(WSRequestHandler* req) {
-    char** profiles = obs_frontend_get_profiles();
-    OBSDataArrayAutoRelease list =
-        Utils::StringListToArray(profiles, "profile-name");
-    bfree(profiles);
+	char** profiles = obs_frontend_get_profiles();
+	OBSDataArrayAutoRelease list =
+		Utils::StringListToArray(profiles, "profile-name");
+	bfree(profiles);
 
-    OBSDataAutoRelease response = obs_data_create();
-    obs_data_set_array(response, "profiles", list);
+	OBSDataAutoRelease response = obs_data_create();
+	obs_data_set_array(response, "profiles", list);
 
-    req->SendOKResponse(response);
+	req->SendOKResponse(response);
 }

src/WSRequestHandler_Recording.cpp

@@ -12,12 +12,12 @@
  * @since 0.3
  */
  void WSRequestHandler::HandleStartStopRecording(WSRequestHandler* req) {
-    if (obs_frontend_recording_active())
-        obs_frontend_recording_stop();
-    else
-        obs_frontend_recording_start();
+	if (obs_frontend_recording_active())
+		obs_frontend_recording_stop();
+	else
+		obs_frontend_recording_start();
 
-    req->SendOKResponse();
+	req->SendOKResponse();
 }
 
 /**
@@ -30,12 +30,12 @@
  * @since 4.1.0
  */
  void WSRequestHandler::HandleStartRecording(WSRequestHandler* req) {
-    if (obs_frontend_recording_active() == false) {
-        obs_frontend_recording_start();
-        req->SendOKResponse();
-    } else {
-        req->SendErrorResponse("recording already active");
-    }
+	if (obs_frontend_recording_active() == false) {
+		obs_frontend_recording_start();
+		req->SendOKResponse();
+	} else {
+		req->SendErrorResponse("recording already active");
+	}
 }
 
 /**
@@ -48,12 +48,12 @@
  * @since 4.1.0
  */
 void WSRequestHandler::HandleStopRecording(WSRequestHandler* req) {
-    if (obs_frontend_recording_active() == true) {
-        obs_frontend_recording_stop();
-        req->SendOKResponse();
-    } else {
-        req->SendErrorResponse("recording not active");
-    }
+	if (obs_frontend_recording_active() == true) {
+		obs_frontend_recording_stop();
+		req->SendOKResponse();
+	} else {
+		req->SendErrorResponse("recording not active");
+	}
 }
 
 /**
@@ -67,17 +67,17 @@ void WSRequestHandler::HandleStopRecording(WSRequestHandler* req) {
  * @since 4.1.0
  */
  void WSRequestHandler::HandleSetRecordingFolder(WSRequestHandler* req) {
-    if (!req->hasField("rec-folder")) {
-        req->SendErrorResponse("missing request parameters");
-        return;
-    }
+	if (!req->hasField("rec-folder")) {
+		req->SendErrorResponse("missing request parameters");
+		return;
+	}
 
-    const char* newRecFolder = obs_data_get_string(req->data, "rec-folder");
-    bool success = Utils::SetRecordingFolder(newRecFolder);
-    if (success)
-        req->SendOKResponse();
-    else
-        req->SendErrorResponse("invalid request parameters");
+	const char* newRecFolder = obs_data_get_string(req->data, "rec-folder");
+	bool success = Utils::SetRecordingFolder(newRecFolder);
+	if (success)
+		req->SendOKResponse();
+	else
+		req->SendErrorResponse("invalid request parameters");
 }
 
 /**
@@ -91,10 +91,10 @@ void WSRequestHandler::HandleStopRecording(WSRequestHandler* req) {
  * @since 4.1.0
  */
 void WSRequestHandler::HandleGetRecordingFolder(WSRequestHandler* req) {
-    const char* recFolder = Utils::GetRecordingFolder();
+	const char* recFolder = Utils::GetRecordingFolder();
 
-    OBSDataAutoRelease response = obs_data_create();
-    obs_data_set_string(response, "rec-folder", recFolder);
+	OBSDataAutoRelease response = obs_data_create();
+	obs_data_set_string(response, "rec-folder", recFolder);
 
-    req->SendOKResponse(response);
+	req->SendOKResponse(response);
 }

src/WSRequestHandler_ReplayBuffer.cpp

@@ -12,12 +12,12 @@
 * @since 4.2.0
 */
 void WSRequestHandler::HandleStartStopReplayBuffer(WSRequestHandler* req) {
-    if (obs_frontend_replay_buffer_active()) {
-        obs_frontend_replay_buffer_stop();
-    } else {
-        Utils::StartReplayBuffer();
-    }
-    req->SendOKResponse();
+	if (obs_frontend_replay_buffer_active()) {
+		obs_frontend_replay_buffer_stop();
+	} else {
+		Utils::StartReplayBuffer();
+	}
+	req->SendOKResponse();
 }
 
 /**
@@ -33,18 +33,18 @@ void WSRequestHandler::HandleStartStopReplayBuffer(WSRequestHandler* req) {
 * @since 4.2.0
 */
 void WSRequestHandler::HandleStartReplayBuffer(WSRequestHandler* req) {
-    if (!Utils::ReplayBufferEnabled()) {
-        req->SendErrorResponse("replay buffer disabled in settings");
-        return;
-    }
+	if (!Utils::ReplayBufferEnabled()) {
+		req->SendErrorResponse("replay buffer disabled in settings");
+		return;
+	}
 
-    if (obs_frontend_replay_buffer_active() == true) {
-        req->SendErrorResponse("replay buffer already active");
-        return;
-    }
+	if (obs_frontend_replay_buffer_active() == true) {
+		req->SendErrorResponse("replay buffer already active");
+		return;
+	}
 
-    Utils::StartReplayBuffer();
-    req->SendOKResponse();
+	Utils::StartReplayBuffer();
+	req->SendOKResponse();
 }
 
 /**
@@ -57,12 +57,12 @@ void WSRequestHandler::HandleStartReplayBuffer(WSRequestHandler* req) {
 * @since 4.2.0
 */
 void WSRequestHandler::HandleStopReplayBuffer(WSRequestHandler* req) {
-    if (obs_frontend_replay_buffer_active() == true) {
-        obs_frontend_replay_buffer_stop();
-        req->SendOKResponse();
-    } else {
-        req->SendErrorResponse("replay buffer not active");
-    }
+	if (obs_frontend_replay_buffer_active() == true) {
+		obs_frontend_replay_buffer_stop();
+		req->SendOKResponse();
+	} else {
+		req->SendErrorResponse("replay buffer not active");
+	}
 }
 
 /**
@@ -76,17 +76,17 @@ void WSRequestHandler::HandleStopReplayBuffer(WSRequestHandler* req) {
 * @since 4.2.0
 */
 void WSRequestHandler::HandleSaveReplayBuffer(WSRequestHandler* req) {
-    if (!obs_frontend_replay_buffer_active()) {
-        req->SendErrorResponse("replay buffer not active");
-        return;
-    }
+	if (!obs_frontend_replay_buffer_active()) {
+		req->SendErrorResponse("replay buffer not active");
+		return;
+	}
 
-    OBSOutputAutoRelease replayOutput = obs_frontend_get_replay_buffer_output();
+	OBSOutputAutoRelease replayOutput = obs_frontend_get_replay_buffer_output();
 
-    calldata_t cd = { 0 };
-    proc_handler_t* ph = obs_output_get_proc_handler(replayOutput);
-    proc_handler_call(ph, "save", &cd);
-    calldata_free(&cd);
+	calldata_t cd = { 0 };
+	proc_handler_t* ph = obs_output_get_proc_handler(replayOutput);
+	proc_handler_call(ph, "save", &cd);
+	calldata_free(&cd);
 
-    req->SendOKResponse();
+	req->SendOKResponse();
 }

src/WSRequestHandler_SceneCollections.cpp

@@ -14,19 +14,19 @@
  * @since 4.0.0
  */
  void WSRequestHandler::HandleSetCurrentSceneCollection(WSRequestHandler* req) {
-    if (!req->hasField("sc-name")) {
-        req->SendErrorResponse("missing request parameters");
-        return;
-    }
+	if (!req->hasField("sc-name")) {
+		req->SendErrorResponse("missing request parameters");
+		return;
+	}
 
-    QString sceneCollection = obs_data_get_string(req->data, "sc-name");
-    if (!sceneCollection.isEmpty()) {
-        // TODO : Check if specified profile exists and if changing is allowed
-        obs_frontend_set_current_scene_collection(sceneCollection.toUtf8());
-        req->SendOKResponse();
-    } else {
-        req->SendErrorResponse("invalid request parameters");
-    }
+	QString sceneCollection = obs_data_get_string(req->data, "sc-name");
+	if (!sceneCollection.isEmpty()) {
+		// TODO : Check if specified profile exists and if changing is allowed
+		obs_frontend_set_current_scene_collection(sceneCollection.toUtf8());
+		req->SendOKResponse();
+	} else {
+		req->SendErrorResponse("invalid request parameters");
+	}
 }
 
 /**
@@ -40,18 +40,17 @@
  * @since 4.0.0
  */
 void WSRequestHandler::HandleGetCurrentSceneCollection(WSRequestHandler* req) {
-    OBSDataAutoRelease response = obs_data_create();
-    obs_data_set_string(response, "sc-name",
-        obs_frontend_get_current_scene_collection());
+	OBSDataAutoRelease response = obs_data_create();
+	obs_data_set_string(response, "sc-name",
+		obs_frontend_get_current_scene_collection());
 
-    req->SendOKResponse(response);
+	req->SendOKResponse(response);
 }
 
 /**
  * List available scene collections
  *
- * @return {Object|Array} `scene-collections` Scene collections list
- * @return {String} `scene-collections.*.`
+ * @return {Array<String>} `scene-collections` Scene collections list
  *
  * @api requests
  * @name ListSceneCollections
@@ -59,13 +58,13 @@ void WSRequestHandler::HandleGetCurrentSceneCollection(WSRequestHandler* req) {
  * @since 4.0.0
  */
 void WSRequestHandler::HandleListSceneCollections(WSRequestHandler* req) {
-    char** sceneCollections = obs_frontend_get_scene_collections();
-    OBSDataArrayAutoRelease list =
-        Utils::StringListToArray(sceneCollections, "sc-name");
-    bfree(sceneCollections);
+	char** sceneCollections = obs_frontend_get_scene_collections();
+	OBSDataArrayAutoRelease list =
+		Utils::StringListToArray(sceneCollections, "sc-name");
+	bfree(sceneCollections);
 
-    OBSDataAutoRelease response = obs_data_create();
-    obs_data_set_array(response, "scene-collections", list);
+	OBSDataAutoRelease response = obs_data_create();
+	obs_data_set_array(response, "scene-collections", list);
 
-    req->SendOKResponse(response);
+	req->SendOKResponse(response);
 }

src/WSRequestHandler_SceneItems.cpp

@@ -322,7 +322,7 @@ void WSRequestHandler::HandleSetSceneItemProperties(WSRequestHandler* req) {
 /**
 * Reset a scene item.
 *
-* @param {String (optional)} `scene-name` Name of the scene the source belogns to. Defaults to the current scene.
+* @param {String (optional)} `scene-name` Name of the scene the source belongs to. Defaults to the current scene.
 * @param {String} `item` Name of the source item.
 *
 * @api requests
@@ -566,3 +566,124 @@ void WSRequestHandler::HandleSetSceneItemCrop(WSRequestHandler* req) {
 		req->SendErrorResponse("specified scene item doesn't exist");
 	}
 }
+
+/**
+ * Deletes a scene item.
+ *
+ * @param {String (optional)} `scene` Name of the scene the source belongs to. Defaults to the current scene.
+ * @param {Object} `item` item to delete (required)
+ * @param {String} `item.name` name of the scene item (prefer `id`, including both is acceptable).
+ * @param {int} `item.id` id of the scene item.
+ *
+ * @api requests
+ * @name DeleteSceneItem
+ * @category scene items
+ * @since 4.5.0
+ */
+void WSRequestHandler::HandleDeleteSceneItem(WSRequestHandler* req) {
+	if (!req->hasField("item")) {
+		req->SendErrorResponse("missing request parameters");
+		return;
+	}
+
+	const char* sceneName = obs_data_get_string(req->data, "scene");
+	OBSSourceAutoRelease scene = Utils::GetSceneFromNameOrCurrent(sceneName);
+	if (!scene) {
+		req->SendErrorResponse("requested scene doesn't exist");
+		return;
+	}
+
+	OBSDataAutoRelease item = obs_data_get_obj(req->data, "item");
+	OBSSceneItemAutoRelease sceneItem = Utils::GetSceneItemFromItem(scene, item);
+	if (!sceneItem) {
+		req->SendErrorResponse("item with id/name combination not found in specified scene");
+		return;
+	}
+
+	obs_sceneitem_remove(sceneItem);
+
+	req->SendOKResponse();
+}
+
+struct DuplicateSceneItemData {
+	obs_sceneitem_t *referenceItem;
+	obs_source_t *fromSource;
+	obs_sceneitem_t *newItem;
+};
+
+static void DuplicateSceneItem(void *_data, obs_scene_t *scene) {
+	DuplicateSceneItemData *data = (DuplicateSceneItemData *)_data;
+	data->newItem = obs_scene_add(scene, data->fromSource);
+	obs_sceneitem_set_visible(data->newItem, obs_sceneitem_visible(data->referenceItem));
+}
+
+/**
+ * Duplicates a scene item.
+ *
+ * @param {String (optional)} `fromScene` Name of the scene to copy the item from. Defaults to the current scene.
+ * @param {String (optional)} `toScene` Name of the scene to create the item in. Defaults to the current scene.
+ * @param {Object} `item` item to duplicate (required)
+ * @param {String} `item.name` name of the scene item (prefer `id`, including both is acceptable).
+ * @param {int} `item.id` id of the scene item.
+ *
+ * @return {String} `scene` Name of the scene where the new item was created
+ * @return {Object} `item` New item info
+ * @return {int} `̀item.id` New item ID
+ * @return {String} `item.name` New item name
+ * 
+ * @api requests
+ * @name DuplicateSceneItem
+ * @category scene items
+ * @since 4.5.0
+ */
+void WSRequestHandler::HandleDuplicateSceneItem(WSRequestHandler* req) {
+	if (!req->hasField("item")) {
+		req->SendErrorResponse("missing request parameters");
+		return;
+	}
+
+	const char* fromSceneName = obs_data_get_string(req->data, "fromScene");
+	OBSSourceAutoRelease fromScene = Utils::GetSceneFromNameOrCurrent(fromSceneName);
+	if (!fromScene) {
+		req->SendErrorResponse("requested fromScene doesn't exist");
+		return;
+	}
+
+	const char* toSceneName = obs_data_get_string(req->data, "toScene");
+	OBSSourceAutoRelease toScene = Utils::GetSceneFromNameOrCurrent(toSceneName);
+	if (!toScene) {
+		req->SendErrorResponse("requested toScene doesn't exist");
+		return;
+	}
+
+	OBSDataAutoRelease item = obs_data_get_obj(req->data, "item");
+	OBSSceneItemAutoRelease referenceItem = Utils::GetSceneItemFromItem(fromScene, item);
+	if (!referenceItem) {
+		req->SendErrorResponse("item with id/name combination not found in specified scene");
+		return;
+	}
+
+	DuplicateSceneItemData data;
+	data.fromSource = obs_sceneitem_get_source(referenceItem);
+	data.referenceItem = referenceItem;
+
+	obs_enter_graphics();
+	obs_scene_atomic_update(obs_scene_from_source(toScene), DuplicateSceneItem, &data);
+	obs_leave_graphics();
+
+	obs_sceneitem_t *newItem = data.newItem;
+	if (!newItem) {
+		req->SendErrorResponse("Error duplicating scene item");
+		return;
+	}
+
+	OBSDataAutoRelease itemData = obs_data_create();
+	obs_data_set_int(itemData, "id", obs_sceneitem_get_id(newItem));
+	obs_data_set_string(itemData, "name", obs_source_get_name(obs_sceneitem_get_source(newItem)));
+
+	OBSDataAutoRelease responseData = obs_data_create();
+	obs_data_set_obj(responseData, "item", itemData);
+	obs_data_set_string(responseData, "scene", obs_source_get_name(toScene));
+
+	req->SendOKResponse(responseData);
+}

src/WSRequestHandler_Scenes.cpp

@@ -3,6 +3,12 @@
 
 #include "WSRequestHandler.h"
 
+/**
+* @typedef {Object} `Scene`
+* @property {String} `name` Name of the currently active scene.
+* @property {Array<Source>} `sources` Ordered list of the current scene's source items.
+*/
+
 /**
  * Switch to the specified scene.
  *
@@ -14,27 +20,27 @@
  * @since 0.3
  */
  void WSRequestHandler::HandleSetCurrentScene(WSRequestHandler* req) {
-    if (!req->hasField("scene-name")) {
-        req->SendErrorResponse("missing request parameters");
-        return;
-    }
+	if (!req->hasField("scene-name")) {
+		req->SendErrorResponse("missing request parameters");
+		return;
+	}
 
-    const char* sceneName = obs_data_get_string(req->data, "scene-name");
-    OBSSourceAutoRelease source = obs_get_source_by_name(sceneName);
+	const char* sceneName = obs_data_get_string(req->data, "scene-name");
+	OBSSourceAutoRelease source = obs_get_source_by_name(sceneName);
 
-    if (source) {
-        obs_frontend_set_current_scene(source);
-        req->SendOKResponse();
-    } else {
-        req->SendErrorResponse("requested scene does not exist");
-    }
+	if (source) {
+		obs_frontend_set_current_scene(source);
+		req->SendOKResponse();
+	} else {
+		req->SendErrorResponse("requested scene does not exist");
+	}
 }
 
 /**
  * Get the current scene's name and source items.
  * 
  * @return {String} `name` Name of the currently active scene.
- * @return {Source|Array} `sources` Ordered list of the current scene's source items.
+ * @return {Array<Source>} `sources` Ordered list of the current scene's source items.
  *
  * @api requests
  * @name GetCurrentScene
@@ -42,21 +48,21 @@
  * @since 0.3
  */
 void WSRequestHandler::HandleGetCurrentScene(WSRequestHandler* req) {
-    OBSSourceAutoRelease currentScene = obs_frontend_get_current_scene();
-    OBSDataArrayAutoRelease sceneItems = Utils::GetSceneItems(currentScene);
+	OBSSourceAutoRelease currentScene = obs_frontend_get_current_scene();
+	OBSDataArrayAutoRelease sceneItems = Utils::GetSceneItems(currentScene);
 
-    OBSDataAutoRelease data = obs_data_create();
-    obs_data_set_string(data, "name", obs_source_get_name(currentScene));
-    obs_data_set_array(data, "sources", sceneItems);
+	OBSDataAutoRelease data = obs_data_create();
+	obs_data_set_string(data, "name", obs_source_get_name(currentScene));
+	obs_data_set_array(data, "sources", sceneItems);
 
-    req->SendOKResponse(data);
+	req->SendOKResponse(data);
 }
 
 /**
  * Get a list of scenes in the currently active profile.
  * 
  * @return {String} `current-scene` Name of the currently active scene.
- * @return {Scene|Array} `scenes` Ordered list of the current profile's scenes (See `[GetCurrentScene](#getcurrentscene)` for more information).
+ * @return {Array<Scene>} `scenes` Ordered list of the current profile's scenes (See `[GetCurrentScene](#getcurrentscene)` for more information).
  *
  * @api requests
  * @name GetSceneList
@@ -64,13 +70,79 @@ void WSRequestHandler::HandleGetCurrentScene(WSRequestHandler* req) {
  * @since 0.3
  */
 void WSRequestHandler::HandleGetSceneList(WSRequestHandler* req) {
-    OBSSourceAutoRelease currentScene = obs_frontend_get_current_scene();
-    OBSDataArrayAutoRelease scenes = Utils::GetScenes();
+	OBSSourceAutoRelease currentScene = obs_frontend_get_current_scene();
+	OBSDataArrayAutoRelease scenes = Utils::GetScenes();
 
-    OBSDataAutoRelease data = obs_data_create();
-    obs_data_set_string(data, "current-scene",
-        obs_source_get_name(currentScene));
-    obs_data_set_array(data, "scenes", scenes);
+	OBSDataAutoRelease data = obs_data_create();
+	obs_data_set_string(data, "current-scene",
+		obs_source_get_name(currentScene));
+	obs_data_set_array(data, "scenes", scenes);
 
-    req->SendOKResponse(data);
+	req->SendOKResponse(data);
+}
+
+/**
+* Changes the order of scene items in the requested scene.
+*
+* @param {String (optional)} `scene` Name of the scene to reorder (defaults to current).
+* @param {Array<Scene>} `items` Ordered list of objects with name and/or id specified. Id preferred due to uniqueness per scene
+* @param {int (optional)} `items[].id` Id of a specific scene item. Unique on a scene by scene basis.
+* @param {String (optional)} `items[].name` Name of a scene item. Sufficiently unique if no scene items share sources within the scene.
+*
+* @api requests
+* @name ReorderSceneItems
+* @category scenes
+* @since 4.5.0
+*/
+void WSRequestHandler::HandleReorderSceneItems(WSRequestHandler* req) {
+	QString sceneName = obs_data_get_string(req->data, "scene");
+	OBSSourceAutoRelease scene = Utils::GetSceneFromNameOrCurrent(sceneName);
+	if (!scene) {
+		req->SendErrorResponse("requested scene doesn't exist");
+		return;
+	}
+
+	OBSDataArrayAutoRelease items = obs_data_get_array(req->data, "items");
+	if (!items) {
+		req->SendErrorResponse("sceneItem order not specified");
+		return;
+	}
+
+	size_t count = obs_data_array_count(items);
+
+	std::vector<obs_sceneitem_t*> newOrder;
+	newOrder.reserve(count);
+
+	for (size_t i = 0; i < count; ++i) {
+		OBSDataAutoRelease item = obs_data_array_item(items, i);
+
+		OBSSceneItemAutoRelease sceneItem = Utils::GetSceneItemFromItem(scene, item);
+		obs_sceneitem_release(sceneItem); // ref dec
+
+		if (!sceneItem) {
+			req->SendErrorResponse("Invalid sceneItem id or name specified");
+			return;
+		}
+		
+		for (size_t j = 0; j <= i; ++j) {
+			if (sceneItem == newOrder[j]) {
+				req->SendErrorResponse("Duplicate sceneItem in specified order");
+				return;
+			}
+		}
+
+		newOrder.push_back(sceneItem);
+	}
+
+	bool success = obs_scene_reorder_items(obs_scene_from_source(scene), newOrder.data(), count);
+	if (!success) {
+		req->SendErrorResponse("Invalid sceneItem order");
+		return;
+	}
+
+	for (auto const& item: newOrder) {
+		obs_sceneitem_release(item);
+	}
+
+	req->SendOKResponse();
 }

src/WSRequestHandler_Streaming.cpp

@@ -21,25 +21,25 @@
  * @since 0.3
  */
  void WSRequestHandler::HandleGetStreamingStatus(WSRequestHandler* req) {
-    OBSDataAutoRelease data = obs_data_create();
-    obs_data_set_bool(data, "streaming", obs_frontend_streaming_active());
-    obs_data_set_bool(data, "recording", obs_frontend_recording_active());
-    obs_data_set_bool(data, "preview-only", false);
+	OBSDataAutoRelease data = obs_data_create();
+	obs_data_set_bool(data, "streaming", obs_frontend_streaming_active());
+	obs_data_set_bool(data, "recording", obs_frontend_recording_active());
+	obs_data_set_bool(data, "preview-only", false);
 
-    const char* tc = nullptr;
-    if (obs_frontend_streaming_active()) {
-        tc = WSEvents::Instance->GetStreamingTimecode();
-        obs_data_set_string(data, "stream-timecode", tc);
-        bfree((void*)tc);
-    }
+	const char* tc = nullptr;
+	if (obs_frontend_streaming_active()) {
+		tc = WSEvents::Instance->GetStreamingTimecode();
+		obs_data_set_string(data, "stream-timecode", tc);
+		bfree((void*)tc);
+	}
 
-    if (obs_frontend_recording_active()) {
-        tc = WSEvents::Instance->GetRecordingTimecode();
-        obs_data_set_string(data, "rec-timecode", tc);
-        bfree((void*)tc);
-    }
+	if (obs_frontend_recording_active()) {
+		tc = WSEvents::Instance->GetRecordingTimecode();
+		obs_data_set_string(data, "rec-timecode", tc);
+		bfree((void*)tc);
+	}
 
-    req->SendOKResponse(data);
+	req->SendOKResponse(data);
 }
 
 /**
@@ -51,10 +51,10 @@
  * @since 0.3
  */
  void WSRequestHandler::HandleStartStopStreaming(WSRequestHandler* req) {
-    if (obs_frontend_streaming_active())
-        HandleStopStreaming(req);
-    else
-        HandleStartStreaming(req);
+	if (obs_frontend_streaming_active())
+		HandleStopStreaming(req);
+	else
+		HandleStartStreaming(req);
 }
 
 /**
@@ -77,90 +77,90 @@
  * @since 4.1.0
  */
  void WSRequestHandler::HandleStartStreaming(WSRequestHandler* req) {
-    if (obs_frontend_streaming_active() == false) {
-        OBSService configuredService = obs_frontend_get_streaming_service();
-        OBSService newService = nullptr;
+	if (obs_frontend_streaming_active() == false) {
+		OBSService configuredService = obs_frontend_get_streaming_service();
+		OBSService newService = nullptr;
 
-        // TODO: fix service memory leak
+		// TODO: fix service memory leak
 
-        if (req->hasField("stream")) {
-            OBSDataAutoRelease streamData = obs_data_get_obj(req->data, "stream");
-            OBSDataAutoRelease newSettings = obs_data_get_obj(streamData, "settings");
-            OBSDataAutoRelease newMetadata = obs_data_get_obj(streamData, "metadata");
+		if (req->hasField("stream")) {
+			OBSDataAutoRelease streamData = obs_data_get_obj(req->data, "stream");
+			OBSDataAutoRelease newSettings = obs_data_get_obj(streamData, "settings");
+			OBSDataAutoRelease newMetadata = obs_data_get_obj(streamData, "metadata");
 
-            OBSDataAutoRelease csHotkeys =
-                obs_hotkeys_save_service(configuredService);
+			OBSDataAutoRelease csHotkeys =
+				obs_hotkeys_save_service(configuredService);
 
-            QString currentType = obs_service_get_type(configuredService);
-            QString newType = obs_data_get_string(streamData, "type");
-            if (newType.isEmpty() || newType.isNull()) {
-                newType = currentType;
-            }
+			QString currentType = obs_service_get_type(configuredService);
+			QString newType = obs_data_get_string(streamData, "type");
+			if (newType.isEmpty() || newType.isNull()) {
+				newType = currentType;
+			}
 
-            //Supporting adding metadata parameters to key query string
-            QString query = Utils::ParseDataToQueryString(newMetadata);
-            if (!query.isEmpty()
-                    && obs_data_has_user_value(newSettings, "key"))
-            {
-                const char* key = obs_data_get_string(newSettings, "key");
-                int keylen = strlen(key);
+			//Supporting adding metadata parameters to key query string
+			QString query = Utils::ParseDataToQueryString(newMetadata);
+			if (!query.isEmpty()
+					&& obs_data_has_user_value(newSettings, "key"))
+			{
+				const char* key = obs_data_get_string(newSettings, "key");
+				int keylen = strlen(key);
 
-                bool hasQuestionMark = false;
-                for (int i = 0; i < keylen; i++) {
-                    if (key[i] == '?') {
-                        hasQuestionMark = true;
-                        break;
-                    }
-                }
+				bool hasQuestionMark = false;
+				for (int i = 0; i < keylen; i++) {
+					if (key[i] == '?') {
+						hasQuestionMark = true;
+						break;
+					}
+				}
 
-                if (hasQuestionMark) {
-                    query.prepend('&');
-                } else {
-                    query.prepend('?');
-                }
+				if (hasQuestionMark) {
+					query.prepend('&');
+				} else {
+					query.prepend('?');
+				}
 
-                query.prepend(key);
-                obs_data_set_string(newSettings, "key", query.toUtf8());
-            }
+				query.prepend(key);
+				obs_data_set_string(newSettings, "key", query.toUtf8());
+			}
 
-            if (newType == currentType) {
-                // Service type doesn't change: apply settings to current service
+			if (newType == currentType) {
+				// Service type doesn't change: apply settings to current service
 
-                // By doing this, you can send a request to the websocket
-                // that only contains settings you want to change, instead of
-                // having to do a get and then change them
+				// By doing this, you can send a request to the websocket
+				// that only contains settings you want to change, instead of
+				// having to do a get and then change them
 
-                OBSDataAutoRelease currentSettings = obs_service_get_settings(configuredService);
-                OBSDataAutoRelease updatedSettings = obs_data_create();
+				OBSDataAutoRelease currentSettings = obs_service_get_settings(configuredService);
+				OBSDataAutoRelease updatedSettings = obs_data_create();
 
-                obs_data_apply(updatedSettings, currentSettings); //first apply the existing settings
-                obs_data_apply(updatedSettings, newSettings); //then apply the settings from the request should they exist
+				obs_data_apply(updatedSettings, currentSettings); //first apply the existing settings
+				obs_data_apply(updatedSettings, newSettings); //then apply the settings from the request should they exist
 
-                newService = obs_service_create(
-                    newType.toUtf8(), STREAM_SERVICE_ID,
-                    updatedSettings, csHotkeys);
-            }
-            else {
-                // Service type changed: override service settings
-                newService = obs_service_create(
-                    newType.toUtf8(), STREAM_SERVICE_ID,
-                    newSettings, csHotkeys);
-            }
+				newService = obs_service_create(
+					newType.toUtf8(), STREAM_SERVICE_ID,
+					updatedSettings, csHotkeys);
+			}
+			else {
+				// Service type changed: override service settings
+				newService = obs_service_create(
+					newType.toUtf8(), STREAM_SERVICE_ID,
+					newSettings, csHotkeys);
+			}
 
-            obs_frontend_set_streaming_service(newService);
-        }
+			obs_frontend_set_streaming_service(newService);
+		}
 
-        obs_frontend_streaming_start();
+		obs_frontend_streaming_start();
 
-        // Stream settings provided in StartStreaming are not persisted to disk
-        if (newService != nullptr) {
-            obs_frontend_set_streaming_service(configuredService);
-        }
+		// Stream settings provided in StartStreaming are not persisted to disk
+		if (newService != nullptr) {
+			obs_frontend_set_streaming_service(configuredService);
+		}
 
-        req->SendOKResponse();
-    } else {
-        req->SendErrorResponse("streaming already active");
-    }
+		req->SendOKResponse();
+	} else {
+		req->SendErrorResponse("streaming already active");
+	}
 }
 
 /**
@@ -173,12 +173,12 @@
  * @since 4.1.0
  */
 void WSRequestHandler::HandleStopStreaming(WSRequestHandler* req) {
-    if (obs_frontend_streaming_active() == true) {
-        obs_frontend_streaming_stop();
-        req->SendOKResponse();
-    } else {
-        req->SendErrorResponse("streaming not active");
-    }
+	if (obs_frontend_streaming_active() == true) {
+		obs_frontend_streaming_stop();
+		req->SendOKResponse();
+	} else {
+		req->SendErrorResponse("streaming not active");
+	}
 }
 
 /**
@@ -199,50 +199,50 @@ void WSRequestHandler::HandleStopStreaming(WSRequestHandler* req) {
  * @since 4.1.0
  */
  void WSRequestHandler::HandleSetStreamSettings(WSRequestHandler* req) {
-    OBSService service = obs_frontend_get_streaming_service();
+	OBSService service = obs_frontend_get_streaming_service();
 
-    OBSDataAutoRelease requestSettings = obs_data_get_obj(req->data, "settings");
-    if (!requestSettings) {
-        req->SendErrorResponse("'settings' are required'");
-        return;
-    }
+	OBSDataAutoRelease requestSettings = obs_data_get_obj(req->data, "settings");
+	if (!requestSettings) {
+		req->SendErrorResponse("'settings' are required'");
+		return;
+	}
 
-    QString serviceType = obs_service_get_type(service);
-    QString requestedType = obs_data_get_string(req->data, "type");
+	QString serviceType = obs_service_get_type(service);
+	QString requestedType = obs_data_get_string(req->data, "type");
 
-    if (requestedType != nullptr && requestedType != serviceType) {
-        OBSDataAutoRelease hotkeys = obs_hotkeys_save_service(service);
-        service = obs_service_create(
-            requestedType.toUtf8(), STREAM_SERVICE_ID, requestSettings, hotkeys);
-    } else {
-        // If type isn't changing, we should overlay the settings we got
-        // to the existing settings. By doing so, you can send a request that
-        // only contains the settings you want to change, instead of having to
-        // do a get and then change them
+	if (requestedType != nullptr && requestedType != serviceType) {
+		OBSDataAutoRelease hotkeys = obs_hotkeys_save_service(service);
+		service = obs_service_create(
+			requestedType.toUtf8(), STREAM_SERVICE_ID, requestSettings, hotkeys);
+	} else {
+		// If type isn't changing, we should overlay the settings we got
+		// to the existing settings. By doing so, you can send a request that
+		// only contains the settings you want to change, instead of having to
+		// do a get and then change them
 
-        OBSDataAutoRelease existingSettings = obs_service_get_settings(service);
-        OBSDataAutoRelease newSettings = obs_data_create();
+		OBSDataAutoRelease existingSettings = obs_service_get_settings(service);
+		OBSDataAutoRelease newSettings = obs_data_create();
 
-        // Apply existing settings
-        obs_data_apply(newSettings, existingSettings);
-        // Then apply the settings from the request
-        obs_data_apply(newSettings, requestSettings);
+		// Apply existing settings
+		obs_data_apply(newSettings, existingSettings);
+		// Then apply the settings from the request
+		obs_data_apply(newSettings, requestSettings);
 
-        obs_service_update(service, newSettings);
-    }
+		obs_service_update(service, newSettings);
+	}
 
-    //if save is specified we should immediately save the streaming service
-    if (obs_data_get_bool(req->data, "save")) {
-        obs_frontend_save_streaming_service();
-    }
+	//if save is specified we should immediately save the streaming service
+	if (obs_data_get_bool(req->data, "save")) {
+		obs_frontend_save_streaming_service();
+	}
 
-    OBSDataAutoRelease serviceSettings = obs_service_get_settings(service);
+	OBSDataAutoRelease serviceSettings = obs_service_get_settings(service);
 
-    OBSDataAutoRelease response = obs_data_create();
-    obs_data_set_string(response, "type", requestedType.toUtf8());
-    obs_data_set_obj(response, "settings", serviceSettings);
+	OBSDataAutoRelease response = obs_data_create();
+	obs_data_set_string(response, "type", requestedType.toUtf8());
+	obs_data_set_obj(response, "settings", serviceSettings);
 
-    req->SendOKResponse(response);
+	req->SendOKResponse(response);
 }
 
 /**
@@ -252,7 +252,7 @@ void WSRequestHandler::HandleStopStreaming(WSRequestHandler* req) {
  * @return {Object} `settings` Stream settings object.
  * @return {String} `settings.server` The publish URL.
  * @return {String} `settings.key` The publish key of the stream.
- * @return {boolean} `settings.use-auth` Indicates whether audentication should be used when connecting to the streaming server.
+ * @return {boolean} `settings.use-auth` Indicates whether authentication should be used when connecting to the streaming server.
  * @return {String} `settings.username` The username to use when accessing the streaming server. Only present if `use-auth` is `true`.
  * @return {String} `settings.password` The password to use when accessing the streaming server. Only present if `use-auth` is `true`.
  *
@@ -262,16 +262,16 @@ void WSRequestHandler::HandleStopStreaming(WSRequestHandler* req) {
  * @since 4.1.0
  */
 void WSRequestHandler::HandleGetStreamSettings(WSRequestHandler* req) {
-    OBSService service = obs_frontend_get_streaming_service();
+	OBSService service = obs_frontend_get_streaming_service();
 
-    const char* serviceType = obs_service_get_type(service);
-    OBSDataAutoRelease settings = obs_service_get_settings(service);
+	const char* serviceType = obs_service_get_type(service);
+	OBSDataAutoRelease settings = obs_service_get_settings(service);
 
-    OBSDataAutoRelease response = obs_data_create();
-    obs_data_set_string(response, "type", serviceType);
-    obs_data_set_obj(response, "settings", settings);
+	OBSDataAutoRelease response = obs_data_create();
+	obs_data_set_string(response, "type", serviceType);
+	obs_data_set_obj(response, "settings", settings);
 
-    req->SendOKResponse(response);
+	req->SendOKResponse(response);
 }
 
 /**
@@ -283,6 +283,6 @@ void WSRequestHandler::HandleGetStreamSettings(WSRequestHandler* req) {
  * @since 4.1.0
  */
 void WSRequestHandler::HandleSaveStreamSettings(WSRequestHandler* req) {
-    obs_frontend_save_streaming_service();
-    req->SendOKResponse();
+	obs_frontend_save_streaming_service();
+	req->SendOKResponse();
 }

src/WSRequestHandler_StudioMode.cpp

@@ -14,12 +14,12 @@
  * @since 4.1.0
  */
  void WSRequestHandler::HandleGetStudioModeStatus(WSRequestHandler* req) {
-    bool previewActive = obs_frontend_preview_program_mode_active();
+	bool previewActive = obs_frontend_preview_program_mode_active();
 
-    OBSDataAutoRelease response = obs_data_create();
-    obs_data_set_bool(response, "studio-mode", previewActive);
+	OBSDataAutoRelease response = obs_data_create();
+	obs_data_set_bool(response, "studio-mode", previewActive);
 
-    req->SendOKResponse(response);
+	req->SendOKResponse(response);
 }
 
 /**
@@ -27,7 +27,7 @@
  * Will return an `error` if Studio Mode is not enabled.
  *
  * @return {String} `name` The name of the active preview scene.
- * @return {Source|Array} `sources`
+ * @return {Array<Source>} `sources`
  *
  * @api requests
  * @name GetPreviewScene
@@ -35,19 +35,19 @@
  * @since 4.1.0
  */
 void WSRequestHandler::HandleGetPreviewScene(WSRequestHandler* req) {
-    if (!obs_frontend_preview_program_mode_active()) {
-        req->SendErrorResponse("studio mode not enabled");
-        return;
-    }
+	if (!obs_frontend_preview_program_mode_active()) {
+		req->SendErrorResponse("studio mode not enabled");
+		return;
+	}
 
-    OBSSourceAutoRelease scene = obs_frontend_get_current_preview_scene();
-    OBSDataArrayAutoRelease sceneItems = Utils::GetSceneItems(scene);
+	OBSSourceAutoRelease scene = obs_frontend_get_current_preview_scene();
+	OBSDataArrayAutoRelease sceneItems = Utils::GetSceneItems(scene);
 
-    OBSDataAutoRelease data = obs_data_create();
-    obs_data_set_string(data, "name", obs_source_get_name(scene));
-    obs_data_set_array(data, "sources", sceneItems);
+	OBSDataAutoRelease data = obs_data_create();
+	obs_data_set_string(data, "name", obs_source_get_name(scene));
+	obs_data_set_array(data, "sources", sceneItems);
 
-    req->SendOKResponse(data);
+	req->SendOKResponse(data);
 }
 
 /**
@@ -62,25 +62,25 @@ void WSRequestHandler::HandleGetPreviewScene(WSRequestHandler* req) {
  * @since 4.1.0
  */
 void WSRequestHandler::HandleSetPreviewScene(WSRequestHandler* req) {
-    if (!obs_frontend_preview_program_mode_active()) {
-        req->SendErrorResponse("studio mode not enabled");
-        return;
-    }
+	if (!obs_frontend_preview_program_mode_active()) {
+		req->SendErrorResponse("studio mode not enabled");
+		return;
+	}
 
-    if (!req->hasField("scene-name")) {
-        req->SendErrorResponse("missing request parameters");
-        return;
-    }
+	if (!req->hasField("scene-name")) {
+		req->SendErrorResponse("missing request parameters");
+		return;
+	}
 
-    const char* scene_name = obs_data_get_string(req->data, "scene-name");
-    OBSSourceAutoRelease scene = Utils::GetSceneFromNameOrCurrent(scene_name);
+	const char* scene_name = obs_data_get_string(req->data, "scene-name");
+	OBSSourceAutoRelease scene = Utils::GetSceneFromNameOrCurrent(scene_name);
 
-    if (scene) {
-        obs_frontend_set_current_preview_scene(scene);
-        req->SendOKResponse();
-    } else {
-        req->SendErrorResponse("specified scene doesn't exist");
-    }
+	if (scene) {
+		obs_frontend_set_current_preview_scene(scene);
+		req->SendOKResponse();
+	} else {
+		req->SendErrorResponse("specified scene doesn't exist");
+	}
 }
 
 /**
@@ -97,39 +97,39 @@ void WSRequestHandler::HandleSetPreviewScene(WSRequestHandler* req) {
  * @since 4.1.0
  */
 void WSRequestHandler::HandleTransitionToProgram(WSRequestHandler* req) {
-    if (!obs_frontend_preview_program_mode_active()) {
-        req->SendErrorResponse("studio mode not enabled");
-        return;
-    }
+	if (!obs_frontend_preview_program_mode_active()) {
+		req->SendErrorResponse("studio mode not enabled");
+		return;
+	}
 
-    if (req->hasField("with-transition")) {
-        OBSDataAutoRelease transitionInfo =
-            obs_data_get_obj(req->data, "with-transition");
+	if (req->hasField("with-transition")) {
+		OBSDataAutoRelease transitionInfo =
+			obs_data_get_obj(req->data, "with-transition");
 
-        if (obs_data_has_user_value(transitionInfo, "name")) {
-            QString transitionName =
-                obs_data_get_string(transitionInfo, "name");
-            if (transitionName.isEmpty()) {
-                req->SendErrorResponse("invalid request parameters");
-                return;
-            }
+		if (obs_data_has_user_value(transitionInfo, "name")) {
+			QString transitionName =
+				obs_data_get_string(transitionInfo, "name");
+			if (transitionName.isEmpty()) {
+				req->SendErrorResponse("invalid request parameters");
+				return;
+			}
 
-            bool success = Utils::SetTransitionByName(transitionName);
-            if (!success) {
-                req->SendErrorResponse("specified transition doesn't exist");
-                return;
-            }
-        }
+			bool success = Utils::SetTransitionByName(transitionName);
+			if (!success) {
+				req->SendErrorResponse("specified transition doesn't exist");
+				return;
+			}
+		}
 
-        if (obs_data_has_user_value(transitionInfo, "duration")) {
-            int transitionDuration =
-                obs_data_get_int(transitionInfo, "duration");
-            Utils::SetTransitionDuration(transitionDuration);
-        }
-    }
+		if (obs_data_has_user_value(transitionInfo, "duration")) {
+			int transitionDuration =
+				obs_data_get_int(transitionInfo, "duration");
+			Utils::SetTransitionDuration(transitionDuration);
+		}
+	}
 
-    Utils::TransitionToProgram();
-    req->SendOKResponse();
+	Utils::TransitionToProgram();
+	req->SendOKResponse();
 }
 
 /**
@@ -141,8 +141,8 @@ void WSRequestHandler::HandleTransitionToProgram(WSRequestHandler* req) {
  * @since 4.1.0
  */
 void WSRequestHandler::HandleEnableStudioMode(WSRequestHandler* req) {
-    obs_frontend_set_preview_program_mode(true);
-    req->SendOKResponse();
+	obs_frontend_set_preview_program_mode(true);
+	req->SendOKResponse();
 }
 
 /**
@@ -154,8 +154,8 @@ void WSRequestHandler::HandleEnableStudioMode(WSRequestHandler* req) {
  * @since 4.1.0
  */
 void WSRequestHandler::HandleDisableStudioMode(WSRequestHandler* req) {
-    obs_frontend_set_preview_program_mode(false);
-    req->SendOKResponse();
+	obs_frontend_set_preview_program_mode(false);
+	req->SendOKResponse();
 }
 
 /**
@@ -167,7 +167,7 @@ void WSRequestHandler::HandleDisableStudioMode(WSRequestHandler* req) {
  * @since 4.1.0
  */
 void WSRequestHandler::HandleToggleStudioMode(WSRequestHandler* req) {
-    bool previewProgramMode = obs_frontend_preview_program_mode_active();
-    obs_frontend_set_preview_program_mode(!previewProgramMode);
-    req->SendOKResponse();
+	bool previewProgramMode = obs_frontend_preview_program_mode_active();
+	obs_frontend_set_preview_program_mode(!previewProgramMode);
+	req->SendOKResponse();
 }

src/WSRequestHandler_Transitions.cpp

@@ -7,8 +7,8 @@
  * List of all transitions available in the frontend's dropdown menu.
  *
  * @return {String} `current-transition` Name of the currently active transition.
- * @return {Object|Array} `transitions` List of transitions.
- * @return {String} `transitions[].name` Name of the transition.
+ * @return {Array<Object>} `transitions` List of transitions.
+ * @return {String} `transitions.*.name` Name of the transition.
  *
  * @api requests
  * @name GetTransitionList
@@ -16,26 +16,26 @@
  * @since 4.1.0
  */
  void WSRequestHandler::HandleGetTransitionList(WSRequestHandler* req) {
-    OBSSourceAutoRelease currentTransition = obs_frontend_get_current_transition();
-    obs_frontend_source_list transitionList = {};
-    obs_frontend_get_transitions(&transitionList);
+	OBSSourceAutoRelease currentTransition = obs_frontend_get_current_transition();
+	obs_frontend_source_list transitionList = {};
+	obs_frontend_get_transitions(&transitionList);
 
-    OBSDataArrayAutoRelease transitions = obs_data_array_create();
-    for (size_t i = 0; i < transitionList.sources.num; i++) {
-        OBSSource transition = transitionList.sources.array[i];
+	OBSDataArrayAutoRelease transitions = obs_data_array_create();
+	for (size_t i = 0; i < transitionList.sources.num; i++) {
+		OBSSource transition = transitionList.sources.array[i];
 
-        OBSDataAutoRelease obj = obs_data_create();
-        obs_data_set_string(obj, "name", obs_source_get_name(transition));
-        obs_data_array_push_back(transitions, obj);
-    }
-    obs_frontend_source_list_free(&transitionList);
+		OBSDataAutoRelease obj = obs_data_create();
+		obs_data_set_string(obj, "name", obs_source_get_name(transition));
+		obs_data_array_push_back(transitions, obj);
+	}
+	obs_frontend_source_list_free(&transitionList);
 
-    OBSDataAutoRelease response = obs_data_create();
-    obs_data_set_string(response, "current-transition",
-        obs_source_get_name(currentTransition));
-    obs_data_set_array(response, "transitions", transitions);
+	OBSDataAutoRelease response = obs_data_create();
+	obs_data_set_string(response, "current-transition",
+		obs_source_get_name(currentTransition));
+	obs_data_set_array(response, "transitions", transitions);
 
-    req->SendOKResponse(response);
+	req->SendOKResponse(response);
 }
 
 /**
@@ -50,16 +50,16 @@
  * @since 0.3
  */
 void WSRequestHandler::HandleGetCurrentTransition(WSRequestHandler* req) {
-    OBSSourceAutoRelease currentTransition = obs_frontend_get_current_transition();
+	OBSSourceAutoRelease currentTransition = obs_frontend_get_current_transition();
 
-    OBSDataAutoRelease response = obs_data_create();
-    obs_data_set_string(response, "name",
-        obs_source_get_name(currentTransition));
+	OBSDataAutoRelease response = obs_data_create();
+	obs_data_set_string(response, "name",
+		obs_source_get_name(currentTransition));
 
-    if (!obs_transition_fixed(currentTransition))
-        obs_data_set_int(response, "duration", Utils::GetTransitionDuration());
+	if (!obs_transition_fixed(currentTransition))
+		obs_data_set_int(response, "duration", Utils::GetTransitionDuration());
 
-    req->SendOKResponse(response);
+	req->SendOKResponse(response);
 }
 
 /**
@@ -73,17 +73,17 @@ void WSRequestHandler::HandleGetCurrentTransition(WSRequestHandler* req) {
  * @since 0.3
  */
 void WSRequestHandler::HandleSetCurrentTransition(WSRequestHandler* req) {
-    if (!req->hasField("transition-name")) {
-        req->SendErrorResponse("missing request parameters");
-        return;
-    }
+	if (!req->hasField("transition-name")) {
+		req->SendErrorResponse("missing request parameters");
+		return;
+	}
 
-    QString name = obs_data_get_string(req->data, "transition-name");
-    bool success = Utils::SetTransitionByName(name);
-    if (success)
-        req->SendOKResponse();
-    else
-        req->SendErrorResponse("requested transition does not exist");
+	QString name = obs_data_get_string(req->data, "transition-name");
+	bool success = Utils::SetTransitionByName(name);
+	if (success)
+		req->SendOKResponse();
+	else
+		req->SendErrorResponse("requested transition does not exist");
 }
 
 /**
@@ -97,14 +97,14 @@ void WSRequestHandler::HandleSetCurrentTransition(WSRequestHandler* req) {
  * @since 4.0.0
  */
 void WSRequestHandler::HandleSetTransitionDuration(WSRequestHandler* req) {
-    if (!req->hasField("duration")) {
-        req->SendErrorResponse("missing request parameters");
-        return;
-    }
+	if (!req->hasField("duration")) {
+		req->SendErrorResponse("missing request parameters");
+		return;
+	}
 
-    int ms = obs_data_get_int(req->data, "duration");
-    Utils::SetTransitionDuration(ms);
-    req->SendOKResponse();
+	int ms = obs_data_get_int(req->data, "duration");
+	Utils::SetTransitionDuration(ms);
+	req->SendOKResponse();
 }
 
 /**
@@ -118,9 +118,9 @@ void WSRequestHandler::HandleSetTransitionDuration(WSRequestHandler* req) {
  * @since 4.1.0
  */
 void WSRequestHandler::HandleGetTransitionDuration(WSRequestHandler* req) {
-    OBSDataAutoRelease response = obs_data_create();
-    obs_data_set_int(response, "transition-duration",
-        Utils::GetTransitionDuration());
+	OBSDataAutoRelease response = obs_data_create();
+	obs_data_set_int(response, "transition-duration",
+		Utils::GetTransitionDuration());
 
-    req->SendOKResponse(response);
+	req->SendOKResponse(response);
 }

src/WSServer.cpp

@@ -33,136 +33,136 @@ QT_USE_NAMESPACE
 WSServer* WSServer::Instance = nullptr;
 
 WSServer::WSServer(QObject* parent)
-    : QObject(parent),
-      _wsServer(Q_NULLPTR),
-      _clients(),
-      _clMutex(QMutex::Recursive)
+	: QObject(parent),
+	  _wsServer(Q_NULLPTR),
+	  _clients(),
+	  _clMutex(QMutex::Recursive)
 {
-    _wsServer = new QWebSocketServer(
-        QStringLiteral("obs-websocket"),
-        QWebSocketServer::NonSecureMode);
+	_wsServer = new QWebSocketServer(
+		QStringLiteral("obs-websocket"),
+		QWebSocketServer::NonSecureMode);
 }
 
 WSServer::~WSServer() {
-    Stop();
+	Stop();
 }
 
 void WSServer::Start(quint16 port) {
-    if (port == _wsServer->serverPort())
-        return;
+	if (port == _wsServer->serverPort())
+		return;
 
-    if(_wsServer->isListening())
-        Stop();
+	if(_wsServer->isListening())
+		Stop();
 
-    bool serverStarted = _wsServer->listen(QHostAddress::Any, port);
-    if (serverStarted) {
-        blog(LOG_INFO, "server started successfully on TCP port %d", port);
+	bool serverStarted = _wsServer->listen(QHostAddress::Any, port);
+	if (serverStarted) {
+		blog(LOG_INFO, "server started successfully on TCP port %d", port);
 
-        connect(_wsServer, SIGNAL(newConnection()),
-            this, SLOT(onNewConnection()));
-    }
-    else {
-        QString errorString = _wsServer->errorString();
-        blog(LOG_ERROR,
-            "error: failed to start server on TCP port %d: %s",
-            port, errorString.toUtf8().constData());
+		connect(_wsServer, SIGNAL(newConnection()),
+			this, SLOT(onNewConnection()));
+	}
+	else {
+		QString errorString = _wsServer->errorString();
+		blog(LOG_ERROR,
+			"error: failed to start server on TCP port %d: %s",
+			port, errorString.toUtf8().constData());
 
-        QMainWindow* mainWindow = (QMainWindow*)obs_frontend_get_main_window();
+		QMainWindow* mainWindow = (QMainWindow*)obs_frontend_get_main_window();
 
-        obs_frontend_push_ui_translation(obs_module_get_string);
-        QString title = tr("OBSWebsocket.Server.StartFailed.Title");
-        QString msg = tr("OBSWebsocket.Server.StartFailed.Message").arg(port);
-        obs_frontend_pop_ui_translation();
+		obs_frontend_push_ui_translation(obs_module_get_string);
+		QString title = tr("OBSWebsocket.Server.StartFailed.Title");
+		QString msg = tr("OBSWebsocket.Server.StartFailed.Message").arg(port);
+		obs_frontend_pop_ui_translation();
 
-        QMessageBox::warning(mainWindow, title, msg);
-    }
+		QMessageBox::warning(mainWindow, title, msg);
+	}
 }
 
 void WSServer::Stop() {
-    QMutexLocker locker(&_clMutex);
-    for(QWebSocket* pClient : _clients) {
-        pClient->close();
-    }
-    locker.unlock();
+	QMutexLocker locker(&_clMutex);
+	for(QWebSocket* pClient : _clients) {
+		pClient->close();
+	}
+	locker.unlock();
 
-    _wsServer->close();
+	_wsServer->close();
 
-    blog(LOG_INFO, "server stopped successfully");
+	blog(LOG_INFO, "server stopped successfully");
 }
 
 void WSServer::broadcast(QString message) {
-    QMutexLocker locker(&_clMutex);
-    for(QWebSocket* pClient : _clients) {
-        if (Config::Current()->AuthRequired
-            && (pClient->property(PROP_AUTHENTICATED).toBool() == false)) {
-            // Skip this client if unauthenticated
-            continue;
-        }
-        pClient->sendTextMessage(message);
-    }
+	QMutexLocker locker(&_clMutex);
+	for(QWebSocket* pClient : _clients) {
+		if (Config::Current()->AuthRequired
+			&& (pClient->property(PROP_AUTHENTICATED).toBool() == false)) {
+			// Skip this client if unauthenticated
+			continue;
+		}
+		pClient->sendTextMessage(message);
+	}
 }
 
 void WSServer::onNewConnection() {
-    QWebSocket* pSocket = _wsServer->nextPendingConnection();
-    if (pSocket) {
-        connect(pSocket, SIGNAL(textMessageReceived(const QString&)),
-            this, SLOT(onTextMessageReceived(QString)));
-        connect(pSocket, SIGNAL(disconnected()),
-            this, SLOT(onSocketDisconnected()));
+	QWebSocket* pSocket = _wsServer->nextPendingConnection();
+	if (pSocket) {
+		connect(pSocket, SIGNAL(textMessageReceived(const QString&)),
+			this, SLOT(onTextMessageReceived(QString)));
+		connect(pSocket, SIGNAL(disconnected()),
+			this, SLOT(onSocketDisconnected()));
 
-        pSocket->setProperty(PROP_AUTHENTICATED, false);
+		pSocket->setProperty(PROP_AUTHENTICATED, false);
 
-        QMutexLocker locker(&_clMutex);
-        _clients << pSocket;
-        locker.unlock();
+		QMutexLocker locker(&_clMutex);
+		_clients << pSocket;
+		locker.unlock();
 
-        QHostAddress clientAddr = pSocket->peerAddress();
-        QString clientIp = Utils::FormatIPAddress(clientAddr);
+		QHostAddress clientAddr = pSocket->peerAddress();
+		QString clientIp = Utils::FormatIPAddress(clientAddr);
 
-        blog(LOG_INFO, "new client connection from %s:%d",
-            clientIp.toUtf8().constData(), pSocket->peerPort());
+		blog(LOG_INFO, "new client connection from %s:%d",
+			clientIp.toUtf8().constData(), pSocket->peerPort());
 
-        obs_frontend_push_ui_translation(obs_module_get_string);
-        QString title = tr("OBSWebsocket.NotifyConnect.Title");
-        QString msg = tr("OBSWebsocket.NotifyConnect.Message")
-            .arg(Utils::FormatIPAddress(clientAddr));
-        obs_frontend_pop_ui_translation();
+		obs_frontend_push_ui_translation(obs_module_get_string);
+		QString title = tr("OBSWebsocket.NotifyConnect.Title");
+		QString msg = tr("OBSWebsocket.NotifyConnect.Message")
+			.arg(Utils::FormatIPAddress(clientAddr));
+		obs_frontend_pop_ui_translation();
 
-        Utils::SysTrayNotify(msg, QSystemTrayIcon::Information, title);
-    }
+		Utils::SysTrayNotify(msg, QSystemTrayIcon::Information, title);
+	}
 }
 
 void WSServer::onTextMessageReceived(QString message) {
-    QWebSocket* pSocket = qobject_cast<QWebSocket*>(sender());
-    if (pSocket) {
-        WSRequestHandler handler(pSocket);
-        handler.processIncomingMessage(message);
-    }
+	QWebSocket* pSocket = qobject_cast<QWebSocket*>(sender());
+	if (pSocket) {
+		WSRequestHandler handler(pSocket);
+		handler.processIncomingMessage(message);
+	}
 }
 
 void WSServer::onSocketDisconnected() {
-    QWebSocket* pSocket = qobject_cast<QWebSocket*>(sender());
-    if (pSocket) {
-        pSocket->setProperty(PROP_AUTHENTICATED, false);
+	QWebSocket* pSocket = qobject_cast<QWebSocket*>(sender());
+	if (pSocket) {
+		pSocket->setProperty(PROP_AUTHENTICATED, false);
 
-        QMutexLocker locker(&_clMutex);
-        _clients.removeAll(pSocket);
-        locker.unlock();
+		QMutexLocker locker(&_clMutex);
+		_clients.removeAll(pSocket);
+		locker.unlock();
 
-        pSocket->deleteLater();
+		pSocket->deleteLater();
 
-        QHostAddress clientAddr = pSocket->peerAddress();
-        QString clientIp = Utils::FormatIPAddress(clientAddr);
+		QHostAddress clientAddr = pSocket->peerAddress();
+		QString clientIp = Utils::FormatIPAddress(clientAddr);
 
-        blog(LOG_INFO, "client %s:%d disconnected",
-            clientIp.toUtf8().constData(), pSocket->peerPort());
+		blog(LOG_INFO, "client %s:%d disconnected",
+			clientIp.toUtf8().constData(), pSocket->peerPort());
 
-        obs_frontend_push_ui_translation(obs_module_get_string);
-        QString title = tr("OBSWebsocket.NotifyDisconnect.Title");
-        QString msg = tr("OBSWebsocket.NotifyDisconnect.Message")
-            .arg(Utils::FormatIPAddress(clientAddr));
-        obs_frontend_pop_ui_translation();
+		obs_frontend_push_ui_translation(obs_module_get_string);
+		QString title = tr("OBSWebsocket.NotifyDisconnect.Title");
+		QString msg = tr("OBSWebsocket.NotifyDisconnect.Message")
+			.arg(Utils::FormatIPAddress(clientAddr));
+		obs_frontend_pop_ui_translation();
 
-        Utils::SysTrayNotify(msg, QSystemTrayIcon::Information, title);
-    }
+		Utils::SysTrayNotify(msg, QSystemTrayIcon::Information, title);
+	}
 }

src/WSServer.h

@@ -29,24 +29,24 @@ QT_FORWARD_DECLARE_CLASS(QWebSocketServer)
 QT_FORWARD_DECLARE_CLASS(QWebSocket)
 
 class WSServer : public QObject {
-  Q_OBJECT
-  public:
-    explicit WSServer(QObject* parent = Q_NULLPTR);
-    virtual ~WSServer();
-    void Start(quint16 port);
-    void Stop();
-    void broadcast(QString message);
-    static WSServer* Instance;
+	Q_OBJECT
+	public:
+		explicit WSServer(QObject* parent = Q_NULLPTR);
+		virtual ~WSServer();
+		void Start(quint16 port);
+		void Stop();
+		void broadcast(QString message);
+		static WSServer* Instance;
 
-  private slots:
-    void onNewConnection();
-    void onTextMessageReceived(QString message);
-    void onSocketDisconnected();
+	private slots:
+		void onNewConnection();
+		void onTextMessageReceived(QString message);
+		void onSocketDisconnected();
 
-  private:
-    QWebSocketServer* _wsServer;
-    QList<QWebSocket*> _clients;
-    QMutex _clMutex;
+	private:
+		QWebSocketServer* _wsServer;
+		QList<QWebSocket*> _clients;
+		QMutex _clMutex;
 };
 
-#endif // WSSERVER_H
+#endif // WSSERVER_H

src/forms/settings-dialog.cpp

@@ -26,79 +26,79 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #define CHANGE_ME "changeme"
 
 SettingsDialog::SettingsDialog(QWidget* parent) :
-    QDialog(parent, Qt::Dialog),
-    ui(new Ui::SettingsDialog)
+	QDialog(parent, Qt::Dialog),
+	ui(new Ui::SettingsDialog)
 {
-    ui->setupUi(this);
+	ui->setupUi(this);
 
-    connect(ui->authRequired, &QCheckBox::stateChanged,
-        this, &SettingsDialog::AuthCheckboxChanged);
-    connect(ui->buttonBox, &QDialogButtonBox::accepted,
-        this, &SettingsDialog::FormAccepted);
+	connect(ui->authRequired, &QCheckBox::stateChanged,
+		this, &SettingsDialog::AuthCheckboxChanged);
+	connect(ui->buttonBox, &QDialogButtonBox::accepted,
+		this, &SettingsDialog::FormAccepted);
 
 
-    AuthCheckboxChanged();
+	AuthCheckboxChanged();
 }
 
 void SettingsDialog::showEvent(QShowEvent* event) {
-    Config* conf = Config::Current();
+	Config* conf = Config::Current();
 
-    ui->serverEnabled->setChecked(conf->ServerEnabled);
-    ui->serverPort->setValue(conf->ServerPort);
+	ui->serverEnabled->setChecked(conf->ServerEnabled);
+	ui->serverPort->setValue(conf->ServerPort);
 
-    ui->debugEnabled->setChecked(conf->DebugEnabled);
-    ui->alertsEnabled->setChecked(conf->AlertsEnabled);
+	ui->debugEnabled->setChecked(conf->DebugEnabled);
+	ui->alertsEnabled->setChecked(conf->AlertsEnabled);
 
-    ui->authRequired->setChecked(conf->AuthRequired);
-    ui->password->setText(CHANGE_ME);
+	ui->authRequired->setChecked(conf->AuthRequired);
+	ui->password->setText(CHANGE_ME);
 }
 
 void SettingsDialog::ToggleShowHide() {
-    if (!isVisible())
-        setVisible(true);
-    else
-        setVisible(false);
+	if (!isVisible())
+		setVisible(true);
+	else
+		setVisible(false);
 }
 
 void SettingsDialog::AuthCheckboxChanged() {
-    if (ui->authRequired->isChecked())
-        ui->password->setEnabled(true);
-    else
-        ui->password->setEnabled(false);
+	if (ui->authRequired->isChecked())
+		ui->password->setEnabled(true);
+	else
+		ui->password->setEnabled(false);
 }
 
 void SettingsDialog::FormAccepted() {
-    Config* conf = Config::Current();
+	Config* conf = Config::Current();
 
-    conf->ServerEnabled = ui->serverEnabled->isChecked();
-    conf->ServerPort = ui->serverPort->value();
+	conf->ServerEnabled = ui->serverEnabled->isChecked();
+	conf->ServerPort = ui->serverPort->value();
 
-    conf->DebugEnabled = ui->debugEnabled->isChecked();
-    conf->AlertsEnabled = ui->alertsEnabled->isChecked();
+	conf->DebugEnabled = ui->debugEnabled->isChecked();
+	conf->AlertsEnabled = ui->alertsEnabled->isChecked();
 
-    if (ui->authRequired->isChecked()) {
-        if (ui->password->text() != CHANGE_ME) {
-            conf->SetPassword(ui->password->text());
-        }
+	if (ui->authRequired->isChecked()) {
+		if (ui->password->text() != CHANGE_ME) {
+			conf->SetPassword(ui->password->text());
+		}
 
-        if (!Config::Current()->Secret.isEmpty())
-            conf->AuthRequired = true;
-        else
-            conf->AuthRequired = false;
-    }
-    else
-    {
-        conf->AuthRequired = false;
-    }
+		if (!Config::Current()->Secret.isEmpty())
+			conf->AuthRequired = true;
+		else
+			conf->AuthRequired = false;
+	}
+	else
+	{
+		conf->AuthRequired = false;
+	}
 
-    conf->Save();
+	conf->Save();
 
-    if (conf->ServerEnabled)
-        WSServer::Instance->Start(conf->ServerPort);
-    else
-        WSServer::Instance->Stop();
+	if (conf->ServerEnabled)
+		WSServer::Instance->Start(conf->ServerPort);
+	else
+		WSServer::Instance->Stop();
 }
 
 SettingsDialog::~SettingsDialog() {
-    delete ui;
+	delete ui;
 }

src/forms/settings-dialog.h

@@ -25,20 +25,20 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 class SettingsDialog : public QDialog
 {
-    Q_OBJECT
+	Q_OBJECT
 
 public:
-    explicit SettingsDialog(QWidget* parent = 0);
-    ~SettingsDialog();
-    void showEvent(QShowEvent* event);
-    void ToggleShowHide();
+	explicit SettingsDialog(QWidget* parent = 0);
+	~SettingsDialog();
+	void showEvent(QShowEvent* event);
+	void ToggleShowHide();
 
 private Q_SLOTS:
-    void AuthCheckboxChanged();
-    void FormAccepted();
+	void AuthCheckboxChanged();
+	void FormAccepted();
 
 private:
-    Ui::SettingsDialog* ui;
+	Ui::SettingsDialog* ui;
 };
 
 #endif // SETTINGSDIALOG_H

src/forms/settings-dialog.ui

@@ -2,150 +2,150 @@
 <ui version="4.0">
  <class>SettingsDialog</class>
  <widget class="QDialog" name="SettingsDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>407</width>
-    <height>195</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle">
-   <string>OBSWebsocket.Settings.DialogTitle</string>
-  </property>
-  <property name="sizeGripEnabled">
-   <bool>false</bool>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="sizeConstraint">
-    <enum>QLayout::SetDefaultConstraint</enum>
-   </property>
-   <item>
-    <layout class="QFormLayout" name="formLayout">
-     <item row="3" column="1">
-      <widget class="QCheckBox" name="authRequired">
-       <property name="text">
-        <string>OBSWebsocket.Settings.AuthRequired</string>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="0">
-      <widget class="QLabel" name="lbl_password">
-       <property name="text">
-        <string>OBSWebsocket.Settings.Password</string>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="1">
-      <widget class="QLineEdit" name="password">
-       <property name="echoMode">
-        <enum>QLineEdit::Password</enum>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <widget class="QCheckBox" name="serverEnabled">
-       <property name="text">
-        <string>OBSWebsocket.Settings.ServerEnable</string>
-       </property>
-       <property name="checked">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="lbl_serverPort">
-       <property name="text">
-        <string>OBSWebsocket.Settings.ServerPort</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1">
-      <widget class="QSpinBox" name="serverPort">
-       <property name="minimum">
-        <number>1024</number>
-       </property>
-       <property name="maximum">
-        <number>65535</number>
-       </property>
-       <property name="value">
-        <number>4444</number>
-       </property>
-      </widget>
-     </item>
-     <item row="5" column="1">
-       <widget class="QCheckBox" name="alertsEnabled">
-         <property name="text">
-           <string>OBSWebsocket.Settings.AlertsEnable</string>
-         </property>
-         <property name="checked">
-           <bool>true</bool>
-         </property>
-       </widget>
-     </item>
-     <item row="6" column="1">
-       <widget class="QCheckBox" name="debugEnabled">
-         <property name="text">
-           <string>OBSWebsocket.Settings.DebugEnable</string>
-         </property>
-         <property name="checked">
-           <bool>false</bool>
-         </property>
-       </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
+	<property name="geometry">
+	 <rect>
+		<x>0</x>
+		<y>0</y>
+		<width>407</width>
+		<height>195</height>
+	 </rect>
+	</property>
+	<property name="sizePolicy">
+	 <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+		<horstretch>0</horstretch>
+		<verstretch>0</verstretch>
+	 </sizepolicy>
+	</property>
+	<property name="windowTitle">
+	 <string>OBSWebsocket.Settings.DialogTitle</string>
+	</property>
+	<property name="sizeGripEnabled">
+	 <bool>false</bool>
+	</property>
+	<layout class="QVBoxLayout" name="verticalLayout">
+	 <property name="sizeConstraint">
+		<enum>QLayout::SetDefaultConstraint</enum>
+	 </property>
+	 <item>
+		<layout class="QFormLayout" name="formLayout">
+		 <item row="3" column="1">
+			<widget class="QCheckBox" name="authRequired">
+			 <property name="text">
+				<string>OBSWebsocket.Settings.AuthRequired</string>
+			 </property>
+			</widget>
+		 </item>
+		 <item row="4" column="0">
+			<widget class="QLabel" name="lbl_password">
+			 <property name="text">
+				<string>OBSWebsocket.Settings.Password</string>
+			 </property>
+			</widget>
+		 </item>
+		 <item row="4" column="1">
+			<widget class="QLineEdit" name="password">
+			 <property name="echoMode">
+				<enum>QLineEdit::Password</enum>
+			 </property>
+			</widget>
+		 </item>
+		 <item row="1" column="1">
+			<widget class="QCheckBox" name="serverEnabled">
+			 <property name="text">
+				<string>OBSWebsocket.Settings.ServerEnable</string>
+			 </property>
+			 <property name="checked">
+				<bool>true</bool>
+			 </property>
+			</widget>
+		 </item>
+		 <item row="2" column="0">
+			<widget class="QLabel" name="lbl_serverPort">
+			 <property name="text">
+				<string>OBSWebsocket.Settings.ServerPort</string>
+			 </property>
+			</widget>
+		 </item>
+		 <item row="2" column="1">
+			<widget class="QSpinBox" name="serverPort">
+			 <property name="minimum">
+				<number>1024</number>
+			 </property>
+			 <property name="maximum">
+				<number>65535</number>
+			 </property>
+			 <property name="value">
+				<number>4444</number>
+			 </property>
+			</widget>
+		 </item>
+		 <item row="5" column="1">
+			 <widget class="QCheckBox" name="alertsEnabled">
+				 <property name="text">
+					 <string>OBSWebsocket.Settings.AlertsEnable</string>
+				 </property>
+				 <property name="checked">
+					 <bool>true</bool>
+				 </property>
+			 </widget>
+		 </item>
+		 <item row="6" column="1">
+			 <widget class="QCheckBox" name="debugEnabled">
+				 <property name="text">
+					 <string>OBSWebsocket.Settings.DebugEnable</string>
+				 </property>
+				 <property name="checked">
+					 <bool>false</bool>
+				 </property>
+			 </widget>
+		 </item>
+		</layout>
+	 </item>
+	 <item>
+		<widget class="QDialogButtonBox" name="buttonBox">
+		 <property name="orientation">
+			<enum>Qt::Horizontal</enum>
+		 </property>
+		 <property name="standardButtons">
+			<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+		 </property>
+		</widget>
+	 </item>
+	</layout>
  </widget>
  <resources/>
  <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>SettingsDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>248</x>
-     <y>294</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>314</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>SettingsDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>316</x>
-     <y>300</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>314</y>
-    </hint>
-   </hints>
-  </connection>
+	<connection>
+	 <sender>buttonBox</sender>
+	 <signal>accepted()</signal>
+	 <receiver>SettingsDialog</receiver>
+	 <slot>accept()</slot>
+	 <hints>
+		<hint type="sourcelabel">
+		 <x>248</x>
+		 <y>294</y>
+		</hint>
+		<hint type="destinationlabel">
+		 <x>157</x>
+		 <y>314</y>
+		</hint>
+	 </hints>
+	</connection>
+	<connection>
+	 <sender>buttonBox</sender>
+	 <signal>rejected()</signal>
+	 <receiver>SettingsDialog</receiver>
+	 <slot>reject()</slot>
+	 <hints>
+		<hint type="sourcelabel">
+		 <x>316</x>
+		 <y>300</y>
+		</hint>
+		<hint type="destinationlabel">
+		 <x>286</x>
+		 <y>314</y>
+		</hint>
+	 </hints>
+	</connection>
  </connections>
 </ui>

src/obs-websocket.cpp

@@ -40,41 +40,41 @@ OBS_MODULE_USE_DEFAULT_LOCALE("obs-websocket", "en-US")
 SettingsDialog* settings_dialog;
 
 bool obs_module_load(void) {
-    blog(LOG_INFO, "you can haz websockets (version %s)", OBS_WEBSOCKET_VERSION);
-    blog(LOG_INFO, "qt version (compile-time): %s ; qt version (run-time): %s",
-        QT_VERSION_STR, qVersion());
+	blog(LOG_INFO, "you can haz websockets (version %s)", OBS_WEBSOCKET_VERSION);
+	blog(LOG_INFO, "qt version (compile-time): %s ; qt version (run-time): %s",
+		QT_VERSION_STR, qVersion());
 
-    // Core setup
-    Config* config = Config::Current();
-    config->Load();
+	// Core setup
+	Config* config = Config::Current();
+	config->Load();
 
-    WSServer::Instance = new WSServer();
-    WSEvents::Instance = new WSEvents(WSServer::Instance);
+	WSServer::Instance = new WSServer();
+	WSEvents::Instance = new WSEvents(WSServer::Instance);
 
-    if (config->ServerEnabled)
-        WSServer::Instance->Start(config->ServerPort);
+	if (config->ServerEnabled)
+		WSServer::Instance->Start(config->ServerPort);
 
-    // UI setup
-    QAction* menu_action = (QAction*)obs_frontend_add_tools_menu_qaction(
-        obs_module_text("OBSWebsocket.Menu.SettingsItem"));
+	// UI setup
+	QAction* menu_action = (QAction*)obs_frontend_add_tools_menu_qaction(
+		obs_module_text("OBSWebsocket.Menu.SettingsItem"));
 
-    obs_frontend_push_ui_translation(obs_module_get_string);
-    QMainWindow* main_window = (QMainWindow*)obs_frontend_get_main_window();
-    settings_dialog = new SettingsDialog(main_window);
-    obs_frontend_pop_ui_translation();
+	obs_frontend_push_ui_translation(obs_module_get_string);
+	QMainWindow* main_window = (QMainWindow*)obs_frontend_get_main_window();
+	settings_dialog = new SettingsDialog(main_window);
+	obs_frontend_pop_ui_translation();
 
-    auto menu_cb = [] {
-        settings_dialog->ToggleShowHide();
-    };
-    menu_action->connect(menu_action, &QAction::triggered, menu_cb);
+	auto menu_cb = [] {
+		settings_dialog->ToggleShowHide();
+	};
+	menu_action->connect(menu_action, &QAction::triggered, menu_cb);
 
-    // Loading finished
-    blog(LOG_INFO, "module loaded!");
+	// Loading finished
+	blog(LOG_INFO, "module loaded!");
 
-    return true;
+	return true;
 }
 
 void obs_module_unload() {
-    blog(LOG_INFO, "goodbye!");
+	blog(LOG_INFO, "goodbye!");
 }
 

src/obs-websocket.h

@@ -39,8 +39,8 @@ using OBSOutputAutoRelease =
 	OBSRef<obs_output_t*, ___output_dummy_addref, obs_output_release>;
 
 #define PROP_AUTHENTICATED "wsclient_authenticated"
-#define OBS_WEBSOCKET_VERSION "4.3.2"
+#define OBS_WEBSOCKET_VERSION "4.5.1"
 
 #define blog(level, msg, ...) blog(level, "[obs-websocket] " msg, ##__VA_ARGS__)
 
-#endif // OBSWEBSOCKET_H
+#endif // OBSWEBSOCKET_H