events: fix triggering of PreviewSceneChanged

[not ready] events: fix triggering of PreviewSceneChanged

.travis.yml

@@ -35,10 +35,12 @@ matrix:
   - os: osx
     env: _macos_build
     osx_image: xcode8.3
-    before_install: "./CI/install-dependencies-osx.sh"
-    script: "./CI/build-osx.sh"
+    before_install:
+    - "./CI/install-dependencies-macos.sh"
+    - "./CI/install-build-obs-macos.sh"
+    script: "./CI/build-macos.sh"
     after_success: 
-    - ./CI/package-osx.sh
+    - ./CI/package-macos.sh
 
 deploy:
 - provider: s3

BUILDING.md

@@ -1,6 +1,9 @@
 # Compiling obs-websocket
 ## Prerequisites
-You'll need [QT 5.7.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,7 +25,28 @@ sudo make install
 ```
 
 ## OS X
-*To do*
+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)

CI/build-macos.sh

@@ -3,10 +3,12 @@ set -ex
 
 #export QT_PREFIX="$(find /usr/local/Cellar/qt5 -d 1 | tail -n 1)"
 
-mkdir build && cd build
+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_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

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 echo "-- Generating documentation."
 echo "-- Node version: $(node -v)"
 echo "-- NPM version: $(npm -v)"
@@ -14,7 +15,7 @@ if git diff --quiet; then
     exit 0
 fi
 
-if [ "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_BRANCH" != "master" ]; then
+if [ "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_BRANCH" != "4.3-maintenance" ]; then
     echo "-- Skipping documentation deployment because this is either a pull request or a non-master branch."
     exit 0
 fi

CI/install-build-obs-macos.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+set -ex
+
+# Build obs-studio
+cd ..
+git clone https://github.com/obsproject/obs-studio
+cd obs-studio
+OBSLatestTag=$(git describe --tags --abbrev=0)
+git checkout $OBSLatestTag
+mkdir build && cd build
+cmake .. \
+  -DDISABLE_PLUGINS=true \
+  -DCMAKE_PREFIX_PATH=/usr/local/opt/qt/lib/cmake \
+&& make -j4

CI/install-build-obs.cmd

@@ -0,0 +1,129 @@
+@echo off
+SETLOCAL EnableDelayedExpansion
+
+REM Check if obs-studio build exists.
+REM If the obs-studio directory does exist, check if the last OBS tag built
+REM matches the latest OBS tag.
+REM If the tags match, do not build obs-studio.
+REM If the tags do not match, build obs-studio.
+REM If the obs-studio directory doesn't exist, build obs-studio.
+echo Checking for obs-studio build...
+
+set OBSLatestTagPrePull=0
+set OBSLatestTagPostPull=0
+echo Latest tag pre-pull: %OBSLatestTagPrePull%
+echo Latest tag post-pull: %OBSLatestTagPostPull%
+
+REM Set up the build flag as undefined.
+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
+) else (
+  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
+)
+
+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
+)
+
+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
+)
+
+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 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
+echo:
+echo Latest tag pre-pull: %OBSLatestTagPrePull%
+echo Latest tag post-pull: %OBSLatestTagPostPull%
+echo Latest tag: %OBSLatestTag%
+echo Last built OBS tag: %OBSLastTagBuilt%
+
+if defined BuildOBS (
+  echo BuildOBS: true
+) else (
+  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 15 2017" -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 15 2017 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.
+)

CI/install-dependencies-macos.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+set -ex
+
+# OBS Studio deps
+brew update
+brew install ffmpeg
+brew install libav
+
+# qtwebsockets deps
+# qt latest
+brew install qt5
+
+# Packages app
+wget --quiet --retry-connrefused --waitretry=1 https://s3-us-west-2.amazonaws.com/obs-nightly/Packages.pkg
+sudo installer -pkg ./Packages.pkg -target /

CI/install-dependencies-osx.sh

@@ -1,28 +0,0 @@
-#!/bin/sh
-set -ex
-
-# OBS Studio deps
-brew update
-brew install ffmpeg
-brew install libav
-
-# qtwebsockets deps
-brew install qt5
-#echo "Qt path: $(find /usr/local/Cellar/qt5 -d 1 | tail -n 1)"
-
-# Build obs-studio
-cd ..
-git clone --recursive https://github.com/jp9000/obs-studio
-cd obs-studio
-git checkout 19.0.3
-mkdir build && cd build
-cmake .. \
-  -DCMAKE_PREFIX_PATH=/usr/local/opt/qt/lib/cmake \
-&& make -j4
-
-sudo make install
-
-# Packages app
-cd ..
-curl -L -O https://www.slepin.fr/obs-websocket/ci/Packages.pkg -f --retry 5 -C -
-sudo installer -pkg ./Packages.pkg -target /

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 19.0.3
-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

@@ -0,0 +1,6 @@
+@echo off
+
+REM Set default values to use AppVeyor's built-in Qt.
+set QTDIR32=C:\Qt\5.10.1\msvc2015
+set QTDIR64=C:\Qt\5.10.1\msvc2017_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.0.0</string>
+			<string>4.4.0</string>
 		</dict>
 		<key>PROJECT_COMMENTS</key>
 		<dict>

CI/package-macos.sh

@@ -3,7 +3,7 @@
 set -e
 
 echo "-- Preparing package build"
-export QT_CELLAR_PREFIX="$(find /usr/local/Cellar/qt -d 1 | tail -n 1)"
+export QT_CELLAR_PREFIX="$(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"
@@ -21,19 +21,21 @@ 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
+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"
 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"
 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 \
@@ -59,7 +61,7 @@ otool -L ./build/obs-websocket.so
 chmod -w ./build/QtWebSockets ./build/QtNetwork
 
 echo "-- Actual package build"
-packagesbuild ./CI/osx/obs-websocket.pkgproj
+packagesbuild ./CI/macos/obs-websocket.pkgproj
 
 echo "-- Renaming obs-websocket.pkg to $FILENAME"
 mv ./release/obs-websocket.pkg ./release/$FILENAME

CMakeLists.txt

@@ -6,7 +6,9 @@ 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)
@@ -16,32 +18,43 @@ find_package(Qt5Widgets REQUIRED)
 add_subdirectory(deps/mbedtls EXCLUDE_FROM_ALL)
 set(ENABLE_PROGRAMS false)
 
-set(obs-websocket_SOURCES 
-	obs-websocket.cpp
-	WSServer.cpp
-	WSRequestHandler.cpp
-	WSEvents.cpp
-	Config.cpp
-	Utils.cpp
-	forms/settings-dialog.cpp)
+set(obs-websocket_SOURCES
+	src/obs-websocket.cpp
+	src/WSServer.cpp
+	src/WSRequestHandler.cpp
+	src/WSRequestHandler_General.cpp
+	src/WSRequestHandler_Profiles.cpp
+	src/WSRequestHandler_Recording.cpp
+	src/WSRequestHandler_ReplayBuffer.cpp
+	src/WSRequestHandler_SceneCollections.cpp
+	src/WSRequestHandler_Scenes.cpp
+	src/WSRequestHandler_SceneItems.cpp
+	src/WSRequestHandler_Sources.cpp
+	src/WSRequestHandler_Streaming.cpp
+	src/WSRequestHandler_StudioMode.cpp
+	src/WSRequestHandler_Transitions.cpp
+	src/WSEvents.cpp
+	src/Config.cpp
+	src/Utils.cpp
+	src/forms/settings-dialog.cpp)
 
 set(obs-websocket_HEADERS
-	obs-websocket.h
-	WSServer.h
-	WSRequestHandler.h
-	WSEvents.h
-	Config.h
-	Utils.h
-	forms/settings-dialog.h)
+	src/obs-websocket.h
+	src/WSServer.h
+	src/WSRequestHandler.h
+	src/WSEvents.h
+	src/Config.h
+	src/Utils.h
+	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}
@@ -49,7 +62,7 @@ include_directories(
 	${mbedcrypto_INCLUDES}
 	"${CMAKE_SOURCE_DIR}/deps/mbedtls/include")
 
-target_link_libraries(obs-websocket 
+target_link_libraries(obs-websocket
 	libobs
 	Qt5::Core
 	Qt5::WebSockets
@@ -62,7 +75,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)
@@ -80,36 +93,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
@@ -120,6 +142,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")
@@ -156,6 +183,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()

README.md

@@ -41,16 +41,21 @@ See the [build instructions](BUILDING.md).
 In order of appearance:
 - [Brendan H.](https://github.com/haganbmj) : Code contributions and gooder English in the Protocol specification
 - [Mikhail Swift](https://github.com/mikhailswift) : Code contributions
-- [Tobias Frahmer](https://github.com/Frahmer) : German translation
-- [Genture](https://github.com/Genteure) : Simplified Chinese and Traditional Chinese translations
-- [Larissa Gabilan](https://github.com/laris151) : Portuguese translation
-- [Andy Asquelt](https://github.com/asquelt) : Polish translation
-- [Marcel Haazen](https://github.com/inpothet) : Dutch translation
+- [Tobias Frahmer](https://github.com/Frahmer) : German localization
+- [Genture](https://github.com/Genteure) : Simplified Chinese and Traditional Chinese localizations
+- [Larissa Gabilan](https://github.com/laris151) : Portuguese localization
+- [Andy Asquelt](https://github.com/asquelt) : Polish localization
+- [Marcel Haazen](https://github.com/inpothet) : Dutch localization
 - [Peter Antonvich](https://github.com/pantonvich) : Code contributions
 - [yinzara](https://github.com/yinzara) : Code contributions
 - [Chris Angelico](https://github.com/Rosuav) : Code contributions
 - [Guillaume "Elektordi" Genty](https://github.com/Elektordi) : Code contributions
 - [Marwin M](https://github.com/dragonbane0) : Code contributions
+- [Logan S.](https://github.com/lsdaniel) : Code contributions
+- [RainbowEK](https://github.com/RainbowEK) : Code contributions
+- [RytoEX](https://github.com/RytoEX) : CI script and code contributions
+- [Theodore Stoddard](https://github.com/TStod) : Code contributions
+- [Philip Loche](https://github.com/PicoCentauri) : Code contributions
 
 And also: special thanks to supporters of the project!
 

appveyor.yml

@@ -1,37 +1,25 @@
+image: Visual Studio 2017
+
 environment:
   CURL_VERSION: 7.39.0
 
 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
-  - if not exist qt570.zip curl -kLO https://www.slepin.fr/obs-websocket/ci/qt570.zip -f --retry 5 -C -
-  - 7z x qt570.zip -o"Qt5.7.0"
-  - set DepsPath32=%CD%\dependencies2013\win32
-  - set DepsPath64=%CD%\dependencies2013\win64
-  - set QTDIR32=%CD%\Qt5.7.0\msvc2013
-  - set QTDIR64=%CD%\Qt5.7.0\msvc2013_64
-  - set build_config=Release
-  - git clone --recursive https://github.com/jp9000/obs-studio
-  - cd C:\projects\obs-studio\
-  - git checkout 19.0.3
-  - mkdir build
-  - mkdir build32
-  - mkdir build64
-  - cd ./build32
-  - cmake -G "Visual Studio 12 2013" -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true ..
-  - cd ../build64
-  - cmake -G "Visual Studio 12 2013 Win64" -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true ..
-  - call msbuild /m /p:Configuration=%build_config% C:\projects\obs-studio\build32\obs-studio.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-  - call msbuild /m /p:Configuration=%build_config% C:\projects\obs-studio\build64\obs-studio.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+  - 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=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 15 2017" -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 15 2017 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"
@@ -39,12 +27,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.zip
+  - C:\projects\dependencies2015.zip
+  - C:\projects\obs-studio-last-tag-built.txt
+  - C:\projects\obs-studio\

crowdin.yml

@@ -0,0 +1,3 @@
+files:
+  - source: /data/locale/en-US.ini
+    translation: /data/locale/%locale%.ini

data/locale/de-DE.ini

@@ -4,3 +4,11 @@ OBSWebsocket.Settings.ServerEnable="Websocket-Server aktivieren"
 OBSWebsocket.Settings.ServerPort="Server Port"
 OBSWebsocket.Settings.AuthRequired="Authentifizierung erforderlich"
 OBSWebsocket.Settings.Password="Passwort"
+OBSWebsocket.Settings.DebugEnable="Debug-Protokollierung aktivieren"
+OBSWebsocket.Settings.AlertsEnable="Infobereich-Benachrichtigungen aktivieren"
+OBSWebsocket.NotifyConnect.Title="Neue WebSocket Verbindung"
+OBSWebsocket.NotifyConnect.Message="Client %1 verbunden"
+OBSWebsocket.NotifyDisconnect.Title="WebSocket-Client getrennt"
+OBSWebsocket.NotifyDisconnect.Message="Client %1 getrennt"
+OBSWebsocket.Server.StartFailed.Title="WebSocket-Server Fehler"
+OBSWebsocket.Server.StartFailed.Message="Der WebSocket-Server konnte nicht gestartet werden, mögliche Gründe:\n - TCP Port %1 wird möglicherweise gerade von einem anderen Programm verwendet. Versuchen Sie einen anderen Port in den WebSocket-Server Einstellungen zu setzten oder alle Programme zu beenden, die den Port möglicherweise verwenden.\n - Ein unbekannter Netzwerkfehler ist aufgetreten. Versuchen Sie es erneut mit anderen Einstellungen, einem OBS neustart oder einem System neustart."

data/locale/en-US.ini

@@ -5,6 +5,10 @@ OBSWebsocket.Settings.ServerPort="Server Port"
 OBSWebsocket.Settings.AuthRequired="Enable authentication"
 OBSWebsocket.Settings.Password="Password"
 OBSWebsocket.Settings.DebugEnable="Enable debug logging"
-OBSWebsocket.ConnectNotify.Connected="New WebSocket connection"
-OBSWebsocket.ConnectNotify.Disconnected="WebSocket client disconnected"
-OBSWebsocket.ConnectNotify.ClientIP="Client Address:"
+OBSWebsocket.Settings.AlertsEnable="Enable System Tray Alerts"
+OBSWebsocket.NotifyConnect.Title="New WebSocket connection"
+OBSWebsocket.NotifyConnect.Message="Client %1 connected"
+OBSWebsocket.NotifyDisconnect.Title="WebSocket client disconnected"
+OBSWebsocket.NotifyDisconnect.Message="Client %1 disconnected"
+OBSWebsocket.Server.StartFailed.Title="WebSocket Server failure"
+OBSWebsocket.Server.StartFailed.Message="The obs-websocket server failed to start, maybe because:\n - TCP port %1 may currently be in use elsewhere on this system, possibly by another application. Try setting a different TCP port in the WebSocket server settings, or stop any application that could be using this port.\n - An unknown network error happened on your system. Try again by changing settings, restarting OBS or restarting your system."

data/locale/es-ES.ini

@@ -0,0 +1,14 @@
+OBSWebsocket.Menu.SettingsItem="Configuración del servidor obs-websocket"
+OBSWebsocket.Settings.DialogTitle="obs-websocket"
+OBSWebsocket.Settings.ServerEnable="Habilitar el servidor Websocket"
+OBSWebsocket.Settings.ServerPort="Puerto del Servidor"
+OBSWebsocket.Settings.AuthRequired="Habilitar autenticación"
+OBSWebsocket.Settings.Password="Contraseña"
+OBSWebsocket.Settings.DebugEnable="Habilitar registro de depuración"
+OBSWebsocket.Settings.AlertsEnable="Habilitar alertas de la bandeja de sistema"
+OBSWebsocket.NotifyConnect.Title="Nueva conexión WebSocket"
+OBSWebsocket.NotifyConnect.Message="Cliente %1 conectado"
+OBSWebsocket.NotifyDisconnect.Title="Cliente WebSocket desconectado"
+OBSWebsocket.NotifyDisconnect.Message="Cliente %1 desconectado"
+OBSWebsocket.Server.StartFailed.Title="Fallo del servidor WebSocket"
+OBSWebsocket.Server.StartFailed.Message="El servidor obs-websocket no se pudo iniciar, tal vez porque: \n - el puerto TCP %1 podría estar actualmente en uso en este sistema, posiblemente por otra aplicación. Intente configurar un puerto TCP diferente en la configuración del servidor WebSocket, o detenga cualquier aplicación que pudiese estar utilizando este puerto \n - Un error de red desconocido ha ocurrido en su sistema. Inténtalo de nuevo cambiando la configuración, reiniciando OBS o reiniciando su sistema."

data/locale/fr-FR.ini

@@ -1,9 +1,13 @@
 OBSWebsocket.Menu.SettingsItem="Paramètres du serveur Websocket"
-OBSWebsocket.Settings.DialogTitle="obs-websocket"
-OBSWebsocket.Settings.ServerEnable="Activer le serveur Websockets"
+OBSWebsocket.Settings.ServerEnable="Activer le serveur WebSocket"
 OBSWebsocket.Settings.ServerPort="Port du serveur"
 OBSWebsocket.Settings.AuthRequired="Activer l'authentification"
 OBSWebsocket.Settings.Password="Mot de passe"
-OBSWebsocket.ConnectNotify.Connected="Nouvelle connexion WebSocket"
-OBSWebsocket.ConnectNotify.Disconnected="Déconnexion WebSocket"
-OBSWebsocket.ConnectNotify.ClientIP="Adresse du client :"
+OBSWebsocket.Settings.DebugEnable="Débogage dans le fichier journal"
+OBSWebsocket.Settings.AlertsEnable="Notifications de connexion/déconnexion"
+OBSWebsocket.NotifyConnect.Title="Nouvelle connexion WebSocket"
+OBSWebsocket.NotifyConnect.Message="Le client %1 s'est connecté"
+OBSWebsocket.NotifyDisconnect.Title="Déconnexion WebSocket"
+OBSWebsocket.NotifyDisconnect.Message="Le client %1 s'est déconnecté"
+OBSWebsocket.Server.StartFailed.Title="Impossible de démarrer le serveur WebSocket"
+OBSWebsocket.Server.StartFailed.Message="Le serveur WebSocket n'a pas pu démarrer, peut-être parce que :\n - Le port TCP %1 est en cours d'utilisation sur ce système, certainement par un autre programme. Essayez un port différent dans les réglages du serveur WebSocket, ou arrêtez tout programme susceptible d'utiliser ce port.\n - Une erreur réseau inconnue est survenue. Essayez à nouveau en modifiant vos réglages, en redémarrant OBS ou en redémarrant votre ordinateur."

data/locale/it-IT.ini

@@ -0,0 +1,14 @@
+OBSWebsocket.Menu.SettingsItem="Impostazioni del server di WebSocket"
+OBSWebsocket.Settings.DialogTitle="obs-websocket"
+OBSWebsocket.Settings.ServerEnable="Abilitare il server Websocket"
+OBSWebsocket.Settings.ServerPort="Porta del server"
+OBSWebsocket.Settings.AuthRequired="Abilitare l'autenticazione"
+OBSWebsocket.Settings.Password="Password"
+OBSWebsocket.Settings.DebugEnable="Attivare la registrazione di debug"
+OBSWebsocket.Settings.AlertsEnable="Attivare gli avvisi di vassoio di sistema"
+OBSWebsocket.NotifyConnect.Title="Nuova connessione WebSocket"
+OBSWebsocket.NotifyConnect.Message="%1 cliente collegato"
+OBSWebsocket.NotifyDisconnect.Title="WebSocket cliente disconnesso"
+OBSWebsocket.NotifyDisconnect.Message="%1 cliente disconnesso"
+OBSWebsocket.Server.StartFailed.Title="Errore del WebSocket Server"
+OBSWebsocket.Server.StartFailed.Message="Impossibile avviare, forse perché il server di obs-websocket: \n - %1 porta TCP potrebbe essere attualmente in uso altrove su questo sistema, possibilmente da un'altra applicazione. Provare a impostare una porta TCP diversa nelle impostazioni del server di WebSocket, o arrestare tutte le applicazioni che potrebbero utilizzare questa porta. \n - è verificato un errore di rete sconosciuto sul sistema. Riprova modificando le impostazioni, riavviare OBS o riavvio del sistema."

data/locale/ja-JP.ini

@@ -0,0 +1,8 @@
+OBSWebsocket.Menu.SettingsItem="Websocket サーバー設定"
+OBSWebsocket.Settings.DialogTitle="obs-websocket"
+OBSWebsocket.Settings.ServerEnable="Websocket サーバーを有効にする"
+OBSWebsocket.Settings.ServerPort="サーバーポート"
+OBSWebsocket.Settings.AuthRequired="認証を有効にする"
+OBSWebsocket.Settings.Password="パスワード"
+OBSWebsocket.Settings.DebugEnable="デバッグログを有効にする"
+OBSWebsocket.NotifyConnect.Title="新しいWebSocket接続"

data/locale/nl-NL.ini

@@ -1,6 +1,14 @@
 OBSWebsocket.Menu.SettingsItem="Websocket server instellingen"
 OBSWebsocket.Settings.DialogTitle="obs-websocket"
 OBSWebsocket.Settings.ServerEnable="Activeer Websocket server"
-OBSWebsocket.Settings.ServerPort="Server Poort"
+OBSWebsocket.Settings.ServerPort="Serverpoort"
 OBSWebsocket.Settings.AuthRequired="Activeer authenticatie"
-OBSWebsocket.Settings.Password="Wachtwoord"
+OBSWebsocket.Settings.Password="Wachtwoord"
+OBSWebsocket.Settings.DebugEnable="Activeer debug logs"
+OBSWebsocket.Settings.AlertsEnable="Systemvak waarschuwingen inschakelen"
+OBSWebsocket.NotifyConnect.Title="Nieuwe WebSocket verbinding"
+OBSWebsocket.NotifyConnect.Message="Client %1 verbonden"
+OBSWebsocket.NotifyDisconnect.Title="WebSocket client connectie verbroken"
+OBSWebsocket.NotifyDisconnect.Message="Client %1 losgekoppeld"
+OBSWebsocket.Server.StartFailed.Title="WebSocket Server mislukt"
+OBSWebsocket.Server.StartFailed.Message="De obs-websocket server kan niet worden gestart, misschien omdat: \n - TCP-poort %1 momenteel wordt gebruikt elders op dit systeem, eventueel door een andere toepassing. Probeer een andere TCP-poort instellen in de WebSocket Server-instellingen of stoppen van elke toepassing die deze poort zouden kunnen gebruiken.\n Een onbekende netwerkfout gebeurde op uw systeem. Probeer het opnieuw door de instellingen wijzigen, OBS herstarten of opnieuw opstarten van uw systeem."

data/locale/pl-PL.ini

@@ -4,3 +4,11 @@ OBSWebsocket.Settings.ServerEnable="Włącz serwer zdalnego sterowania (Websocke
 OBSWebsocket.Settings.ServerPort="Port serwera"
 OBSWebsocket.Settings.AuthRequired="Wymagaj hasła"
 OBSWebsocket.Settings.Password="Hasło"
+OBSWebsocket.Settings.DebugEnable="Włącz rejestrowanie debugowania"
+OBSWebsocket.Settings.AlertsEnable="Włącz powiadomienia o zasobniku systemowym"
+OBSWebsocket.NotifyConnect.Title="Nowe połączenie WebSocket"
+OBSWebsocket.NotifyConnect.Message="Klient %1 połączony"
+OBSWebsocket.NotifyDisconnect.Title="Klient WebSocket odłączony"
+OBSWebsocket.NotifyDisconnect.Message="Klient %1 połączony"
+OBSWebsocket.Server.StartFailed.Title="Awaria serwera WebSocket"
+OBSWebsocket.Server.StartFailed.Message="Nie udało się uruchomić serwera obs-websocket, może a powodu: \n - TCP port %1 może być obecnie używany gdzie indziej w tym systemie, możliwie przez inną aplikację. Spróbuj ustawić inny port TCP w ustawieniach serwera WebSocket, lub zatrzymać dowolną aplikację, która może używać tego portu \n -nieznany błąd sieci wydarzył się w systemie. Spróbuj ponownie, zmieniając ustawienia, ponownie uruchamiając OBS lub ponownie uruchamiając system."

data/locale/pt-BR.ini

@@ -1,5 +1,4 @@
 OBSWebsocket.Menu.SettingsItem="Configuraçes do Servidor Websocket"
-OBSWebsocket.Settings.DialogTitle="obs-websocket"
 OBSWebsocket.Settings.ServerEnable="Habilitar o Servidor Websocket"
 OBSWebsocket.Settings.ServerPort="Porta do Servidor"
 OBSWebsocket.Settings.AuthRequired="Autenticação Requerida"

data/locale/pt-PT.ini

@@ -0,0 +1,14 @@
+OBSWebsocket.Menu.SettingsItem="Configurações do servidor Websocket"
+OBSWebsocket.Settings.DialogTitle="obs-websocket"
+OBSWebsocket.Settings.ServerEnable="Habilitar servidor de WebSockets"
+OBSWebsocket.Settings.ServerPort="Porta do Servidor"
+OBSWebsocket.Settings.AuthRequired="Activar autenticação"
+OBSWebsocket.Settings.Password="Palavra passe"
+OBSWebsocket.Settings.DebugEnable="Habilitar registro de debug"
+OBSWebsocket.Settings.AlertsEnable="Ativar Alertas da bandeja do sistema"
+OBSWebsocket.NotifyConnect.Title="Nova conexão WebSocket"
+OBSWebsocket.NotifyConnect.Message="Cliente %1 conectado"
+OBSWebsocket.NotifyDisconnect.Title="WebSocket cliente desconectado"
+OBSWebsocket.NotifyDisconnect.Message="Cliente %1 desconectado"
+OBSWebsocket.Server.StartFailed.Title="Falha do servidor de WebSocket"
+OBSWebsocket.Server.StartFailed.Message="O servidor obs-websocket falhou ao iniciar, talvez porque: \n - TCP port %1 pode estar atualmente em uso em outro lugar sobre este sistema, possivelmente por outro aplicativo. Tente definir uma porta TCP diferente nas configurações do servidor de WebSocket, ou parar qualquer aplicativo que poderia estar usando este porto \n - um erro de rede desconhecido aconteceu no seu sistema. Tente novamente alterar configurações, reiniciando OBS ou reiniciando o sistema."

data/locale/ru-RU.ini

@@ -0,0 +1,14 @@
+OBSWebsocket.Menu.SettingsItem="Параметры сервера Websocket"
+OBSWebsocket.Settings.DialogTitle="obs-websocket"
+OBSWebsocket.Settings.ServerEnable="Включить сервер Websocket"
+OBSWebsocket.Settings.ServerPort="Порт сервера"
+OBSWebsocket.Settings.AuthRequired="Включить аутентификацию"
+OBSWebsocket.Settings.Password="Пароль"
+OBSWebsocket.Settings.DebugEnable="Включить ведение журнала отладки"
+OBSWebsocket.Settings.AlertsEnable="Включить оповещения в системном трее"
+OBSWebsocket.NotifyConnect.Title="Новое соединение WebSocket"
+OBSWebsocket.NotifyConnect.Message="Клиент %1 подключен"
+OBSWebsocket.NotifyDisconnect.Title="Клиент WebSocket отключён"
+OBSWebsocket.NotifyDisconnect.Message="Клиент %1 отключен"
+OBSWebsocket.Server.StartFailed.Title="Сбой сервера WebSocket"
+OBSWebsocket.Server.StartFailed.Message="Сбой запуска сервера obs-websocket. Вероятные причины:\n - Возможно, TCP-порт %1 занят другим приложением в системе. Попробуйте задать другой TCP-порт в настройках сервера WebSocket или закройте приложение, которое может использовать данный порт.\n - Произошла неизвестная сетевая ошибка в системе. Попробуйте снова после изменения настроек, перезапуска OBS или перезапуска системы."

data/locale/zh-CN.ini

@@ -3,4 +3,4 @@ OBSWebsocket.Settings.DialogTitle="obs-websocket 设置"
 OBSWebsocket.Settings.ServerEnable="启用 Websocket 服务器"
 OBSWebsocket.Settings.ServerPort="服务器端口"
 OBSWebsocket.Settings.AuthRequired="启用密码认证"
-OBSWebsocket.Settings.Password="密码"
+OBSWebsocket.Settings.Password="密码"

data/locale/zh-TW.ini

@@ -3,4 +3,4 @@ OBSWebsocket.Settings.DialogTitle="obs-websocket 設定"
 OBSWebsocket.Settings.ServerEnable="啟用 Websocket 伺服器"
 OBSWebsocket.Settings.ServerPort="伺服器端口"
 OBSWebsocket.Settings.AuthRequired="啟用密碼認證"
-OBSWebsocket.Settings.Password="密碼"
+OBSWebsocket.Settings.Password="密碼"

docs/comments.js

@@ -1,6 +1,8 @@
 const fs = require('fs');
+const path = require('path');
 const glob = require('glob');
 const parseComments = require('parse-comments');
+const config = require('./config.json');
 
 /**
  * Read each file and call `parse-comments` on it.
@@ -25,9 +27,15 @@ const parseFiles = files => {
  */
 const processComments = comments => {
     let sorted = {};
+    let errors = [];
 
     comments.forEach(comment => {
         if (typeof comment.api === 'undefined') return;
+        let validationFailures = validateComment(comment);
+
+        if (validationFailures) {
+            errors.push(validationFailures);
+        }
 
         // Store the object based on its api (ie. requests, events) and category (ie. general, scenes, etc).
         comment.category = comment.category || 'miscellaneous';
@@ -44,9 +52,47 @@ const processComments = comments => {
         sorted[comment.api][comment.category].push(comment);
     });
 
+    if (errors.length) {
+        throw JSON.stringify(errors, null, 2);
+    }
+
     return sorted;
 };
 
-const files = glob.sync("./../*.@(cpp|h)");
+// Rudimentary validation of documentation content, returns an error object or undefined.
+const validateComment = comment => {
+    let errors = [];
+    [].concat(comment.params).concat(comment.returns).filter(Boolean).forEach(param => {
+        if (typeof param.name !== 'string' || param.name === '') {
+            errors.push({
+                description: `Invalid param or return value name`,
+                param: param
+            });
+        }
+
+        if (typeof param.type !== 'string' || param.type === '') {
+            errors.push({
+                description: `Invalid param or return value type`,
+                param: param
+            });
+        }
+    });
+
+    if (errors.length) {
+        return {
+            errors: errors,
+            fullContext: Object.assign({}, comment)
+        };
+    }
+
+    return;
+}
+
+const files = glob.sync(config.srcGlob);
 const comments = processComments(parseFiles(files));
-fs.writeFileSync('./generated/comments.json', JSON.stringify(comments, null, 2));
+
+if (!fs.existsSync(config.outDirectory)){
+    fs.mkdirSync(config.outDirectory);
+}
+
+fs.writeFileSync(path.join(config.outDirectory, 'comments.json'), JSON.stringify(comments, null, 2));

docs/config.json

@@ -0,0 +1,5 @@
+{
+    "srcGlob": "./../src/**/*.@(cpp|h)",
+    "srcTemplate": "./protocol.hbs",
+    "outDirectory": "./generated"
+}

docs/docs.js

@@ -1,14 +1,16 @@
 const fs = require('fs');
+const path = require('path');
 const toc = require('markdown-toc');
 const handlebars = require('handlebars');
+const config = require('./config.json');
 
 const helpers = require('handlebars-helpers')({
-  handlebars: handlebars
+    handlebars: handlebars
 });
 
 // Allows pipe characters to be used within markdown tables.
 handlebars.registerHelper('depipe', (text) => {
-    return text.replace('|', `\\|`);
+    return typeof text === 'string' ? text.replace('|', '\\|') : text;
 });
 
 const insertHeader = (text) => {
@@ -26,6 +28,10 @@ const generateProtocol = (templatePath, data) => {
     return insertHeader(toc.insert(generated));
 };
 
-const comments = fs.readFileSync('./generated/comments.json', 'utf8');
-const markdown = generateProtocol('./protocol.hbs', JSON.parse(comments));
-fs.writeFileSync('./generated/protocol.md', markdown);
+if (!fs.existsSync(config.outDirectory)){
+    fs.mkdirSync(config.outDirectory);
+}
+
+const comments = fs.readFileSync(path.join(config.outDirectory, 'comments.json'), 'utf8');
+const markdown = generateProtocol(config.srcTemplate, JSON.parse(comments));
+fs.writeFileSync(path.join(config.outDirectory, 'protocol.md'), markdown);

docs/partials/introduction.md

@@ -1,8 +1,4 @@
-# obs-websocket 4.2.0 protocol reference
-
-**This is the reference for obs-websocket 4.2.0. See the list below for older versions.**
-- [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.3.2 protocol reference
 
 # General Introduction
 Messages are exchanged between the client and the server as JSON objects.

docs/protocol.hbs

@@ -15,6 +15,10 @@
 {{#each this}}
 ### {{name}}
 
+{{#if deprecated}}
+- **⚠️ Deprecated. {{deprecated}} ⚠️**
+{{/if}}
+
 {{#eq since "unreleased"}}
 - Unreleased
 {{else}}
@@ -29,7 +33,7 @@
 | Name | Type  | Description |
 | ---- | :---: | ------------|
 {{#each returns}}
-| `{{name}}` | _{{depipe type}}_ | {{{description}}} |
+| `{{name}}` | _{{depipe type}}_ | {{{depipe description}}} |
 {{/each}}
 
 {{else}}
@@ -51,6 +55,10 @@ _No additional response items._
 {{#each this}}
 ### {{name}}
 
+{{#if deprecated}}
+- **⚠️ Deprecated. {{deprecated}} ⚠️**
+{{/if}}
+
 {{#eq since "unreleased"}}
 - Unreleased
 {{else}}
@@ -65,7 +73,7 @@ _No additional response items._
 | Name | Type  | Description |
 | ---- | :---: | ------------|
 {{#each params}}
-| `{{name}}` | _{{depipe type}}_ | {{{description}}} |
+| `{{name}}` | _{{depipe type}}_ | {{{depipe description}}} |
 {{/each}}
 
 {{else}}
@@ -78,7 +86,7 @@ _No specified parameters._
 | Name | Type  | Description |
 | ---- | :---: | ------------|
 {{#each returns}}
-| `{{name}}` | _{{depipe type}}_ | {{{description}}} |
+| `{{name}}` | _{{depipe type}}_ | {{{depipe description}}} |
 {{/each}}
 
 {{else}}
@@ -89,4 +97,3 @@ _No additional response items._
 
 {{/each}}
 {{/each}}
-

installer/installer.iss

@@ -2,8 +2,8 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "obs-websocket"
-#define MyAppVersion "4.2.0"
-#define MyAppPublisher "St<EFBFBD>phane Lepin"
+#define MyAppVersion "4.4.0"
+#define MyAppPublisher "Stephane Lepin"
 #define MyAppURL "http://github.com/Palakis/obs-websocket"
 
 [Setup]
@@ -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

src/Config.cpp

@@ -26,11 +26,15 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #define PARAM_ENABLE "ServerEnabled"
 #define PARAM_PORT "ServerPort"
 #define PARAM_DEBUG "DebugEnabled"
+#define PARAM_ALERT "AlertsEnabled"
 #define PARAM_AUTHREQUIRED "AuthRequired"
 #define PARAM_SECRET "AuthSecret"
 #define PARAM_SALT "AuthSalt"
 
 #include "Config.h"
+#include "Utils.h"
+
+#define QT_TO_UTF8(str) str.toUtf8().constData()
 
 Config* Config::_instance = new Config();
 
@@ -38,27 +42,31 @@ Config::Config() :
     ServerEnabled(true),
     ServerPort(4444),
     DebugEnabled(false),
+    AlertsEnabled(true),
     AuthRequired(false),
     Secret(""),
     Salt(""),
-    SettingsLoaded(false) {
+    SettingsLoaded(false)
+{
     // OBS Config defaults
-    config_t* obs_config = obs_frontend_get_global_config();
-    if (obs_config) {
-        config_set_default_bool(obs_config, 
+    config_t* obsConfig = obs_frontend_get_global_config();
+    if (obsConfig) {
+        config_set_default_bool(obsConfig,
             SECTION_NAME, PARAM_ENABLE, ServerEnabled);
-        config_set_default_uint(obs_config, 
+        config_set_default_uint(obsConfig,
             SECTION_NAME, PARAM_PORT, ServerPort);
-            
-        config_set_default_bool(obs_config,
-            SECTION_NAME, PARAM_DEBUG, DebugEnabled);
 
-        config_set_default_bool(obs_config, 
+        config_set_default_bool(obsConfig,
+            SECTION_NAME, PARAM_DEBUG, DebugEnabled);
+        config_set_default_bool(obsConfig,
+            SECTION_NAME, PARAM_ALERT, AlertsEnabled);
+
+        config_set_default_bool(obsConfig,
             SECTION_NAME, PARAM_AUTHREQUIRED, AuthRequired);
-        config_set_default_string(obs_config, 
-            SECTION_NAME, PARAM_SECRET, Secret);
-        config_set_default_string(obs_config, 
-            SECTION_NAME, PARAM_SALT, Salt);
+        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));
     }
 
     mbedtls_entropy_init(&entropy);
@@ -74,108 +82,112 @@ Config::~Config() {
 }
 
 void Config::Load() {
-    config_t* obs_config = obs_frontend_get_global_config();
+    config_t* obsConfig = obs_frontend_get_global_config();
 
-    ServerEnabled = config_get_bool(obs_config, SECTION_NAME, PARAM_ENABLE);
-    ServerPort = config_get_uint(obs_config, SECTION_NAME, PARAM_PORT);
-    
-    DebugEnabled = config_get_bool(obs_config, SECTION_NAME, PARAM_DEBUG);
+    ServerEnabled = config_get_bool(obsConfig, SECTION_NAME, PARAM_ENABLE);
+    ServerPort = config_get_uint(obsConfig, SECTION_NAME, PARAM_PORT);
 
-    AuthRequired = config_get_bool(obs_config, SECTION_NAME, PARAM_AUTHREQUIRED);
-    Secret = config_get_string(obs_config, SECTION_NAME, PARAM_SECRET);
-    Salt = config_get_string(obs_config, SECTION_NAME, PARAM_SALT);
+    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);
 }
 
 void Config::Save() {
-    config_t* obs_config = obs_frontend_get_global_config();
+    config_t* obsConfig = obs_frontend_get_global_config();
 
-    config_set_bool(obs_config, SECTION_NAME, PARAM_ENABLE, ServerEnabled);
-    config_set_uint(obs_config, SECTION_NAME, PARAM_PORT, ServerPort);
-    
-    config_set_bool(obs_config, SECTION_NAME, PARAM_DEBUG, DebugEnabled);
+    config_set_bool(obsConfig, SECTION_NAME, PARAM_ENABLE, ServerEnabled);
+    config_set_uint(obsConfig, SECTION_NAME, PARAM_PORT, ServerPort);
 
-    config_set_bool(obs_config, SECTION_NAME, PARAM_AUTHREQUIRED, AuthRequired);
-    config_set_string(obs_config, SECTION_NAME, PARAM_SECRET, Secret);
-    config_set_string(obs_config, SECTION_NAME, PARAM_SALT, Salt);
+    config_set_bool(obsConfig, SECTION_NAME, PARAM_DEBUG, DebugEnabled);
+    config_set_bool(obsConfig, SECTION_NAME, PARAM_ALERT, AlertsEnabled);
 
-    config_save(obs_config);
+    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);
 }
 
-const char* Config::GenerateSalt() {
+QString Config::GenerateSalt() {
     // Generate 32 random chars
-    unsigned char* random_chars = (unsigned char*)bzalloc(32);
-    mbedtls_ctr_drbg_random(&rng, random_chars, 32);
+    unsigned char* randomChars = (unsigned char*)bzalloc(32);
+    mbedtls_ctr_drbg_random(&rng, randomChars, 32);
 
     // Convert the 32 random chars to a base64 string
     char* salt = (char*)bzalloc(64);
-    size_t salt_bytes;
+    size_t saltBytes;
     mbedtls_base64_encode(
-        (unsigned char*)salt, 64, &salt_bytes,
-        random_chars, 32);
+        (unsigned char*)salt, 64, &saltBytes,
+        randomChars, 32);
 
-    bfree(random_chars);
+    bfree(randomChars);
     return salt;
 }
 
-const char* Config::GenerateSecret(const char* password, const char* salt) {
+QString Config::GenerateSecret(QString password, QString salt) {
     // Concatenate the password and the salt
-    std::string passAndSalt = "";
+    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.c_str(), passAndSalt.length(),
+        (unsigned char*)passAndSalt.toUtf8().constData(), passAndSalt.length(),
         challengeHash, 0);
-    
+
     // Encode SHA256 hash to Base64
     char* challenge = (char*)bzalloc(64);
-    size_t challenge_bytes = 0;
+    size_t challengeBytes = 0;
     mbedtls_base64_encode(
-        (unsigned char*)challenge, 64, &challenge_bytes,
+        (unsigned char*)challenge, 64, &challengeBytes,
         challengeHash, 32);
 
     bfree(challengeHash);
     return challenge;
 }
 
-void Config::SetPassword(const char* password) {
-    const char* new_salt = GenerateSalt();
-    const char* new_challenge = GenerateSecret(password, new_salt);
+void Config::SetPassword(QString password) {
+    QString newSalt = GenerateSalt();
+    QString newChallenge = GenerateSecret(password, newSalt);
 
-    this->Salt = new_salt;
-    this->Secret = new_challenge;
+    this->Salt = newSalt;
+    this->Secret = newChallenge;
 }
 
-bool Config::CheckAuth(const char* response) {
+bool Config::CheckAuth(QString response) {
     // Concatenate auth secret with the challenge sent to the user
-    std::string challengeAndResponse = "";
-    challengeAndResponse += this->Secret;
-    challengeAndResponse += this->SessionChallenge;
+    QString challengeAndResponse = "";
+    challengeAndResponse += Secret;
+    challengeAndResponse += SessionChallenge;
 
     // Generate a SHA256 hash of challengeAndResponse
     unsigned char* hash = (unsigned char*)bzalloc(32);
     mbedtls_sha256(
-        (unsigned char*)challengeAndResponse.c_str(),
+        (unsigned char*)challengeAndResponse.toUtf8().constData(),
         challengeAndResponse.length(),
         hash, 0);
 
     // Encode the SHA256 hash to Base64
-    char* expected_response = (char*)bzalloc(64);
+    char* expectedResponse = (char*)bzalloc(64);
     size_t base64_size = 0;
     mbedtls_base64_encode(
-        (unsigned char*)expected_response, 64, &base64_size,
+        (unsigned char*)expectedResponse, 64, &base64_size,
         hash, 32);
 
     bool authSuccess = false;
-    if (strcmp(expected_response, response) == 0) {
+    if (response == QString(expectedResponse)) {
         SessionChallenge = GenerateSalt();
         authSuccess = true;
     }
 
     bfree(hash);
-    bfree(expected_response);
+    bfree(expectedResponse);
     return authSuccess;
 }
 

src/Config.h

@@ -19,6 +19,8 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #ifndef CONFIG_H
 #define CONFIG_H
 
+#include <QString>
+
 #include <mbedtls/entropy.h>
 #include <mbedtls/ctr_drbg.h>
 
@@ -29,23 +31,24 @@ class Config {
     void Load();
     void Save();
 
-    void SetPassword(const char* password);
-    bool CheckAuth(const char* userChallenge);
-    const char* GenerateSalt();
-    static const char* GenerateSecret(
-        const char* password, const char* salt);
+    void SetPassword(QString password);
+    bool CheckAuth(QString userChallenge);
+    QString GenerateSalt();
+    static QString GenerateSecret(
+        QString password, QString salt);
 
     bool ServerEnabled;
     uint64_t ServerPort;
-        
+
     bool DebugEnabled;
+    bool AlertsEnabled;
 
     bool AuthRequired;
-    const char* Secret;
-    const char* Salt;
-    const char* SessionChallenge;
+    QString Secret;
+    QString Salt;
+    QString SessionChallenge;
     bool SettingsLoaded;
-        
+
     static Config* Current();
 
   private:

src/Utils.cpp

@@ -24,10 +24,11 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include "obs-websocket.h"
 
 #include "Utils.h"
+#include "Config.h"
 
 Q_DECLARE_METATYPE(OBSScene);
 
-obs_data_array_t* string_list_to_array(char** strings, char* key) {
+obs_data_array_t* Utils::StringListToArray(char** strings, char* key) {
     if (!strings)
         return obs_data_array_create();
 
@@ -37,13 +38,11 @@ obs_data_array_t* string_list_to_array(char** strings, char* key) {
     for (int i = 0; value != nullptr; i++) {
         value = strings[i];
 
-        obs_data_t* item = obs_data_create();
+        OBSDataAutoRelease item = obs_data_create();
         obs_data_set_string(item, key, value);
 
         if (value)
             obs_data_array_push_back(list, item);
-
-        obs_data_release(item);
     }
 
     return list;
@@ -51,7 +50,7 @@ obs_data_array_t* string_list_to_array(char** strings, char* key) {
 
 obs_data_array_t* Utils::GetSceneItems(obs_source_t* source) {
     obs_data_array_t* items = obs_data_array_create();
-    obs_scene_t* scene = obs_scene_from_source(source);
+    OBSScene scene = obs_scene_from_source(source);
 
     if (!scene)
         return nullptr;
@@ -63,10 +62,8 @@ obs_data_array_t* Utils::GetSceneItems(obs_source_t* source) {
     {
         obs_data_array_t* data = static_cast<obs_data_array_t*>(param);
 
-        obs_data_t* item_data = GetSceneItemData(currentItem);
-        obs_data_array_insert(data, 0, item_data);
-
-        obs_data_release(item_data);
+        OBSDataAutoRelease itemData = GetSceneItemData(currentItem);
+        obs_data_array_insert(data, 0, itemData);
         return true;
     }, items);
 
@@ -83,9 +80,10 @@ obs_data_t* Utils::GetSceneItemData(obs_sceneitem_t* item) {
     vec2 scale;
     obs_sceneitem_get_scale(item, &scale);
 
-    obs_source_t* item_source = obs_sceneitem_get_source(item);
-    float item_width = float(obs_source_get_width(item_source));
-    float item_height = float(obs_source_get_height(item_source));
+    // 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",
@@ -105,9 +103,9 @@ obs_data_t* Utils::GetSceneItemData(obs_sceneitem_t* item) {
     return data;
 }
 
-obs_sceneitem_t* Utils::GetSceneItemFromName(obs_source_t* source, const char* name) {
+obs_sceneitem_t* Utils::GetSceneItemFromName(obs_source_t* source, QString name) {
     struct current_search {
-        const char* query;
+        QString query;
         obs_sceneitem_t* result;
     };
 
@@ -115,8 +113,8 @@ obs_sceneitem_t* Utils::GetSceneItemFromName(obs_source_t* source, const char* n
     search.query = name;
     search.result = nullptr;
 
-    obs_scene_t* scene = obs_scene_from_source(source);
-    if (scene == nullptr)
+    OBSScene scene = obs_scene_from_source(source);
+    if (!scene)
         return nullptr;
 
     obs_scene_enum_items(scene, [](
@@ -126,10 +124,10 @@ obs_sceneitem_t* Utils::GetSceneItemFromName(obs_source_t* source, const char* n
     {
         current_search* search = static_cast<current_search*>(param);
 
-        const char* currentItemName =
+        QString currentItemName =
             obs_source_get_name(obs_sceneitem_get_source(currentItem));
 
-        if (strcmp(currentItemName, search->query) == 0) {
+        if (currentItemName == search->query) {
             search->result = currentItem;
             obs_sceneitem_addref(search->result);
             return false;
@@ -141,36 +139,53 @@ obs_sceneitem_t* Utils::GetSceneItemFromName(obs_source_t* source, const char* n
     return search.result;
 }
 
-obs_source_t* Utils::GetTransitionFromName(const char* search_name) {
-    obs_source_t* found_transition = NULL;
+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;
+}
+
+obs_source_t* Utils::GetTransitionFromName(QString searchName) {
+    obs_source_t* foundTransition = nullptr;
 
     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);
 
-        const char* transition_name = obs_source_get_name(transition);
-        if (strcmp(transition_name, search_name) == 0)
-        {
-            found_transition = transition;
-            obs_source_addref(found_transition);
+        if (transitionName == searchName) {
+            foundTransition = transition;
+            obs_source_addref(foundTransition);
             break;
         }
     }
 
     obs_frontend_source_list_free(&transition_list);
-
-    return found_transition;
+    return foundTransition;
 }
 
-obs_source_t* Utils::GetSceneFromNameOrCurrent(const char* scene_name) {
+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;
 
-    if (!scene_name || !strlen(scene_name))
+    if (sceneName.isEmpty() || sceneName.isNull())
         scene = obs_frontend_get_current_scene();
     else
-        scene = obs_get_source_by_name(scene_name);
+        scene = obs_get_source_by_name(sceneName.toUtf8());
 
     return scene;
 }
@@ -182,45 +197,24 @@ obs_data_array_t* Utils::GetScenes() {
     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];
-
-        obs_data_t* scene_data = GetSceneData(scene);
-        obs_data_array_push_back(scenes, scene_data);
-
-        obs_data_release(scene_data);
+        OBSDataAutoRelease sceneData = GetSceneData(scene);
+        obs_data_array_push_back(scenes, sceneData);
     }
 
     obs_frontend_source_list_free(&sceneList);
-
     return scenes;
 }
 
-obs_data_t* Utils::GetSceneData(obs_source* source) {
-    obs_data_array_t* scene_items = GetSceneItems(source);
+obs_data_t* Utils::GetSceneData(obs_source_t* 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", scene_items);
+    obs_data_set_array(sceneData, "sources", sceneItems);
 
-    obs_data_array_release(scene_items);
     return sceneData;
 }
 
-obs_data_array_t* Utils::GetSceneCollections() {
-    char** scene_collections = obs_frontend_get_scene_collections();
-    obs_data_array_t* list = string_list_to_array(scene_collections, "sc-name");
-
-    bfree(scene_collections);
-    return list;
-}
-
-obs_data_array_t* Utils::GetProfiles() {
-    char** profiles = obs_frontend_get_profiles();
-    obs_data_array_t* list = string_list_to_array(profiles, "profile-name");
-
-    bfree(profiles);
-    return list;
-}
-
 QSpinBox* Utils::GetTransitionDurationControl() {
     QMainWindow* window = (QMainWindow*)obs_frontend_get_main_window();
     return window->findChild<QSpinBox*>("transitionDuration");
@@ -240,12 +234,11 @@ void Utils::SetTransitionDuration(int ms) {
         control->setValue(ms);
 }
 
-bool Utils::SetTransitionByName(const char* transition_name) {
-    obs_source_t* transition = GetTransitionFromName(transition_name);
+bool Utils::SetTransitionByName(QString transitionName) {
+    OBSSourceAutoRelease transition = GetTransitionFromName(transitionName);
 
     if (transition) {
         obs_frontend_set_current_transition(transition);
-        obs_source_release(transition);
         return true;
     } else {
         return false;
@@ -266,8 +259,8 @@ obs_scene_t* Utils::SceneListItemToScene(QListWidgetItem* item) {
     if (!item)
         return nullptr;
 
-    QVariant item_data = item->data(static_cast<int>(Qt::UserRole));
-    return item_data.value<OBSScene>();
+    QVariant itemData = item->data(static_cast<int>(Qt::UserRole));
+    return itemData.value<OBSScene>();
 }
 
 QLayout* Utils::GetPreviewLayout() {
@@ -275,67 +268,8 @@ QLayout* Utils::GetPreviewLayout() {
     return main->findChild<QLayout*>("previewLayout");
 }
 
-bool Utils::IsPreviewModeActive() {
-    QMainWindow* main = (QMainWindow*)obs_frontend_get_main_window();
-
-    // Clue 1 : "Studio Mode" button is toggled on
-    bool buttonToggledOn = GetPreviewModeButtonControl()->isChecked();
-
-    // Clue 2 : Preview layout has more than one item
-    int previewChildCount = GetPreviewLayout()->count();
-    blog(LOG_INFO, "preview layout children count : %d", previewChildCount);
-
-    return buttonToggledOn || (previewChildCount >= 2);
-}
-
-void Utils::EnablePreviewMode() {
-    if (!IsPreviewModeActive())
-        GetPreviewModeButtonControl()->click();
-}
-
-void Utils::DisablePreviewMode() {
-    if (IsPreviewModeActive())
-        GetPreviewModeButtonControl()->click();
-}
-
-void Utils::TogglePreviewMode() {
-    GetPreviewModeButtonControl()->click();
-}
-
-obs_scene_t* Utils::GetPreviewScene() {
-    if (IsPreviewModeActive()) {
-        QListWidget* sceneList = GetSceneListControl();
-        QList<QListWidgetItem*> selected = sceneList->selectedItems();
-
-        // Qt::UserRole == QtUserRole::OBSRef
-        obs_scene_t* scene = Utils::SceneListItemToScene(selected.first());
-
-        obs_scene_addref(scene);
-        return scene;
-    }
-
-    return nullptr;
-}
-
-bool Utils::SetPreviewScene(const char* name) {
-    if (IsPreviewModeActive()) {
-        QListWidget* sceneList = GetSceneListControl();
-        QList<QListWidgetItem*> matchingItems =
-            sceneList->findItems(name, Qt::MatchExactly);
-
-        if (matchingItems.count() > 0) {
-            sceneList->setCurrentItem(matchingItems.first());
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    return false;
-}
-
 void Utils::TransitionToProgram() {
-    if (!IsPreviewModeActive())
+    if (!obs_frontend_preview_program_mode_active())
         return;
 
     // WARNING : if the layout created in OBS' CreateProgramOptions() changes
@@ -358,7 +292,7 @@ void Utils::TransitionToProgram() {
     transitionBtn->click();
 }
 
-const char* Utils::OBSVersionString() {
+QString Utils::OBSVersionString() {
     uint32_t version = obs_get_version();
 
     uint8_t major, minor, patch;
@@ -366,21 +300,27 @@ const char* Utils::OBSVersionString() {
     minor = (version >> 16) & 0xFF;
     patch = version & 0xFF;
 
-    char* result = (char*)bmalloc(sizeof(char) * 12);
-    sprintf(result, "%d.%d.%d", major, minor, patch);
+    QString result = QString("%1.%2.%3")
+        .arg(major).arg(minor).arg(patch);
 
     return result;
 }
 
 QSystemTrayIcon* Utils::GetTrayIcon() {
     QMainWindow* main = (QMainWindow*)obs_frontend_get_main_window();
+    if (!main) return nullptr;
+
     return main->findChildren<QSystemTrayIcon*>().first();
 }
 
 void Utils::SysTrayNotify(QString &text,
     QSystemTrayIcon::MessageIcon icon, QString title) {
-    if (!QSystemTrayIcon::supportsMessages())
+    if (!Config::Current()->AlertsEnabled ||
+        !QSystemTrayIcon::isSystemTrayAvailable() ||
+        !QSystemTrayIcon::supportsMessages())
+    {
         return;
+    }
 
     QSystemTrayIcon* trayIcon = GetTrayIcon();
     if (trayIcon)
@@ -398,9 +338,9 @@ QString Utils::FormatIPAddress(QHostAddress &addr) {
 
 const char* Utils::GetRecordingFolder() {
     config_t* profile = obs_frontend_get_profile_config();
-    const char* outputMode = config_get_string(profile, "Output", "Mode");
+    QString outputMode = config_get_string(profile, "Output", "Mode");
 
-    if (strcmp(outputMode, "Advanced") == 0) {
+    if (outputMode == "Advanced") {
         // Advanced mode
         return config_get_string(profile, "AdvOut", "RecFilePath");
     } else {
@@ -410,13 +350,14 @@ const char* Utils::GetRecordingFolder() {
 }
 
 bool Utils::SetRecordingFolder(const char* path) {
-    if (!QDir(path).exists())
-        return false;
+    QDir dir(path);
+    if (!dir.exists())
+        dir.mkpath(".");
 
     config_t* profile = obs_frontend_get_profile_config();
-    const char* outputMode = config_get_string(profile, "Output", "Mode");
+    QString outputMode = config_get_string(profile, "Output", "Mode");
 
-    if (strcmp(outputMode, "Advanced") == 0) {
+    if (outputMode == "Advanced") {
         config_set_string(profile, "AdvOut", "RecFilePath", path);
     } else {
         config_set_string(profile, "SimpleOutput", "FilePath", path);
@@ -426,61 +367,66 @@ bool Utils::SetRecordingFolder(const char* path) {
     return true;
 }
 
-QString* Utils::ParseDataToQueryString(obs_data_t* data) {
-    QString* query = nullptr;
-    if (data) {
-        obs_data_item_t* item = obs_data_first(data);
-        if (item) {
-            query = new QString();
-            bool isFirst = true;
-            do {
-                if (!obs_data_item_has_user_value(item))
-                    continue;
+QString Utils::ParseDataToQueryString(obs_data_t* data) {
+    if (!data)
+        return QString();
 
-                if (!isFirst)
-                    query->append('&');
-                else
-                    isFirst = false;
+    QString query;
 
-                const char* attrName = obs_data_item_get_name(item);
-                query->append(attrName).append("=");
+    obs_data_item_t* item = obs_data_first(data);
+    if (item) {
+        bool isFirst = true;
+        do {
+            if (!obs_data_item_has_user_value(item))
+                continue;
 
-                switch (obs_data_item_gettype(item)) {
-                    case OBS_DATA_BOOLEAN:
-                        query->append(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->append(
-                                    QString::number(obs_data_item_get_double(item)));
-                                break;
-                            case OBS_DATA_NUM_INT:
-                                query->append(
-                                    QString::number(obs_data_item_get_int(item)));
-                                break;
-                            case OBS_DATA_NUM_INVALID:
-                                break;
-                        }
-                        break;
-                    case OBS_DATA_STRING:
-                        query->append(QUrl::toPercentEncoding(
-                            QString(obs_data_item_get_string(item))));
-                        break;
-                    default:
-                        //other types are not supported
-                        break;
-                }
-            } while (obs_data_item_next(&item));
-        }
+            if (!isFirst)
+                query += "&";
+            else
+                isFirst = false;
+
+            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;
+
+                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;
+
+                default:
+                    //other types are not supported
+                    break;
+            }
+        } while (obs_data_item_next(&item));
     }
+
     return query;
 }
 
-obs_hotkey_t* Utils::FindHotkeyByName(const char* name) {
+obs_hotkey_t* Utils::FindHotkeyByName(QString name) {
     struct current_search {
-        const char* query;
+        QString query;
         obs_hotkey_t* result;
     };
 
@@ -492,11 +438,11 @@ obs_hotkey_t* Utils::FindHotkeyByName(const char* name) {
         current_search* search = static_cast<current_search*>(data);
 
         const char* hk_name = obs_hotkey_get_name(hotkey);
-        if (strcmp(hk_name, search->query) == 0) {
+        if (hk_name == search->query) {
             search->result = hotkey;
-            blog(LOG_INFO, "Utils::FindHotkeyByName: found %s", hk_name);
             return false;
         }
+
         return true;
     }, &search);
 
@@ -505,27 +451,65 @@ obs_hotkey_t* Utils::FindHotkeyByName(const char* name) {
 
 bool Utils::ReplayBufferEnabled() {
     config_t* profile = obs_frontend_get_profile_config();
-    const char* outputMode = config_get_string(profile, "Output", "Mode");
+    QString outputMode = config_get_string(profile, "Output", "Mode");
 
-    if (strcmp(outputMode, "Simple") == 0) {
+    if (outputMode == "Simple") {
         return config_get_bool(profile, "SimpleOutput", "RecRB");
     }
+    else if (outputMode == "Advanced") {
+        return config_get_bool(profile, "AdvOut", "RecRB");
+    }
 
     return false;
 }
 
-bool Utils::RPHotkeySet() {
-    obs_output_t* rp_output = obs_frontend_get_replay_buffer_output();
-    
-    obs_data_t *hotkeys = obs_hotkeys_save_output(rp_output);
-    obs_data_array_t *bindings = obs_data_get_array(hotkeys,
+void Utils::StartReplayBuffer() {
+    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);
+
+        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);
+
+        obs_hotkeys_load_output(rpOutput, outputHotkeys);
+        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");
 
     size_t count = obs_data_array_count(bindings);
-    
-    obs_data_array_release(bindings);
-    obs_data_release(hotkeys);
-    obs_output_release(rp_output);
-
     return (count > 0);
 }
+
+const char* Utils::GetFilenameFormatting() {
+    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;
+}

src/Utils.h

@@ -19,6 +19,8 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #ifndef UTILS_H
 #define UTILS_H
 
+#include <stdio.h>
+
 #include <QSpinBox>
 #include <QPushButton>
 #include <QLayout>
@@ -26,46 +28,39 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <QSystemTrayIcon>
 #include <QHostAddress>
 
-#include <stdio.h>
+#include <obs.hpp>
 #include <obs-module.h>
 #include <util/config-file.h>
 
 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_scene_item* item);
+    static obs_data_t* GetSceneItemData(obs_sceneitem_t* item);
     static obs_sceneitem_t* GetSceneItemFromName(
-        obs_source_t* source, const char* name);
-    static obs_source_t* GetTransitionFromName(const char* search_name);
-    static obs_source_t* GetSceneFromNameOrCurrent(const char* scene_name);
+        obs_source_t* source, QString name);
+    static obs_source_t* GetTransitionFromName(QString transitionName);
+    static obs_source_t* GetSceneFromNameOrCurrent(QString sceneName);
+
+    static bool IsValidAlignment(const uint32_t alignment);
 
     static obs_data_array_t* GetScenes();
-    static obs_data_t* GetSceneData(obs_source* source);
+    static obs_data_t* GetSceneData(obs_source_t* source);
 
-    static obs_data_array_t* GetSceneCollections();
-    static obs_data_array_t* GetProfiles();
-    
     static QSpinBox* GetTransitionDurationControl();
     static int GetTransitionDuration();
     static void SetTransitionDuration(int ms);
 
-    static bool SetTransitionByName(const char* transition_name);
+    static bool SetTransitionByName(QString transitionName);
 
     static QPushButton* GetPreviewModeButtonControl();
     static QLayout* GetPreviewLayout();
     static QListWidget* GetSceneListControl();
     static obs_scene_t* SceneListItemToScene(QListWidgetItem* item);
 
-    static bool IsPreviewModeActive();
-    static void EnablePreviewMode();
-    static void DisablePreviewMode();
-    static void TogglePreviewMode();
-
-    static obs_scene_t* GetPreviewScene();
-    static bool SetPreviewScene(const char* name);
     static void TransitionToProgram();
 
-    static const char* OBSVersionString();
+    static QString OBSVersionString();
 
     static QSystemTrayIcon* GetTrayIcon();
     static void SysTrayNotify(
@@ -74,13 +69,17 @@ class Utils {
         QString title = QString("obs-websocket"));
 
     static QString FormatIPAddress(QHostAddress &addr);
+
     static const char* GetRecordingFolder();
     static bool SetRecordingFolder(const char* path);
 
-    static QString* ParseDataToQueryString(obs_data_t * data);
-    static obs_hotkey_t* FindHotkeyByName(const char* name);
+    static QString ParseDataToQueryString(obs_data_t* data);
+    static obs_hotkey_t* FindHotkeyByName(QString name);
     static bool ReplayBufferEnabled();
-    static bool RPHotkeySet();
+    static void StartReplayBuffer();
+    static bool IsRPHotkeySet();
+    static const char* GetFilenameFormatting();
+    static bool SetFilenameFormatting(const char* filenameFormatting);
 };
 
 #endif // UTILS_H

src/WSEvents.cpp

@@ -2,7 +2,7 @@
  * obs-websocket
  * Copyright (C) 2016-2017	Stéphane Lepin <stephane.lepin@gmail.com>
  * Copyright (C) 2017	Brendan Hagan <https://github.com/haganbmj>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -28,66 +28,69 @@
 
 #include "obs-websocket.h"
 
-bool transition_is_cut(obs_source_t* transition) {
+bool transitionIsCut(obs_source_t* transition) {
     if (!transition)
         return false;
 
     if (obs_source_get_type(transition) == OBS_SOURCE_TYPE_TRANSITION
-        && strcmp(obs_source_get_id(transition), "cut_transition") == 0) {
+        && QString(obs_source_get_id(transition)) == "cut_transition") {
         return true;
     }
     return false;
 }
 
-const char* ns_to_timestamp(uint64_t ns) {
+const char* nsToTimestamp(uint64_t ns) {
     uint64_t ms = ns / (1000 * 1000);
     uint64_t secs = ms / 1000;
     uint64_t minutes = secs / 60;
 
-    uint64_t hours_part = minutes / 60;
-    uint64_t minutes_part = minutes % 60;
-    uint64_t secs_part = secs % 60;
-    uint64_t ms_part = ms % 1000;
+    uint64_t hoursPart = minutes / 60;
+    uint64_t minutesPart = minutes % 60;
+    uint64_t secsPart = secs % 60;
+    uint64_t msPart = ms % 1000;
 
     char* ts = (char*)bmalloc(64);
     sprintf(ts, "%02d:%02d:%02d.%03d",
-        hours_part, minutes_part, secs_part, ms_part);
+        hoursPart, minutesPart, secsPart, msPart);
 
     return ts;
 }
 
+void* calldata_get_ptr(const calldata_t* data, const char* name) {
+    void* ptr = nullptr;
+    calldata_get_ptr(data, name, &ptr);
+    return ptr;
+}
+
 WSEvents* WSEvents::Instance = nullptr;
 
 WSEvents::WSEvents(WSServer* srv) {
     _srv = srv;
     obs_frontend_add_event_callback(WSEvents::FrontendEventHandler, this);
 
-    QSpinBox* duration_control = Utils::GetTransitionDurationControl();
-    connect(duration_control, SIGNAL(valueChanged(int)),
+    QSpinBox* durationControl = Utils::GetTransitionDurationControl();
+    connect(durationControl, SIGNAL(valueChanged(int)),
         this, SLOT(TransitionDurationChanged(int)));
 
     QTimer* statusTimer = new QTimer();
     connect(statusTimer, SIGNAL(timeout()),
         this, SLOT(StreamStatus()));
+    pulse = false;
+    connect(statusTimer, SIGNAL(timeout()),
+        this, SLOT(Heartbeat()));
     statusTimer->start(2000); // equal to frontend's constant BITRATE_UPDATE_SECONDS
 
-    QListWidget* sceneList = Utils::GetSceneListControl();
-    connect(sceneList, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)),
-        this, SLOT(SelectedSceneChanged(QListWidgetItem*, QListWidgetItem*)));
-
-    QPushButton* modeSwitch = Utils::GetPreviewModeButtonControl();
-    connect(modeSwitch, SIGNAL(clicked(bool)), this, SLOT(ModeSwitchClicked(bool)));
-
-    transition_handler = nullptr;
-    scene_handler = nullptr;
+    currentScene = nullptr;
 
     QTimer::singleShot(1000, this, SLOT(deferredInitOperations()));
 
-    _streaming_active = false;
-    _recording_active = false;
+    HeartbeatIsActive = false;
 
-    _stream_starttime = 0;
-    _rec_starttime = 0;
+    _streamingActive = false;
+    _recordingActive = false;
+
+    _streamStarttime = 0;
+    _recStarttime = 0;
 }
 
 WSEvents::~WSEvents() {
@@ -95,13 +98,11 @@ WSEvents::~WSEvents() {
 }
 
 void WSEvents::deferredInitOperations() {
-    obs_source_t* transition = obs_frontend_get_current_transition();
-    connectTransitionSignals(transition);
-    obs_source_release(transition);
+    OBSSourceAutoRelease transition = obs_frontend_get_current_transition();
+	hookTransitionBeginEvent();
 
-    obs_source_t* scene = obs_frontend_get_current_scene();
+    OBSSourceAutoRelease scene = obs_frontend_get_current_scene();
     connectSceneSignals(scene);
-    obs_source_release(scene);
 }
 
 void WSEvents::FrontendEventHandler(enum obs_frontend_event event, void* private_data) {
@@ -110,8 +111,6 @@ void WSEvents::FrontendEventHandler(enum obs_frontend_event event, void* private
     if (!owner->_srv)
         return;
 
-    // TODO : implement SourceOrderChanged and RepopulateSources
-
     if (event == OBS_FRONTEND_EVENT_SCENE_CHANGED) {
         owner->OnSceneChange();
     }
@@ -128,6 +127,7 @@ void WSEvents::FrontendEventHandler(enum obs_frontend_event event, void* private
         owner->OnTransitionChange();
     }
     else if (event == OBS_FRONTEND_EVENT_TRANSITION_LIST_CHANGED) {
+		owner->hookTransitionBeginEvent();
         owner->OnTransitionListChange();
     }
     else if (event == OBS_FRONTEND_EVENT_PROFILE_CHANGED) {
@@ -140,28 +140,28 @@ void WSEvents::FrontendEventHandler(enum obs_frontend_event event, void* private
         owner->OnStreamStarting();
     }
     else if (event == OBS_FRONTEND_EVENT_STREAMING_STARTED) {
-        owner->_streaming_active = true;
+        owner->_streamingActive = true;
         owner->OnStreamStarted();
     }
     else if (event == OBS_FRONTEND_EVENT_STREAMING_STOPPING) {
         owner->OnStreamStopping();
     }
     else if (event == OBS_FRONTEND_EVENT_STREAMING_STOPPED) {
-        owner->_streaming_active = false;
+        owner->_streamingActive = false;
         owner->OnStreamStopped();
     }
     else if (event == OBS_FRONTEND_EVENT_RECORDING_STARTING) {
         owner->OnRecordingStarting();
     }
     else if (event == OBS_FRONTEND_EVENT_RECORDING_STARTED) {
-        owner->_recording_active = true;
+        owner->_recordingActive = true;
         owner->OnRecordingStarted();
     }
     else if (event == OBS_FRONTEND_EVENT_RECORDING_STOPPING) {
         owner->OnRecordingStopping();
     }
     else if (event == OBS_FRONTEND_EVENT_RECORDING_STOPPED) {
-        owner->_recording_active = false;
+        owner->_recordingActive = false;
         owner->OnRecordingStopped();
     }
     else if (event == OBS_FRONTEND_EVENT_REPLAY_BUFFER_STARTING) {
@@ -176,104 +176,121 @@ void WSEvents::FrontendEventHandler(enum obs_frontend_event event, void* private
     else if (event == OBS_FRONTEND_EVENT_REPLAY_BUFFER_STOPPED) {
         owner->OnReplayStopped();
     }
+    else if (event == OBS_FRONTEND_EVENT_STUDIO_MODE_ENABLED) {
+        owner->OnStudioModeSwitched(true);
+    }
+    else if (event == OBS_FRONTEND_EVENT_STUDIO_MODE_DISABLED) {
+        owner->OnStudioModeSwitched(false);
+    }
+    else if (event == OBS_FRONTEND_EVENT_PREVIEW_SCENE_CHANGED) {
+        owner->OnPreviewSceneChanged();
+    }
     else if (event == OBS_FRONTEND_EVENT_EXIT) {
+        owner->connectSceneSignals(nullptr);
         owner->OnExit();
     }
 }
 
 void WSEvents::broadcastUpdate(const char* updateType,
-    obs_data_t* additionalFields = NULL) {
-    obs_data_t* update = obs_data_create();
+    obs_data_t* additionalFields = nullptr)
+{
+    OBSDataAutoRelease update = obs_data_create();
     obs_data_set_string(update, "update-type", updateType);
 
     const char* ts = nullptr;
-    if (_streaming_active) {
-        ts = ns_to_timestamp(os_gettime_ns() - _stream_starttime);
+    if (_streamingActive) {
+        ts = nsToTimestamp(os_gettime_ns() - _streamStarttime);
         obs_data_set_string(update, "stream-timecode", ts);
         bfree((void*)ts);
     }
 
-    if (_recording_active) {
-        ts = ns_to_timestamp(os_gettime_ns() - _rec_starttime);
+    if (_recordingActive) {
+        ts = nsToTimestamp(os_gettime_ns() - _recStarttime);
         obs_data_set_string(update, "rec-timecode", ts);
         bfree((void*)ts);
     }
 
-    if (additionalFields != NULL)
+    if (additionalFields)
         obs_data_apply(update, additionalFields);
 
-    const char *json = obs_data_get_json(update);
+    QString json = obs_data_get_json(update);
     _srv->broadcast(json);
-    if (Config::Current()->DebugEnabled)
-        blog(LOG_DEBUG, "Update << '%s'", json);
 
-    obs_data_release(update);
+    if (Config::Current()->DebugEnabled)
+        blog(LOG_DEBUG, "Update << '%s'", json.toUtf8().constData());
 }
 
-void WSEvents::connectTransitionSignals(obs_source_t* transition) {
-    if (transition_handler) {
-        signal_handler_disconnect(transition_handler,
-            "transition_start", OnTransitionBegin, this);
-    }
+void WSEvents::hookTransitionBeginEvent() {
+	obs_frontend_source_list transitions = {};
+	obs_frontend_get_transitions(&transitions);
 
-    if (!transition_is_cut(transition)) {
-        transition_handler = obs_source_get_signal_handler(transition);
-        signal_handler_connect(transition_handler,
-            "transition_start", OnTransitionBegin, this);
-    } else {
-        transition_handler = nullptr;
-    }
+	for (int i = 0; i < transitions.sources.num; i++) {
+		obs_source_t* transition = transitions.sources.array[i];
+		signal_handler_t* sh = obs_source_get_signal_handler(transition);
+		signal_handler_disconnect(sh, "transition_start", OnTransitionBegin, this);
+		signal_handler_connect(sh, "transition_start", OnTransitionBegin, this);
+	}
+
+	obs_frontend_source_list_free(&transitions);
 }
 
 void WSEvents::connectSceneSignals(obs_source_t* scene) {
-    if (scene_handler) {
-        signal_handler_disconnect(scene_handler,
+    signal_handler_t* sh = nullptr;
+
+    if (currentScene) {
+        sh = obs_source_get_signal_handler(currentScene);
+
+        signal_handler_disconnect(sh,
             "reorder", OnSceneReordered, this);
-        signal_handler_disconnect(scene_handler,
+        signal_handler_disconnect(sh,
             "item_add", OnSceneItemAdd, this);
-        signal_handler_disconnect(scene_handler,
+        signal_handler_disconnect(sh,
             "item_remove", OnSceneItemDelete, this);
-        signal_handler_disconnect(scene_handler,
+        signal_handler_disconnect(sh,
             "item_visible", OnSceneItemVisibilityChanged, this);
     }
 
-    // TODO : connect to all scenes, not just the current one.
-    scene_handler = obs_source_get_signal_handler(scene);
-    signal_handler_connect(scene_handler,
-        "reorder", OnSceneReordered, this);
-    signal_handler_connect(scene_handler,
-        "item_add", OnSceneItemAdd, this);
-    signal_handler_connect(scene_handler,
-        "item_remove", OnSceneItemDelete, this);
-    signal_handler_connect(scene_handler,
-        "item_visible", OnSceneItemVisibilityChanged, this);
+    currentScene = scene;
+
+    if (currentScene) {
+        // TODO : connect to all scenes, not just the current one.
+        sh = obs_source_get_signal_handler(currentScene);
+        signal_handler_connect(sh,
+            "reorder", OnSceneReordered, this);
+        signal_handler_connect(sh,
+            "item_add", OnSceneItemAdd, this);
+        signal_handler_connect(sh,
+            "item_remove", OnSceneItemDelete, this);
+        signal_handler_connect(sh,
+            "item_visible", OnSceneItemVisibilityChanged, this);
+    }
 }
 
 uint64_t WSEvents::GetStreamingTime() {
-    if (_streaming_active)
-        return (os_gettime_ns() - _stream_starttime);
+    if (_streamingActive)
+        return (os_gettime_ns() - _streamStarttime);
     else
         return 0;
 }
 
 const char* WSEvents::GetStreamingTimecode() {
-    return ns_to_timestamp(GetStreamingTime());
+    return nsToTimestamp(GetStreamingTime());
 }
 
 uint64_t WSEvents::GetRecordingTime() {
-    if (_recording_active)
-        return (os_gettime_ns() - _rec_starttime);
+    if (_recordingActive)
+        return (os_gettime_ns() - _recStarttime);
     else
         return 0;
 }
 
 const char* WSEvents::GetRecordingTimecode() {
-    return ns_to_timestamp(GetRecordingTime());
+    return nsToTimestamp(GetRecordingTime());
 }
 
  /**
  * Indicates a scene change.
- * 
+ *
  * @return {String} `scene-name` The new scene.
  * @return {Array} `sources` List of sources in the new scene.
  *
@@ -283,33 +300,21 @@ const char* WSEvents::GetRecordingTimecode() {
  * @since 0.3
  */
 void WSEvents::OnSceneChange() {
-    obs_data_t* data = obs_data_create();
+    OBSSourceAutoRelease currentScene = obs_frontend_get_current_scene();
+    OBSDataArrayAutoRelease sceneItems = Utils::GetSceneItems(currentScene);
+    connectSceneSignals(currentScene);
 
-    obs_source_t* current_scene = obs_frontend_get_current_scene();
-    obs_data_array_t* scene_items = Utils::GetSceneItems(current_scene);
-    connectSceneSignals(current_scene);
-
-    obs_data_set_string(data, "scene-name", obs_source_get_name(current_scene));
-    obs_data_set_array(data, "sources", scene_items);
+    OBSDataAutoRelease data = obs_data_create();
+    obs_data_set_string(data, "scene-name", obs_source_get_name(currentScene));
+    obs_data_set_array(data, "sources", sceneItems);
 
     broadcastUpdate("SwitchScenes", data);
-
-    obs_data_array_release(scene_items);
-    obs_source_release(current_scene);
-    obs_data_release(data);
-
-    // Dirty fix : OBS blocks signals when swapping scenes in Studio Mode
-    // after transition end, so SelectedSceneChanged is never called...
-    if (Utils::IsPreviewModeActive()) {
-        QListWidget* list = Utils::GetSceneListControl();
-        SelectedSceneChanged(list->currentItem(), nullptr);
-    }
 }
 
 /**
  * The scene list has been modified.
  * Scenes have been added, removed, or renamed.
- * 
+ *
  * @api events
  * @name ScenesChanged
  * @category scenes
@@ -321,7 +326,7 @@ void WSEvents::OnSceneListChange() {
 
 /**
  * Triggered when switching to another scene collection or when renaming the current scene collection.
- * 
+ *
  * @api events
  * @name SceneCollectionChanged
  * @category scenes
@@ -330,8 +335,7 @@ void WSEvents::OnSceneListChange() {
 void WSEvents::OnSceneCollectionChange() {
     broadcastUpdate("SceneCollectionChanged");
 
-    scene_handler = nullptr;
-    transition_handler = nullptr;
+    currentScene = nullptr;
 
     OnTransitionListChange();
     OnTransitionChange();
@@ -342,7 +346,7 @@ void WSEvents::OnSceneCollectionChange() {
 
 /**
  * Triggered when a scene collection is created, added, renamed, or removed.
- * 
+ *
  * @api events
  * @name SceneCollectionListChanged
  * @category scenes
@@ -363,17 +367,13 @@ void WSEvents::OnSceneCollectionListChange() {
  * @since 4.0.0
  */
 void WSEvents::OnTransitionChange() {
-    obs_source_t* current_transition = obs_frontend_get_current_transition();
-    connectTransitionSignals(current_transition);
+    OBSSourceAutoRelease currentTransition = obs_frontend_get_current_transition();
 
-    obs_data_t* data = obs_data_create();
+    OBSDataAutoRelease data = obs_data_create();
     obs_data_set_string(data, "transition-name",
-        obs_source_get_name(current_transition));
+        obs_source_get_name(currentTransition));
 
     broadcastUpdate("SwitchTransition", data);
-
-    obs_data_release(data);
-    obs_source_release(current_transition);
 }
 
 /**
@@ -424,12 +424,10 @@ void WSEvents::OnProfileListChange() {
  * @since 0.3
  */
 void WSEvents::OnStreamStarting() {
-    obs_data_t* data = obs_data_create();
+    OBSDataAutoRelease data = obs_data_create();
     obs_data_set_bool(data, "preview-only", false);
 
     broadcastUpdate("StreamStarting", data);
-
-    obs_data_release(data);
 }
 
 /**
@@ -441,14 +439,14 @@ void WSEvents::OnStreamStarting() {
  * @since 0.3
  */
 void WSEvents::OnStreamStarted() {
-    _stream_starttime = os_gettime_ns();
+    _streamStarttime = os_gettime_ns();
     _lastBytesSent = 0;
     broadcastUpdate("StreamStarted");
 }
 
 /**
  * A request to stop streaming has been issued.
- * 
+ *
  * @return {boolean} `preview-only` Always false (retrocompatibility).
  *
  * @api events
@@ -457,12 +455,10 @@ void WSEvents::OnStreamStarted() {
  * @since 0.3
  */
 void WSEvents::OnStreamStopping() {
-    obs_data_t* data = obs_data_create();
+    OBSDataAutoRelease data = obs_data_create();
     obs_data_set_bool(data, "preview-only", false);
 
     broadcastUpdate("StreamStopping", data);
-
-    obs_data_release(data);
 }
 
 /**
@@ -474,7 +470,7 @@ void WSEvents::OnStreamStopping() {
  * @since 0.3
  */
 void WSEvents::OnStreamStopped() {
-    _stream_starttime = 0;
+    _streamStarttime = 0;
     broadcastUpdate("StreamStopped");
 }
 
@@ -499,7 +495,7 @@ void WSEvents::OnRecordingStarting() {
  * @since 0.3
  */
 void WSEvents::OnRecordingStarted() {
-    _rec_starttime = os_gettime_ns();
+    _recStarttime = os_gettime_ns();
     broadcastUpdate("RecordingStarted");
 }
 
@@ -524,7 +520,7 @@ void WSEvents::OnRecordingStopping() {
  * @since 0.3
  */
 void WSEvents::OnRecordingStopped() {
-    _rec_starttime = 0;
+    _recStarttime = 0;
     broadcastUpdate("RecordingStopped");
 }
 
@@ -553,7 +549,7 @@ void WSEvents::OnReplayStarted() {
 }
 
 /**
-* A request to start the replay buffer has been issued.
+* A request to stop the replay buffer has been issued.
 *
 * @api events
 * @name ReplayStopping
@@ -608,60 +604,111 @@ void WSEvents::OnExit() {
  * @since 0.3
  */
 void WSEvents::StreamStatus() {
-    bool streaming_active = obs_frontend_streaming_active();
-    bool recording_active = obs_frontend_recording_active();
+    bool streamingActive = obs_frontend_streaming_active();
+    bool recordingActive = obs_frontend_recording_active();
 
-    obs_output_t* stream_output = obs_frontend_get_streaming_output();
+    OBSOutputAutoRelease streamOutput = obs_frontend_get_streaming_output();
 
-    if (!stream_output || !streaming_active) {
-        if (stream_output) {
-            obs_output_release(stream_output);
-        }
+    if (!streamOutput || !streamingActive) {
         return;
     }
 
-    uint64_t bytes_sent = obs_output_get_total_bytes(stream_output);
-    uint64_t bytes_sent_time = os_gettime_ns();
+    uint64_t bytesSent = obs_output_get_total_bytes(streamOutput);
+    uint64_t bytesSentTime = os_gettime_ns();
 
-    if (bytes_sent < _lastBytesSent)
-        bytes_sent = 0;
+    if (bytesSent < _lastBytesSent)
+        bytesSent = 0;
 
-    if (bytes_sent == 0)
+    if (bytesSent == 0)
         _lastBytesSent = 0;
 
-    uint64_t bytes_between = bytes_sent - _lastBytesSent;
-    double time_passed =
-        double(bytes_sent_time - _lastBytesSentTime) / 1000000000.0;
+    uint64_t bytesBetween = bytesSent - _lastBytesSent;
+    double timePassed =
+        double(bytesSentTime - _lastBytesSentTime) / 1000000000.0;
 
-    uint64_t bytes_per_sec = bytes_between / time_passed;
+    uint64_t bytesPerSec = bytesBetween / timePassed;
 
-    _lastBytesSent = bytes_sent;
-    _lastBytesSentTime = bytes_sent_time;
+    _lastBytesSent = bytesSent;
+    _lastBytesSentTime = bytesSentTime;
 
     uint64_t totalStreamTime =
-        (os_gettime_ns() - _stream_starttime) / 1000000000;
+        (os_gettime_ns() - _streamStarttime) / 1000000000;
 
-    int total_frames = obs_output_get_total_frames(stream_output);
-    int dropped_frames = obs_output_get_frames_dropped(stream_output);
+    int totalFrames = obs_output_get_total_frames(streamOutput);
+    int droppedFrames = obs_output_get_frames_dropped(streamOutput);
 
-    float strain = obs_output_get_congestion(stream_output);
+    float strain = obs_output_get_congestion(streamOutput);
 
-    obs_data_t* data = obs_data_create();
-    obs_data_set_bool(data, "streaming", streaming_active);
-    obs_data_set_bool(data, "recording", recording_active);
-    obs_data_set_int(data, "bytes-per-sec", bytes_per_sec);
-    obs_data_set_int(data, "kbits-per-sec", (bytes_per_sec * 8) / 1024);
+    OBSDataAutoRelease data = obs_data_create();
+    obs_data_set_bool(data, "streaming", streamingActive);
+    obs_data_set_bool(data, "recording", recordingActive);
+    obs_data_set_int(data, "bytes-per-sec", bytesPerSec);
+    obs_data_set_int(data, "kbits-per-sec", (bytesPerSec * 8) / 1024);
     obs_data_set_int(data, "total-stream-time", totalStreamTime);
-    obs_data_set_int(data, "num-total-frames", total_frames);
-    obs_data_set_int(data, "num-dropped-frames", dropped_frames);
+    obs_data_set_int(data, "num-total-frames", totalFrames);
+    obs_data_set_int(data, "num-dropped-frames", droppedFrames);
     obs_data_set_double(data, "fps", obs_get_active_fps());
     obs_data_set_double(data, "strain", strain);
     obs_data_set_bool(data, "preview-only", false); // Retrocompat with OBSRemote
 
     broadcastUpdate("StreamStatus", data);
+}
 
-    obs_data_release(data);
-    obs_output_release(stream_output);
+/**
+ * Emitted every 2 seconds after enabling it by calling SetHeartbeat.
+ *
+ * @return {boolean} `pulse` Toggles between every JSON meassage as an "I am alive" indicator.
+ * @return {string (optional)} `current-profile` Current active profile.
+ * @return {string (optional)} `current-scene` Current active scene.
+ * @return {boolean (optional)} `streaming` Current streaming state.
+ * @return {int (optional)} `total-stream-time` Total time (in seconds) since the stream started.
+ * @return {int (optional)} `total-stream-bytes` Total bytes sent since the stream started.
+ * @return {int (optional)} `total-stream-frames` Total frames streamed since the stream started.
+ * @return {boolean (optional)} `recording` Current recording state.
+ * @return {int (optional)} `total-record-time` Total time (in seconds) since recording started.
+ * @return {int (optional)} `total-record-bytes` Total bytes recorded since the recording started.
+ * @return {int (optional)} `total-record-frames` Total frames recorded since the recording started.
+ *
+ * @api events
+ * @name Heartbeat
+ * @category general
+ */
+void WSEvents::Heartbeat() {
+
+    if (!HeartbeatIsActive) return;
+
+    bool streamingActive = obs_frontend_streaming_active();
+    bool recordingActive = obs_frontend_recording_active();
+
+    OBSDataAutoRelease data = obs_data_create();
+    OBSOutputAutoRelease recordOutput = obs_frontend_get_recording_output();
+    OBSOutputAutoRelease streamOutput = obs_frontend_get_streaming_output();
+
+    pulse = !pulse;
+    obs_data_set_bool(data, "pulse", pulse);
+
+    obs_data_set_string(data, "current-profile", obs_frontend_get_current_profile());
+
+    OBSSourceAutoRelease currentScene = obs_frontend_get_current_scene();
+    obs_data_set_string(data, "current-scene", obs_source_get_name(currentScene));
+
+    obs_data_set_bool(data, "streaming", streamingActive);
+    if (streamingActive) {
+        uint64_t totalStreamTime = (os_gettime_ns() - _streamStarttime) / 1000000000;
+        obs_data_set_int(data, "total-stream-time", totalStreamTime);
+        obs_data_set_int(data, "total-stream-bytes", (uint64_t)obs_output_get_total_bytes(streamOutput));
+        obs_data_set_int(data, "total-stream-frames", obs_output_get_total_frames(streamOutput));
+    }
+
+    obs_data_set_bool(data, "recording", recordingActive);
+    if (recordingActive) {
+        uint64_t totalRecordTime = (os_gettime_ns() - _recStarttime) / 1000000000;
+        obs_data_set_int(data, "total-record-time", totalRecordTime);
+        obs_data_set_int(data, "total-record-bytes", (uint64_t)obs_output_get_total_bytes(recordOutput));
+        obs_data_set_int(data, "total-record-frames", obs_output_get_total_frames(recordOutput));
+    }
+
+    broadcastUpdate("Heartbeat", data);
 }
 
 /**
@@ -675,11 +722,10 @@ void WSEvents::StreamStatus() {
  * @since 4.0.0
  */
 void WSEvents::TransitionDurationChanged(int ms) {
-    obs_data_t* fields = obs_data_create();
+    OBSDataAutoRelease fields = obs_data_create();
     obs_data_set_int(fields, "new-duration", ms);
 
     broadcastUpdate("TransitionDurationChanged", fields);
-    obs_data_release(fields);
 }
 
 /**
@@ -687,6 +733,8 @@ void WSEvents::TransitionDurationChanged(int ms) {
  *
  * @return {String} `name` Transition name.
  * @return {int} `duration` Transition duration (in milliseconds).
+ * @return {String} `from-scene` Source scene of the transition
+ * @return {String} `to-scene` Destination scene of the transition
  *
  * @api events
  * @name TransitionBegin
@@ -694,20 +742,41 @@ void WSEvents::TransitionDurationChanged(int ms) {
  * @since 4.0.0
  */
 void WSEvents::OnTransitionBegin(void* param, calldata_t* data) {
-    UNUSED_PARAMETER(data);
     WSEvents* instance = static_cast<WSEvents*>(param);
 
-    obs_source_t* current_transition = obs_frontend_get_current_transition();
-    const char* name = obs_source_get_name(current_transition);
-    int duration = Utils::GetTransitionDuration();
+	OBSSource transition = (obs_source_t*)calldata_get_ptr(data, "source");
+	if (!transition) return;
 
-    obs_data_t* fields = obs_data_create();
-    obs_data_set_string(fields, "name", name);
-    obs_data_set_int(fields, "duration", duration);
+	// Detect if transition is the global transition or a transition override.
+	// Fetching the duration is different depending on the case.
+	OBSSourceAutoRelease sourceScene = obs_transition_get_source(transition, OBS_TRANSITION_SOURCE_A);
+	OBSSourceAutoRelease destinationScene = obs_transition_get_active_source(transition);
+	OBSDataAutoRelease destinationSettings = obs_source_get_private_settings(destinationScene);
+	int duration = -1;
+	if (obs_data_has_default_value(destinationSettings, "transition_duration") ||
+		obs_data_has_user_value(destinationSettings, "transition_duration"))
+	{
+		duration = obs_data_get_int(destinationSettings, "transition_duration");
+	} else {
+		duration = Utils::GetTransitionDuration();
+	}
+
+    OBSDataAutoRelease fields = obs_data_create();
+    obs_data_set_string(fields, "name", obs_source_get_name(transition));
+	if (duration >= 0) {
+		obs_data_set_int(fields, "duration", duration);
+	} else {
+		blog(LOG_WARNING, "OnTransitionBegin: duration is negative !");
+	}
+
+	if (sourceScene) {
+		obs_data_set_string(fields, "from-scene", obs_source_get_name(sourceScene));
+	}
+	if (destinationScene) {
+		obs_data_set_string(fields, "to-scene", obs_source_get_name(destinationScene));
+	}
 
     instance->broadcastUpdate("TransitionBegin", fields);
-    obs_data_release(fields);
-    obs_source_release(current_transition);
 }
 
 /**
@@ -726,12 +795,11 @@ void WSEvents::OnSceneReordered(void* param, calldata_t* data) {
     obs_scene_t* scene = nullptr;
     calldata_get_ptr(data, "scene", &scene);
 
-    obs_data_t* fields = obs_data_create();
+    OBSDataAutoRelease fields = obs_data_create();
     obs_data_set_string(fields, "scene-name",
         obs_source_get_name(obs_scene_get_source(scene)));
 
     instance->broadcastUpdate("SourceOrderChanged", fields);
-    obs_data_release(fields);
 }
 
 /**
@@ -751,20 +819,19 @@ void WSEvents::OnSceneItemAdd(void* param, calldata_t* data) {
     obs_scene_t* scene = nullptr;
     calldata_get_ptr(data, "scene", &scene);
 
-    obs_sceneitem_t* scene_item = nullptr;
-    calldata_get_ptr(data, "item", &scene_item);
+    obs_sceneitem_t* sceneItem = nullptr;
+    calldata_get_ptr(data, "item", &sceneItem);
 
-    const char* scene_name =
+    const char* sceneName =
         obs_source_get_name(obs_scene_get_source(scene));
-    const char* sceneitem_name =
-        obs_source_get_name(obs_sceneitem_get_source(scene_item));
+    const char* sceneItemName =
+        obs_source_get_name(obs_sceneitem_get_source(sceneItem));
 
-    obs_data_t* fields = obs_data_create();
-    obs_data_set_string(fields, "scene-name", scene_name);
-    obs_data_set_string(fields, "item-name", sceneitem_name);
+    OBSDataAutoRelease fields = obs_data_create();
+    obs_data_set_string(fields, "scene-name", sceneName);
+    obs_data_set_string(fields, "item-name", sceneItemName);
 
     instance->broadcastUpdate("SceneItemAdded", fields);
-    obs_data_release(fields);
 }
 
 /**
@@ -784,20 +851,19 @@ void WSEvents::OnSceneItemDelete(void* param, calldata_t* data) {
     obs_scene_t* scene = nullptr;
     calldata_get_ptr(data, "scene", &scene);
 
-    obs_sceneitem_t* scene_item = nullptr;
-    calldata_get_ptr(data, "item", &scene_item);
+    obs_sceneitem_t* sceneItem = nullptr;
+    calldata_get_ptr(data, "item", &sceneItem);
 
-    const char* scene_name =
+    const char* sceneName =
         obs_source_get_name(obs_scene_get_source(scene));
-    const char* sceneitem_name =
-        obs_source_get_name(obs_sceneitem_get_source(scene_item));
+    const char* sceneItemName =
+        obs_source_get_name(obs_sceneitem_get_source(sceneItem));
 
-    obs_data_t* fields = obs_data_create();
-    obs_data_set_string(fields, "scene-name", scene_name);
-    obs_data_set_string(fields, "item-name", sceneitem_name);
+    OBSDataAutoRelease fields = obs_data_create();
+    obs_data_set_string(fields, "scene-name", sceneName);
+    obs_data_set_string(fields, "item-name", sceneItemName);
 
     instance->broadcastUpdate("SceneItemRemoved", fields);
-    obs_data_release(fields);
 }
 
 /**
@@ -818,24 +884,23 @@ void WSEvents::OnSceneItemVisibilityChanged(void* param, calldata_t* data) {
     obs_scene_t* scene = nullptr;
     calldata_get_ptr(data, "scene", &scene);
 
-    obs_sceneitem_t* scene_item = nullptr;
-    calldata_get_ptr(data, "item", &scene_item);
+    obs_sceneitem_t* sceneItem = nullptr;
+    calldata_get_ptr(data, "item", &sceneItem);
 
     bool visible = false;
     calldata_get_bool(data, "visible", &visible);
 
-    const char* scene_name =
+    const char* sceneName =
         obs_source_get_name(obs_scene_get_source(scene));
-    const char* sceneitem_name =
-        obs_source_get_name(obs_sceneitem_get_source(scene_item));
+    const char* sceneItemName =
+        obs_source_get_name(obs_sceneitem_get_source(sceneItem));
 
-    obs_data_t* fields = obs_data_create();
-    obs_data_set_string(fields, "scene-name", scene_name);
-    obs_data_set_string(fields, "item-name", sceneitem_name);
+    OBSDataAutoRelease fields = obs_data_create();
+    obs_data_set_string(fields, "scene-name", sceneName);
+    obs_data_set_string(fields, "item-name", sceneItemName);
     obs_data_set_bool(fields, "item-visible", visible);
 
     instance->broadcastUpdate("SceneItemVisibilityChanged", fields);
-    obs_data_release(fields);
 }
 
 /**
@@ -849,22 +914,19 @@ void WSEvents::OnSceneItemVisibilityChanged(void* param, calldata_t* data) {
  * @category studio mode
  * @since 4.1.0
  */
-void WSEvents::SelectedSceneChanged(QListWidgetItem* current, QListWidgetItem* prev) {
-    if (Utils::IsPreviewModeActive()) {
-        obs_scene_t* scene = Utils::SceneListItemToScene(current);
-        if (!scene) return;
+void WSEvents::OnPreviewSceneChanged() {
+    if (obs_frontend_preview_program_mode_active()) {
+        OBSSourceAutoRelease scene = obs_frontend_get_current_preview_scene();
+        if (!scene)
+            return;
 
-        obs_source_t* scene_source = obs_scene_get_source(scene);
-        obs_data_array_t* scene_items = Utils::GetSceneItems(scene_source);
+        OBSDataArrayAutoRelease sceneItems = Utils::GetSceneItems(scene);
 
-        obs_data_t* data = obs_data_create();
-        obs_data_set_string(data, "scene-name", obs_source_get_name(scene_source));
-        obs_data_set_array(data, "sources", scene_items);
+        OBSDataAutoRelease data = obs_data_create();
+        obs_data_set_string(data, "scene-name", obs_source_get_name(scene));
+        obs_data_set_array(data, "sources", sceneItems);
 
         broadcastUpdate("PreviewSceneChanged", data);
-
-        obs_data_array_release(scene_items);
-        obs_data_release(data);
     }
 }
 
@@ -878,10 +940,9 @@ void WSEvents::SelectedSceneChanged(QListWidgetItem* current, QListWidgetItem* p
  * @category studio mode
  * @since 4.1.0
  */
-void WSEvents::ModeSwitchClicked(bool checked) {
-    obs_data_t* data = obs_data_create();
+void WSEvents::OnStudioModeSwitched(bool checked) {
+    OBSDataAutoRelease data = obs_data_create();
     obs_data_set_bool(data, "new-state", checked);
 
     broadcastUpdate("StudioModeSwitched", data);
-    obs_data_release(data);
 }

src/WSEvents.h

@@ -20,9 +20,9 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #ifndef WSEVENTS_H
 #define WSEVENTS_H
 
+#include <obs.hpp>
 #include <obs-frontend-api.h>
 #include <QListWidgetItem>
-
 #include "WSServer.h"
 
 class WSEvents : public QObject {
@@ -31,34 +31,36 @@ class WSEvents : public QObject {
     explicit WSEvents(WSServer* srv);
     ~WSEvents();
     static void FrontendEventHandler(
-        enum obs_frontend_event event, void* private_data);
-    void connectTransitionSignals(obs_source_t* transition);
-    void connectSceneSignals(obs_source_t* scene);
+        enum obs_frontend_event event, void* privateData);
     static WSEvents* Instance;
+    void connectSceneSignals(obs_source_t* scene);
+
+	void hookTransitionBeginEvent();
 
     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 ModeSwitchClicked(bool checked);
 
   private:
     WSServer* _srv;
-    signal_handler_t* transition_handler;
-    signal_handler_t* scene_handler;
+    OBSSource currentScene;
 
-    bool _streaming_active;
-    bool _recording_active;
+    bool pulse;
 
-    uint64_t _stream_starttime;
-    uint64_t _rec_starttime;
+    bool _streamingActive;
+    bool _recordingActive;
+
+    uint64_t _streamStarttime;
+    uint64_t _recStarttime;
 
     uint64_t _lastBytesSent;
     uint64_t _lastBytesSentTime;
@@ -92,6 +94,9 @@ class WSEvents : public QObject {
     void OnReplayStopping();
     void OnReplayStopped();
 
+    void OnStudioModeSwitched(bool enabled);
+    void OnPreviewSceneChanged();
+
     void OnExit();
 
     static void OnTransitionBegin(void* param, calldata_t* data);

src/WSRequestHandler.cpp

@@ -0,0 +1,217 @@
+/**
+ * obs-websocket
+ * Copyright (C) 2016-2017	Stéphane Lepin <stephane.lepin@gmail.com>
+ * Copyright (C) 2017	Mikhail Swift <https://github.com/mikhailswift>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <https://www.gnu.org/licenses/>
+ */
+
+#include <obs-data.h>
+
+#include "Config.h"
+#include "Utils.h"
+
+#include "WSRequestHandler.h"
+
+QHash<QString, void(*)(WSRequestHandler*)> WSRequestHandler::messageMap {
+    { "GetVersion", WSRequestHandler::HandleGetVersion },
+    { "GetAuthRequired", WSRequestHandler::HandleGetAuthRequired },
+    { "Authenticate", WSRequestHandler::HandleAuthenticate },
+
+    { "SetHeartbeat", WSRequestHandler::HandleSetHeartbeat },
+
+    { "SetFilenameFormatting", WSRequestHandler::HandleSetFilenameFormatting },
+    { "GetFilenameFormatting", WSRequestHandler::HandleGetFilenameFormatting },
+
+    { "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 },
+
+    { "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 },
+
+    { "SetRecordingFolder", WSRequestHandler::HandleSetRecordingFolder },
+    { "GetRecordingFolder", WSRequestHandler::HandleGetRecordingFolder },
+
+    { "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 },
+
+    { "SetCurrentSceneCollection", WSRequestHandler::HandleSetCurrentSceneCollection },
+    { "GetCurrentSceneCollection", WSRequestHandler::HandleGetCurrentSceneCollection },
+    { "ListSceneCollections", WSRequestHandler::HandleListSceneCollections },
+
+    { "SetCurrentProfile", WSRequestHandler::HandleSetCurrentProfile },
+    { "GetCurrentProfile", WSRequestHandler::HandleGetCurrentProfile },
+    { "ListProfiles", WSRequestHandler::HandleListProfiles },
+
+    { "SetStreamSettings", WSRequestHandler::HandleSetStreamSettings },
+    { "GetStreamSettings", WSRequestHandler::HandleGetStreamSettings },
+    { "SaveStreamSettings", WSRequestHandler::HandleSaveStreamSettings },
+
+    { "GetStudioModeStatus", WSRequestHandler::HandleGetStudioModeStatus },
+    { "GetPreviewScene", WSRequestHandler::HandleGetPreviewScene },
+    { "SetPreviewScene", WSRequestHandler::HandleSetPreviewScene },
+    { "TransitionToProgram", WSRequestHandler::HandleTransitionToProgram },
+    { "EnableStudioMode", WSRequestHandler::HandleEnableStudioMode },
+    { "DisableStudioMode", WSRequestHandler::HandleDisableStudioMode },
+    { "ToggleStudioMode", WSRequestHandler::HandleToggleStudioMode },
+
+    { "SetTextGDIPlusProperties", WSRequestHandler::HandleSetTextGDIPlusProperties },
+    { "GetTextGDIPlusProperties", WSRequestHandler::HandleGetTextGDIPlusProperties },
+
+    { "GetBrowserSourceProperties", WSRequestHandler::HandleGetBrowserSourceProperties },
+    { "SetBrowserSourceProperties", WSRequestHandler::HandleSetBrowserSourceProperties }
+};
+
+QSet<QString> WSRequestHandler::authNotRequired {
+    "GetVersion",
+    "GetAuthRequired",
+    "Authenticate"
+};
+
+WSRequestHandler::WSRequestHandler(QWebSocket* client) :
+    _messageId(0),
+    _requestType(""),
+    data(nullptr),
+    _client(client)
+{
+}
+
+void WSRequestHandler::processIncomingMessage(QString textMessage) {
+    QByteArray msgData = textMessage.toUtf8();
+    const char* msg = msgData.constData();
+
+    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;
+    }
+
+    if (Config::Current()->DebugEnabled) {
+        blog(LOG_DEBUG, "Request >> '%s'", msg);
+    }
+
+    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");
+
+    if (Config::Current()->AuthRequired
+        && (_client->property(PROP_AUTHENTICATED).toBool() == false)
+        && (authNotRequired.find(_requestType) == authNotRequired.end()))
+    {
+        SendErrorResponse("Not Authenticated");
+        return;
+    }
+
+    void (*handlerFunc)(WSRequestHandler*) = (messageMap[_requestType]);
+
+    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);
+
+    if (additionalFields)
+        obs_data_apply(response, additionalFields);
+
+    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);
+
+    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);
+
+    if (additionalFields)
+        obs_data_set_obj(response, "error", additionalFields);
+
+    SendResponse(response);
+}
+
+void WSRequestHandler::SendResponse(obs_data_t* response)  {
+    QString json = obs_data_get_json(response);
+    _client->sendTextMessage(json);
+
+    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;
+
+    return obs_data_has_user_value(data, name.toUtf8());
+}

src/WSRequestHandler.h

@@ -20,12 +20,16 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #ifndef WSREQUESTHANDLER_H
 #define WSREQUESTHANDLER_H
 
-#include <QMap>
+#include <QHash>
+#include <QSet>
 #include <QWebSocket>
 #include <QWebSocketServer>
 
+#include <obs.hpp>
 #include <obs-frontend-api.h>
 
+#include "obs-websocket.h"
+
 class WSRequestHandler : public QObject {
   Q_OBJECT
 
@@ -33,26 +37,31 @@ class WSRequestHandler : public QObject {
     explicit WSRequestHandler(QWebSocket* client);
     ~WSRequestHandler();
     void processIncomingMessage(QString textMessage);
-    bool hasField(const char* name);
+    bool hasField(QString name);
 
   private:
-    static obs_service_t* _service;
     QWebSocket* _client;
     const char* _messageId;
     const char* _requestType;
-    obs_data_t* data;
-
-    QMap<QString, void(*)(WSRequestHandler*)> messageMap;
-    QSet<QString> authNotRequired;
+    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);
 
+    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 HandleSetHeartbeat(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);
@@ -61,6 +70,8 @@ class WSRequestHandler : public QObject {
     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 HandleGetStreamingStatus(WSRequestHandler* req);
@@ -91,6 +102,10 @@ class WSRequestHandler : public QObject {
     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);
@@ -114,7 +129,7 @@ class WSRequestHandler : public QObject {
     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 HandleSetBrowserSourceProperties(WSRequestHandler* req);

src/WSRequestHandler_General.cpp

@@ -0,0 +1,168 @@
+#include <QString>
+
+#include "Config.h"
+#include "Utils.h"
+#include "WSEvents.h"
+
+#include "WSRequestHandler.h"
+
+/**
+ * Returns the latest version of the plugin and the API.
+ *
+ * @return {double} `version` OBSRemote compatible API version. Fixed to 1.1 for retrocompatibility.
+ * @return {String} `obs-websocket-version` obs-websocket plugin version.
+ * @return {String} `obs-studio-version` OBS Studio program version.
+ * @return {String} `available-requests` List of available request types, formatted as a comma-separated list string (e.g. : "Method1,Method2,Method3").
+ *
+ * @api requests
+ * @name GetVersion
+ * @category general
+ * @since 0.3
+ */
+ void WSRequestHandler::HandleGetVersion(WSRequestHandler* req) {
+    QString obsVersion = Utils::OBSVersionString();
+
+    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);
+    }
+
+    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);
+}
+
+/**
+ * Tells the client if authentication is required. If so, returns authentication parameters `challenge`
+ * and `salt` (see "Authentication" for more information).
+ *
+ * @return {boolean} `authRequired` Indicates whether authentication is required.
+ * @return {String (optional)} `challenge`
+ * @return {String (optional)} `salt`
+ *
+ * @api requests
+ * @name GetAuthRequired
+ * @category general
+ * @since 0.3
+ */
+void WSRequestHandler::HandleGetAuthRequired(WSRequestHandler* req) {
+    bool authRequired = Config::Current()->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());
+    }
+
+    req->SendOKResponse(data);
+}
+
+/**
+ * Attempt to authenticate the client to the server.
+ *
+ * @param {String} `auth` Response to the auth challenge (see "Authentication" for more information).
+ *
+ * @api requests
+ * @name Authenticate
+ * @category general
+ * @since 0.3
+ */
+void WSRequestHandler::HandleAuthenticate(WSRequestHandler* req) {
+    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;
+    }
+
+    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.");
+    }
+}
+
+/**
+ * Enable/disable sending of the Heartbeat event
+ *
+ * @param {boolean} `enable` Starts/Stops emitting heartbeat messages
+ *
+ * @api requests
+ * @name SetHeartbeat
+ * @category general
+ * @since 4.3.0
+ */
+ void WSRequestHandler::HandleSetHeartbeat(WSRequestHandler* req) {
+    if (!req->hasField("enable")) {
+        req->SendErrorResponse("Heartbeat <enable> parameter missing");
+        return;
+    }
+
+    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);
+}
+
+/**
+ * Set the filename formatting string
+ *
+ * @param {String} `filename-formatting` Filename formatting string to set.
+ *
+ * @api requests
+ * @name SetFilenameFormatting
+ * @category general
+ * @since 4.3.0
+ */
+void WSRequestHandler::HandleSetFilenameFormatting(WSRequestHandler* req) {
+    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");
+    }
+}
+
+/**
+ * Get the filename formatting string
+ *
+ * @return {String} `filename-formatting` Current filename formatting string.
+ *
+ * @api requests
+ * @name GetFilenameFormatting
+ * @category general
+ * @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);
+}

src/WSRequestHandler_Profiles.cpp

@@ -0,0 +1,70 @@
+#include <QString>
+#include "Utils.h"
+
+#include "WSRequestHandler.h"
+
+/**
+ * Set the currently active profile.
+ * 
+ * @param {String} `profile-name` Name of the desired profile.
+ *
+ * @api requests
+ * @name SetCurrentProfile
+ * @category profiles
+ * @since 4.0.0
+ */
+ void WSRequestHandler::HandleSetCurrentProfile(WSRequestHandler* req) {
+    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");
+    }
+}
+
+ /**
+ * Get the name of the current profile.
+ * 
+ * @return {String} `profile-name` Name of the currently active profile.
+ *
+ * @api requests
+ * @name GetCurrentProfile
+ * @category profiles
+ * @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());
+
+    req->SendOKResponse(response);
+}
+
+/**
+ * Get a list of available profiles.
+ *
+ * @return {Object|Array} `profiles` List of available profiles.
+ *
+ * @api requests
+ * @name ListProfiles
+ * @category profiles
+ * @since 4.0.0
+ */
+void WSRequestHandler::HandleListProfiles(WSRequestHandler* req) {
+    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);
+
+    req->SendOKResponse(response);
+}

src/WSRequestHandler_Recording.cpp

@@ -0,0 +1,100 @@
+#include <QString>
+#include "Utils.h"
+
+#include "WSRequestHandler.h"
+
+/**
+ * Toggle recording on or off.
+ *
+ * @api requests
+ * @name StartStopRecording
+ * @category recording
+ * @since 0.3
+ */
+ void WSRequestHandler::HandleStartStopRecording(WSRequestHandler* req) {
+    if (obs_frontend_recording_active())
+        obs_frontend_recording_stop();
+    else
+        obs_frontend_recording_start();
+
+    req->SendOKResponse();
+}
+
+/**
+ * Start recording.
+ * Will return an `error` if recording is already active.
+ *
+ * @api requests
+ * @name StartRecording
+ * @category recording
+ * @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");
+    }
+}
+
+/**
+ * Stop recording.
+ * Will return an `error` if recording is not active.
+ *
+ * @api requests
+ * @name StopRecording
+ * @category recording
+ * @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");
+    }
+}
+
+/**
+ * Change the current recording folder.
+ *
+ * @param {String} `rec-folder` Path of the recording folder.
+ *
+ * @api requests
+ * @name SetRecordingFolder
+ * @category recording
+ * @since 4.1.0
+ */
+ void WSRequestHandler::HandleSetRecordingFolder(WSRequestHandler* req) {
+    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");
+}
+
+/**
+ * Get the path of  the current recording folder.
+ *
+ * @return {String} `rec-folder` Path of the recording folder.
+ *
+ * @api requests
+ * @name GetRecordingFolder
+ * @category recording
+ * @since 4.1.0
+ */
+void WSRequestHandler::HandleGetRecordingFolder(WSRequestHandler* req) {
+    const char* recFolder = Utils::GetRecordingFolder();
+
+    OBSDataAutoRelease response = obs_data_create();
+    obs_data_set_string(response, "rec-folder", recFolder);
+
+    req->SendOKResponse(response);
+}

src/WSRequestHandler_ReplayBuffer.cpp

@@ -0,0 +1,92 @@
+#include <QString>
+#include "Utils.h"
+
+#include "WSRequestHandler.h"
+
+/**
+* Toggle the Replay Buffer on/off.
+*
+* @api requests
+* @name StartStopReplayBuffer
+* @category replay buffer
+* @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();
+}
+
+/**
+* Start recording into the Replay Buffer.
+* Will return an `error` if the Replay Buffer is already active or if the
+* "Save Replay Buffer" hotkey is not set in OBS' settings.
+* Setting this hotkey is mandatory, even when triggering saves only
+* through obs-websocket.
+*
+* @api requests
+* @name StartReplayBuffer
+* @category replay buffer
+* @since 4.2.0
+*/
+void WSRequestHandler::HandleStartReplayBuffer(WSRequestHandler* req) {
+    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;
+    }
+
+    Utils::StartReplayBuffer();
+    req->SendOKResponse();
+}
+
+/**
+* Stop recording into the Replay Buffer.
+* Will return an `error` if the Replay Buffer is not active.
+*
+* @api requests
+* @name StopReplayBuffer
+* @category replay buffer
+* @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");
+    }
+}
+
+/**
+* Flush and save the contents of the Replay Buffer to disk. This is
+* basically the same as triggering the "Save Replay Buffer" hotkey.
+* Will return an `error` if the Replay Buffer is not active.
+*
+* @api requests
+* @name SaveReplayBuffer
+* @category replay buffer
+* @since 4.2.0
+*/
+void WSRequestHandler::HandleSaveReplayBuffer(WSRequestHandler* req) {
+    if (!obs_frontend_replay_buffer_active()) {
+        req->SendErrorResponse("replay buffer not active");
+        return;
+    }
+
+    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);
+
+    req->SendOKResponse();
+}

src/WSRequestHandler_SceneCollections.cpp

@@ -0,0 +1,71 @@
+#include <QString>
+#include "Utils.h"
+
+#include "WSRequestHandler.h"
+
+/**
+ * Change the active scene collection.
+ *
+ * @param {String} `sc-name` Name of the desired scene collection.
+ *
+ * @api requests
+ * @name SetCurrentSceneCollection
+ * @category scene collections
+ * @since 4.0.0
+ */
+ void WSRequestHandler::HandleSetCurrentSceneCollection(WSRequestHandler* req) {
+    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");
+    }
+}
+
+/**
+ * Get the name of the current scene collection.
+ *
+ * @return {String} `sc-name` Name of the currently active scene collection.
+ *
+ * @api requests
+ * @name GetCurrentSceneCollection
+ * @category scene collections
+ * @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());
+
+    req->SendOKResponse(response);
+}
+
+/**
+ * List available scene collections
+ *
+ * @return {Object|Array} `scene-collections` Scene collections list
+ * @return {String} `scene-collections.*.`
+ *
+ * @api requests
+ * @name ListSceneCollections
+ * @category scene collections
+ * @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);
+
+    OBSDataAutoRelease response = obs_data_create();
+    obs_data_set_array(response, "scene-collections", list);
+
+    req->SendOKResponse(response);
+}

src/WSRequestHandler_SceneItems.cpp

@@ -0,0 +1,568 @@
+#include <QString>
+#include "Utils.h"
+
+#include "WSRequestHandler.h"
+
+/**
+* Gets the scene specific properties of the specified source item.
+*
+* @param {String (optional)} `scene-name` the name of the scene that the source item belongs to. Defaults to the current scene.
+* @param {String} `item` The name of the source.
+*
+* @return {String} `name` The name of the source.
+* @return {int} `position.x` The x position of the source from the left.
+* @return {int} `position.y` The y position of the source from the top.
+* @return {int} `position.alignment` The point on the source that the item is manipulated from.
+* @return {double} `rotation` The clockwise rotation of the item in degrees around the point of alignment.
+* @return {double} `scale.x` The x-scale factor of the source.
+* @return {double} `scale.y` The y-scale factor of the source.
+* @return {int} `crop.top` The number of pixels cropped off the top of the source before scaling.
+* @return {int} `crop.right` The number of pixels cropped off the right of the source before scaling.
+* @return {int} `crop.bottom` The number of pixels cropped off the bottom of the source before scaling.
+* @return {int} `crop.left` The number of pixels cropped off the left of the source before scaling.
+* @return {bool} `visible` If the source is visible.
+* @return {String} `bounds.type` Type of bounding box.
+* @return {int} `bounds.alignment` Alignment of the bounding box.
+* @return {double} `bounds.x` Width of the bounding box.
+* @return {double} `bounds.y` Height of the bounding box.
+*
+* @api requests
+* @name GetSceneItemProperties
+* @category scene items
+* @since 4.3.0
+*/
+void WSRequestHandler::HandleGetSceneItemProperties(WSRequestHandler* req) {
+	if (!req->hasField("item")) {
+		req->SendErrorResponse("missing request parameters");
+		return;
+	}
+
+	QString itemName = obs_data_get_string(req->data, "item");
+	if (itemName.isEmpty()) {
+		req->SendErrorResponse("invalid request parameters");
+		return;
+	}
+
+	QString sceneName = obs_data_get_string(req->data, "scene-name");
+	OBSSourceAutoRelease scene = Utils::GetSceneFromNameOrCurrent(sceneName);
+	if (!scene) {
+		req->SendErrorResponse("requested scene doesn't exist");
+		return;
+	}
+
+	OBSSceneItemAutoRelease sceneItem =
+		Utils::GetSceneItemFromName(scene, itemName);
+	if (!sceneItem) {
+		req->SendErrorResponse("specified scene item doesn't exist");
+		return;
+	}
+
+	OBSDataAutoRelease data = obs_data_create();
+	obs_data_set_string(data, "name", itemName.toUtf8());
+
+	OBSDataAutoRelease posData = obs_data_create();
+	vec2 pos;
+	obs_sceneitem_get_pos(sceneItem, &pos);
+	obs_data_set_double(posData, "x", pos.x);
+	obs_data_set_double(posData, "y", pos.y);
+	obs_data_set_int(posData, "alignment", obs_sceneitem_get_alignment(sceneItem));
+	obs_data_set_obj(data, "position", posData);
+
+	obs_data_set_double(data, "rotation", obs_sceneitem_get_rot(sceneItem));
+
+	OBSDataAutoRelease scaleData = obs_data_create();
+	vec2 scale;
+	obs_sceneitem_get_scale(sceneItem, &scale);
+	obs_data_set_double(scaleData, "x", scale.x);
+	obs_data_set_double(scaleData, "y", scale.y);
+	obs_data_set_obj(data, "scale", scaleData);
+
+	OBSDataAutoRelease cropData = obs_data_create();
+	obs_sceneitem_crop crop;
+	obs_sceneitem_get_crop(sceneItem, &crop);
+	obs_data_set_int(cropData, "left", crop.left);
+	obs_data_set_int(cropData, "top", crop.top);
+	obs_data_set_int(cropData, "right", crop.right);
+	obs_data_set_int(cropData, "bottom", crop.bottom);
+	obs_data_set_obj(data, "crop", cropData);
+
+	obs_data_set_bool(data, "visible", obs_sceneitem_visible(sceneItem));
+
+	OBSDataAutoRelease boundsData = obs_data_create();
+	obs_bounds_type boundsType = obs_sceneitem_get_bounds_type(sceneItem);
+	if (boundsType == OBS_BOUNDS_NONE) {
+		obs_data_set_string(boundsData, "type", "OBS_BOUNDS_NONE");
+	}
+	else {
+		switch (boundsType) {
+		case OBS_BOUNDS_STRETCH: {
+			obs_data_set_string(boundsData, "type", "OBS_BOUNDS_STRETCH");
+			break;
+		}
+		case OBS_BOUNDS_SCALE_INNER: {
+			obs_data_set_string(boundsData, "type", "OBS_BOUNDS_SCALE_INNER");
+			break;
+		}
+		case OBS_BOUNDS_SCALE_OUTER: {
+			obs_data_set_string(boundsData, "type", "OBS_BOUNDS_SCALE_OUTER");
+			break;
+		}
+		case OBS_BOUNDS_SCALE_TO_WIDTH: {
+			obs_data_set_string(boundsData, "type", "OBS_BOUNDS_SCALE_TO_WIDTH");
+			break;
+		}
+		case OBS_BOUNDS_SCALE_TO_HEIGHT: {
+			obs_data_set_string(boundsData, "type", "OBS_BOUNDS_SCALE_TO_HEIGHT");
+			break;
+		}
+		case OBS_BOUNDS_MAX_ONLY: {
+			obs_data_set_string(boundsData, "type", "OBS_BOUNDS_MAX_ONLY");
+			break;
+		}
+		}
+		obs_data_set_int(boundsData, "alignment", obs_sceneitem_get_bounds_alignment(sceneItem));
+		vec2 bounds;
+		obs_sceneitem_get_bounds(sceneItem, &bounds);
+		obs_data_set_double(boundsData, "x", bounds.x);
+		obs_data_set_double(boundsData, "y", bounds.y);
+	}
+	obs_data_set_obj(data, "bounds", boundsData);
+
+	req->SendOKResponse(data);
+}
+
+/**
+* Sets the scene specific properties of a source. Unspecified properties will remain unchanged.
+*
+* @param {String (optional)} `scene-name` the name of the scene that the source item belongs to. Defaults to the current scene.
+* @param {String} `item` The name of the source.
+* @param {int} `position.x` The new x position of the source.
+* @param {int} `position.y` The new y position of the source.
+* @param {int} `position.alignment` The new alignment of the source.
+* @param {double} `rotation` The new clockwise rotation of the item in degrees.
+* @param {double} `scale.x` The new x scale of the item.
+* @param {double} `scale.y` The new y scale of the item.
+* @param {int} `crop.top` The new amount of pixels cropped off the top of the source before scaling.
+* @param {int} `crop.bottom` The new amount of pixels cropped off the bottom of the source before scaling.
+* @param {int} `crop.left` The new amount of pixels cropped off the left of the source before scaling.
+* @param {int} `crop.right` The new amount of pixels cropped off the right of the source before scaling.
+* @param {bool} `visible` The new visibility of the source. 'true' shows source, 'false' hides source.
+* @param {String} `bounds.type` The new bounds type of the source.
+* @param {int} `bounds.alignment` The new alignment of the bounding box. (0-2, 4-6, 8-10)
+* @param {double} `bounds.x` The new width of the bounding box.
+* @param {double} `bounds.y` The new height of the bounding box.
+*
+* @api requests
+* @name SetSceneItemProperties
+* @category scene items
+* @since 4.3.0
+*/
+void WSRequestHandler::HandleSetSceneItemProperties(WSRequestHandler* req) {
+	if (!req->hasField("item")) {
+		req->SendErrorResponse("missing request parameters");
+		return;
+	}
+
+	QString itemName = obs_data_get_string(req->data, "item");
+	if (itemName.isEmpty()) {
+		req->SendErrorResponse("invalid request parameters");
+		return;
+	}
+
+	QString sceneName = obs_data_get_string(req->data, "scene-name");
+	OBSSourceAutoRelease scene = Utils::GetSceneFromNameOrCurrent(sceneName);
+	if (!scene) {
+		req->SendErrorResponse("requested scene doesn't exist");
+		return;
+	}
+
+	OBSSceneItemAutoRelease sceneItem =
+		Utils::GetSceneItemFromName(scene, itemName);
+	if (!sceneItem) {
+		req->SendErrorResponse("specified scene item doesn't exist");
+		return;
+	}
+
+	bool badRequest = false;
+	OBSDataAutoRelease errorMessage = obs_data_create();
+
+	if (req->hasField("position")) {
+		vec2 oldPosition;
+		OBSDataAutoRelease positionError = obs_data_create();
+		obs_sceneitem_get_pos(sceneItem, &oldPosition);
+		OBSDataAutoRelease reqPosition = obs_data_get_obj(req->data, "position");
+		vec2 newPosition = oldPosition;
+		if (obs_data_has_user_value(reqPosition, "x")) {
+			newPosition.x = obs_data_get_int(reqPosition, "x");
+		}
+		if (obs_data_has_user_value(reqPosition, "y")) {
+			newPosition.y = obs_data_get_int(reqPosition, "y");
+		}
+		if (obs_data_has_user_value(reqPosition, "alignment")) {
+			const uint32_t alignment = obs_data_get_int(reqPosition, "alignment");
+			if (Utils::IsValidAlignment(alignment)) {
+				obs_sceneitem_set_alignment(sceneItem, alignment);
+			}
+			else {
+				badRequest = true;
+				obs_data_set_string(positionError, "alignment", "invalid");
+				obs_data_set_obj(errorMessage, "position", positionError);
+			}
+		}
+		obs_sceneitem_set_pos(sceneItem, &newPosition);
+	}
+
+	if (req->hasField("rotation")) {
+		obs_sceneitem_set_rot(sceneItem, (float)obs_data_get_double(req->data, "rotation"));
+	}
+
+	if (req->hasField("scale")) {
+		vec2 oldScale;
+		obs_sceneitem_get_scale(sceneItem, &oldScale);
+		OBSDataAutoRelease reqScale = obs_data_get_obj(req->data, "scale");
+		vec2 newScale = oldScale;
+		if (obs_data_has_user_value(reqScale, "x")) {
+			newScale.x = obs_data_get_double(reqScale, "x");
+		}
+		if (obs_data_has_user_value(reqScale, "y")) {
+			newScale.y = obs_data_get_double(reqScale, "y");
+		}
+		obs_sceneitem_set_scale(sceneItem, &newScale);
+	}
+
+	if (req->hasField("crop")) {
+		obs_sceneitem_crop oldCrop;
+		obs_sceneitem_get_crop(sceneItem, &oldCrop);
+		OBSDataAutoRelease reqCrop = obs_data_get_obj(req->data, "crop");
+		obs_sceneitem_crop newCrop = oldCrop;
+		if (obs_data_has_user_value(reqCrop, "top")) {
+			newCrop.top = obs_data_get_int(reqCrop, "top");
+		}
+		if (obs_data_has_user_value(reqCrop, "right")) {
+			newCrop.right = obs_data_get_int(reqCrop, "right");
+		}
+		if (obs_data_has_user_value(reqCrop, "bottom")) {
+			newCrop.bottom = obs_data_get_int(reqCrop, "bottom");
+		}
+		if (obs_data_has_user_value(reqCrop, "left")) {
+			newCrop.left = obs_data_get_int(reqCrop, "left");
+		}
+		obs_sceneitem_set_crop(sceneItem, &newCrop);
+	}
+
+	if (req->hasField("visible")) {
+		obs_sceneitem_set_visible(sceneItem, obs_data_get_bool(req->data, "visible"));
+	}
+
+	if (req->hasField("bounds")) {
+		bool badBounds = false;
+		OBSDataAutoRelease boundsError = obs_data_create();
+		OBSDataAutoRelease reqBounds = obs_data_get_obj(req->data, "bounds");
+		if (obs_data_has_user_value(reqBounds, "type")) {
+			const char* newBoundsType = obs_data_get_string(reqBounds, "type");
+			if (newBoundsType == "OBS_BOUNDS_NONE") {
+				obs_sceneitem_set_bounds_type(sceneItem, OBS_BOUNDS_NONE);
+			}
+			else if (newBoundsType == "OBS_BOUNDS_STRETCH") {
+				obs_sceneitem_set_bounds_type(sceneItem, OBS_BOUNDS_STRETCH);
+			}
+			else if (newBoundsType == "OBS_BOUNDS_SCALE_INNER") {
+				obs_sceneitem_set_bounds_type(sceneItem, OBS_BOUNDS_SCALE_INNER);
+			}
+			else if (newBoundsType == "OBS_BOUNDS_SCALE_OUTER") {
+				obs_sceneitem_set_bounds_type(sceneItem, OBS_BOUNDS_SCALE_OUTER);
+			}
+			else if (newBoundsType == "OBS_BOUNDS_SCALE_TO_WIDTH") {
+				obs_sceneitem_set_bounds_type(sceneItem, OBS_BOUNDS_SCALE_TO_WIDTH);
+			}
+			else if (newBoundsType == "OBS_BOUNDS_SCALE_TO_HEIGHT") {
+				obs_sceneitem_set_bounds_type(sceneItem, OBS_BOUNDS_SCALE_TO_HEIGHT);
+			}
+			else if (newBoundsType == "OBS_BOUNDS_MAX_ONLY") {
+				obs_sceneitem_set_bounds_type(sceneItem, OBS_BOUNDS_MAX_ONLY);
+			}
+			else {
+				badRequest = badBounds = true;
+				obs_data_set_string(boundsError, "type", "invalid");
+			}
+		}
+		vec2 oldBounds;
+		obs_sceneitem_get_bounds(sceneItem, &oldBounds);
+		vec2 newBounds = oldBounds;
+		if (obs_data_has_user_value(reqBounds, "x")) {
+			newBounds.x = obs_data_get_double(reqBounds, "x");
+		}
+		if (obs_data_has_user_value(reqBounds, "y")) {
+			newBounds.y = obs_data_get_double(reqBounds, "y");
+		}
+		obs_sceneitem_set_bounds(sceneItem, &newBounds);
+		if (obs_data_has_user_value(reqBounds, "alignment")) {
+			const uint32_t bounds_alignment = obs_data_get_int(reqBounds, "alignment");
+			if (Utils::IsValidAlignment(bounds_alignment)) {
+				obs_sceneitem_set_bounds_alignment(sceneItem, bounds_alignment);
+			}
+			else {
+				badRequest = badBounds = true;
+				obs_data_set_string(boundsError, "alignment", "invalid");
+			}
+		}
+		if (badBounds) {
+			obs_data_set_obj(errorMessage, "bounds", boundsError);
+		}
+	}
+
+	if (badRequest) {
+		req->SendErrorResponse(errorMessage);
+	}
+	else {
+		req->SendOKResponse();
+	}
+}
+
+/**
+* Reset a scene item.
+*
+* @param {String (optional)} `scene-name` Name of the scene the source belogns to. Defaults to the current scene.
+* @param {String} `item` Name of the source item.
+*
+* @api requests
+* @name ResetSceneItem
+* @category scene items
+* @since 4.2.0
+*/
+void WSRequestHandler::HandleResetSceneItem(WSRequestHandler* req) {
+	// TODO: remove this request, or refactor it to ResetSource
+
+	if (!req->hasField("item")) {
+		req->SendErrorResponse("missing request parameters");
+		return;
+	}
+
+	const char* itemName = obs_data_get_string(req->data, "item");
+	if (!itemName) {
+		req->SendErrorResponse("invalid request parameters");
+		return;
+	}
+
+	const char* sceneName = obs_data_get_string(req->data, "scene-name");
+	OBSSourceAutoRelease scene = Utils::GetSceneFromNameOrCurrent(sceneName);
+	if (!scene) {
+		req->SendErrorResponse("requested scene doesn't exist");
+		return;
+	}
+
+	OBSSceneItemAutoRelease sceneItem = Utils::GetSceneItemFromName(scene, itemName);
+	if (sceneItem) {
+		OBSSource sceneItemSource = obs_sceneitem_get_source(sceneItem);
+
+		OBSDataAutoRelease settings = obs_source_get_settings(sceneItemSource);
+		obs_source_update(sceneItemSource, settings);
+
+		req->SendOKResponse();
+	}
+	else {
+		req->SendErrorResponse("specified scene item doesn't exist");
+	}
+}
+
+/**
+* Show or hide a specified source item in a specified scene.
+*
+* @param {String} `source` Scene item name in the specified scene.
+* @param {boolean} `render` true = shown ; false = hidden
+* @param {String (optional)} `scene-name` Name of the scene where the source resides. Defaults to the currently active scene.
+*
+* @api requests
+* @name SetSceneItemRender
+* @category scene items
+* @since 0.3
+* @deprecated Since 4.3.0. Prefer the use of SetSceneItemProperties.
+*/
+void WSRequestHandler::HandleSetSceneItemRender(WSRequestHandler* req) {
+	if (!req->hasField("source") ||
+		!req->hasField("render"))
+	{
+		req->SendErrorResponse("missing request parameters");
+		return;
+	}
+
+	const char* itemName = obs_data_get_string(req->data, "source");
+	bool isVisible = obs_data_get_bool(req->data, "render");
+
+	if (!itemName) {
+		req->SendErrorResponse("invalid request parameters");
+		return;
+	}
+
+	const char* sceneName = obs_data_get_string(req->data, "scene-name");
+	OBSSourceAutoRelease scene = Utils::GetSceneFromNameOrCurrent(sceneName);
+	if (!scene) {
+		req->SendErrorResponse("requested scene doesn't exist");
+		return;
+	}
+
+	OBSSceneItemAutoRelease sceneItem =
+		Utils::GetSceneItemFromName(scene, itemName);
+	if (sceneItem) {
+		obs_sceneitem_set_visible(sceneItem, isVisible);
+		req->SendOKResponse();
+	}
+	else {
+		req->SendErrorResponse("specified scene item doesn't exist");
+	}
+}
+
+/**
+* Sets the coordinates of a specified source item.
+*
+* @param {String (optional)} `scene-name` The name of the scene that the source item belongs to. Defaults to the current scene.
+* @param {String} `item` The name of the source item.
+* @param {double} `x` X coordinate.
+* @param {double} `y` Y coordinate.
+
+*
+* @api requests
+* @name SetSceneItemPosition
+* @category scene items
+* @since 4.0.0
+* @deprecated Since 4.3.0. Prefer the use of SetSceneItemProperties.
+*/
+void WSRequestHandler::HandleSetSceneItemPosition(WSRequestHandler* req) {
+	if (!req->hasField("item") ||
+		!req->hasField("x") || !req->hasField("y")) {
+		req->SendErrorResponse("missing request parameters");
+		return;
+	}
+
+	QString itemName = obs_data_get_string(req->data, "item");
+	if (itemName.isEmpty()) {
+		req->SendErrorResponse("invalid request parameters");
+		return;
+	}
+
+	QString sceneName = obs_data_get_string(req->data, "scene-name");
+	OBSSourceAutoRelease scene = Utils::GetSceneFromNameOrCurrent(sceneName);
+	if (!scene) {
+		req->SendErrorResponse("requested scene could not be found");
+		return;
+	}
+
+	OBSSceneItem sceneItem = Utils::GetSceneItemFromName(scene, itemName);
+	if (sceneItem) {
+		vec2 item_position = { 0 };
+		item_position.x = obs_data_get_double(req->data, "x");
+		item_position.y = obs_data_get_double(req->data, "y");
+		obs_sceneitem_set_pos(sceneItem, &item_position);
+
+		req->SendOKResponse();
+	}
+	else {
+		req->SendErrorResponse("specified scene item doesn't exist");
+	}
+}
+
+/**
+* Set the transform of the specified source item.
+*
+* @param {String (optional)} `scene-name` The name of the scene that the source item belongs to. Defaults to the current scene.
+* @param {String} `item` The name of the source item.
+* @param {double} `x-scale` Width scale factor.
+* @param {double} `y-scale` Height scale factor.
+* @param {double} `rotation` Source item rotation (in degrees).
+*
+* @api requests
+* @name SetSceneItemTransform
+* @category scene items
+* @since 4.0.0
+* @deprecated Since 4.3.0. Prefer the use of SetSceneItemProperties.
+*/
+void WSRequestHandler::HandleSetSceneItemTransform(WSRequestHandler* req) {
+	if (!req->hasField("item") ||
+		!req->hasField("x-scale") ||
+		!req->hasField("y-scale") ||
+		!req->hasField("rotation"))
+	{
+		req->SendErrorResponse("missing request parameters");
+		return;
+	}
+
+	QString itemName = obs_data_get_string(req->data, "item");
+	if (itemName.isEmpty()) {
+		req->SendErrorResponse("invalid request parameters");
+		return;
+	}
+
+	QString sceneName = obs_data_get_string(req->data, "scene-name");
+	OBSSourceAutoRelease scene = Utils::GetSceneFromNameOrCurrent(sceneName);
+	if (!scene) {
+		req->SendErrorResponse("requested scene doesn't exist");
+		return;
+	}
+
+	vec2 scale;
+	scale.x = obs_data_get_double(req->data, "x-scale");
+	scale.y = obs_data_get_double(req->data, "y-scale");
+	float rotation = obs_data_get_double(req->data, "rotation");
+
+	OBSSceneItemAutoRelease sceneItem = Utils::GetSceneItemFromName(scene, itemName);
+	if (sceneItem) {
+		obs_sceneitem_set_scale(sceneItem, &scale);
+		obs_sceneitem_set_rot(sceneItem, rotation);
+		req->SendOKResponse();
+	}
+	else {
+		req->SendErrorResponse("specified scene item doesn't exist");
+	}
+}
+
+/**
+* Sets the crop coordinates of the specified source item.
+*
+* @param {String (optional)} `scene-name` the name of the scene that the source item belongs to. Defaults to the current scene.
+* @param {String} `item` The name of the source.
+* @param {int} `top` Pixel position of the top of the source item.
+* @param {int} `bottom` Pixel position of the bottom of the source item.
+* @param {int} `left` Pixel position of the left of the source item.
+* @param {int} `right` Pixel position of the right of the source item.
+*
+* @api requests
+* @name SetSceneItemCrop
+* @category scene items
+* @since 4.1.0
+* @deprecated Since 4.3.0. Prefer the use of SetSceneItemProperties.
+*/
+void WSRequestHandler::HandleSetSceneItemCrop(WSRequestHandler* req) {
+	if (!req->hasField("item")) {
+		req->SendErrorResponse("missing request parameters");
+		return;
+	}
+
+	QString itemName = obs_data_get_string(req->data, "item");
+	if (itemName.isEmpty()) {
+		req->SendErrorResponse("invalid request parameters");
+		return;
+	}
+
+	QString sceneName = obs_data_get_string(req->data, "scene-name");
+	OBSSourceAutoRelease scene = Utils::GetSceneFromNameOrCurrent(sceneName);
+	if (!scene) {
+		req->SendErrorResponse("requested scene doesn't exist");
+		return;
+	}
+
+	OBSSceneItemAutoRelease sceneItem = Utils::GetSceneItemFromName(scene, itemName);
+	if (sceneItem) {
+		struct obs_sceneitem_crop crop = { 0 };
+		crop.top = obs_data_get_int(req->data, "top");
+		crop.bottom = obs_data_get_int(req->data, "bottom");
+		crop.left = obs_data_get_int(req->data, "left");
+		crop.right = obs_data_get_int(req->data, "right");
+
+		obs_sceneitem_set_crop(sceneItem, &crop);
+
+		req->SendOKResponse();
+	}
+	else {
+		req->SendErrorResponse("specified scene item doesn't exist");
+	}
+}

src/WSRequestHandler_Scenes.cpp

@@ -0,0 +1,76 @@
+#include <QString>
+#include "Utils.h"
+
+#include "WSRequestHandler.h"
+
+/**
+ * Switch to the specified scene.
+ *
+ * @param {String} `scene-name` Name of the scene to switch to.
+ *
+ * @api requests
+ * @name SetCurrentScene
+ * @category scenes
+ * @since 0.3
+ */
+ void WSRequestHandler::HandleSetCurrentScene(WSRequestHandler* req) {
+    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);
+
+    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.
+ *
+ * @api requests
+ * @name GetCurrentScene
+ * @category scenes
+ * @since 0.3
+ */
+void WSRequestHandler::HandleGetCurrentScene(WSRequestHandler* req) {
+    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);
+
+    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).
+ *
+ * @api requests
+ * @name GetSceneList
+ * @category scenes
+ * @since 0.3
+ */
+void WSRequestHandler::HandleGetSceneList(WSRequestHandler* req) {
+    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);
+
+    req->SendOKResponse(data);
+}

src/WSRequestHandler_Streaming.cpp

@@ -0,0 +1,288 @@
+#include <QString>
+#include "Utils.h"
+#include "WSEvents.h"
+
+#include "WSRequestHandler.h"
+
+#define STREAM_SERVICE_ID "websocket_custom_service"
+
+ /**
+ * Get current streaming and recording status.
+ * 
+ * @return {boolean} `streaming` Current streaming status.
+ * @return {boolean} `recording` Current recording status.
+ * @return {String (optional)} `stream-timecode` Time elapsed since streaming started (only present if currently streaming).
+ * @return {String (optional)} `rec-timecode` Time elapsed since recording started (only present if currently recording).
+ * @return {boolean} `preview-only` Always false. Retrocompatibility with OBSRemote.
+ *
+ * @api requests
+ * @name GetStreamingStatus
+ * @category streaming
+ * @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);
+
+    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);
+    }
+
+    req->SendOKResponse(data);
+}
+
+/**
+ * Toggle streaming on or off.
+ *
+ * @api requests
+ * @name StartStopStreaming
+ * @category streaming
+ * @since 0.3
+ */
+ void WSRequestHandler::HandleStartStopStreaming(WSRequestHandler* req) {
+    if (obs_frontend_streaming_active())
+        HandleStopStreaming(req);
+    else
+        HandleStartStreaming(req);
+}
+
+/**
+ * Start streaming.
+ * Will return an `error` if streaming is already active.
+ *
+ * @param {Object (optional)} `stream` Special stream configuration. Please note: these won't be saved to OBS' configuration.
+ * @param {String (optional)} `stream.type` If specified ensures the type of stream matches the given type (usually 'rtmp_custom' or 'rtmp_common'). If the currently configured stream type does not match the given stream type, all settings must be specified in the `settings` object or an error will occur when starting the stream.
+ * @param {Object (optional)} `stream.metadata` Adds the given object parameters as encoded query string parameters to the 'key' of the RTMP stream. Used to pass data to the RTMP service about the streaming. May be any String, Numeric, or Boolean field. 
+ * @param {Object (optional)} `stream.settings` Settings for the stream.
+ * @param {String (optional)} `stream.settings.server` The publish URL.
+ * @param {String (optional)} `stream.settings.key` The publish key of the stream.
+ * @param {boolean (optional)} `stream.settings.use-auth` Indicates whether authentication should be used when connecting to the streaming server.
+ * @param {String (optional)} `stream.settings.username` If authentication is enabled, the username for the streaming server. Ignored if `use-auth` is not set to `true`.
+ * @param {String (optional)} `stream.settings.password` If authentication is enabled, the password for the streaming server. Ignored if `use-auth` is not set to `true`.
+ *
+ * @api requests
+ * @name StartStreaming
+ * @category streaming
+ * @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;
+
+        // 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");
+
+            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;
+            }
+
+            //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;
+                    }
+                }
+
+                if (hasQuestionMark) {
+                    query.prepend('&');
+                } else {
+                    query.prepend('?');
+                }
+
+                query.prepend(key);
+                obs_data_set_string(newSettings, "key", query.toUtf8());
+            }
+
+            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
+
+                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
+
+                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_streaming_start();
+
+        // 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");
+    }
+}
+
+/**
+ * Stop streaming.
+ * Will return an `error` if streaming is not active.
+ *
+ * @api requests
+ * @name StopStreaming
+ * @category streaming
+ * @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");
+    }
+}
+
+/**
+ * Sets one or more attributes of the current streaming server settings. Any options not passed will remain unchanged. Returns the updated settings in response. If 'type' is different than the current streaming service type, all settings are required. Returns the full settings of the stream (the same as GetStreamSettings).
+ * 
+ * @param {String} `type` The type of streaming service configuration, usually `rtmp_custom` or `rtmp_common`.
+ * @param {Object} `settings` The actual settings of the stream.
+ * @param {String (optional)} `settings.server` The publish URL.
+ * @param {String (optional)} `settings.key` The publish key.
+ * @param {boolean (optional)} `settings.use-auth` Indicates whether authentication should be used when connecting to the streaming server.
+ * @param {String (optional)} `settings.username` The username for the streaming service.
+ * @param {String (optional)} `settings.password` The password for the streaming service.
+ * @param {boolean} `save` Persist the settings to disk.
+ *
+ * @api requests
+ * @name SetStreamSettings
+ * @category streaming
+ * @since 4.1.0
+ */
+ void WSRequestHandler::HandleSetStreamSettings(WSRequestHandler* req) {
+    OBSService service = obs_frontend_get_streaming_service();
+
+    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");
+
+    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();
+
+        // 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);
+    }
+
+    //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 response = obs_data_create();
+    obs_data_set_string(response, "type", requestedType.toUtf8());
+    obs_data_set_obj(response, "settings", serviceSettings);
+
+    req->SendOKResponse(response);
+}
+
+/**
+ * Get the current streaming server settings.
+ *
+ * @return {String} `type` The type of streaming service configuration. Possible values: 'rtmp_custom' or 'rtmp_common'.
+ * @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 {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`.
+ *
+ * @api requests
+ * @name GetStreamSettings
+ * @category streaming
+ * @since 4.1.0
+ */
+void WSRequestHandler::HandleGetStreamSettings(WSRequestHandler* req) {
+    OBSService service = obs_frontend_get_streaming_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);
+
+    req->SendOKResponse(response);
+}
+
+/**
+ * Save the current streaming server settings to disk.
+ *
+ * @api requests
+ * @name SaveStreamSettings
+ * @category streaming
+ * @since 4.1.0
+ */
+void WSRequestHandler::HandleSaveStreamSettings(WSRequestHandler* req) {
+    obs_frontend_save_streaming_service();
+    req->SendOKResponse();
+}

src/WSRequestHandler_StudioMode.cpp

@@ -0,0 +1,173 @@
+#include <QString>
+#include "Utils.h"
+
+#include "WSRequestHandler.h"
+
+/**
+ * Indicates if Studio Mode is currently enabled.
+ *
+ * @return {boolean} `studio-mode` Indicates if Studio Mode is enabled.
+ *
+ * @api requests
+ * @name GetStudioModeStatus
+ * @category studio mode
+ * @since 4.1.0
+ */
+ void WSRequestHandler::HandleGetStudioModeStatus(WSRequestHandler* req) {
+    bool previewActive = obs_frontend_preview_program_mode_active();
+
+    OBSDataAutoRelease response = obs_data_create();
+    obs_data_set_bool(response, "studio-mode", previewActive);
+
+    req->SendOKResponse(response);
+}
+
+/**
+ * Get the name of the currently previewed scene and its list of sources.
+ * Will return an `error` if Studio Mode is not enabled.
+ *
+ * @return {String} `name` The name of the active preview scene.
+ * @return {Source|Array} `sources`
+ *
+ * @api requests
+ * @name GetPreviewScene
+ * @category studio mode
+ * @since 4.1.0
+ */
+void WSRequestHandler::HandleGetPreviewScene(WSRequestHandler* req) {
+    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);
+
+    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);
+}
+
+/**
+ * Set the active preview scene.
+ * Will return an `error` if Studio Mode is not enabled.
+ *
+ * @param {String} `scene-name` The name of the scene to preview.
+ *
+ * @api requests
+ * @name SetPreviewScene
+ * @category studio mode
+ * @since 4.1.0
+ */
+void WSRequestHandler::HandleSetPreviewScene(WSRequestHandler* req) {
+    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;
+    }
+
+    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");
+    }
+}
+
+/**
+ * Transitions the currently previewed scene to the main output.
+ * Will return an `error` if Studio Mode is not enabled.
+ *
+ * @param {Object (optional)} `with-transition` Change the active transition before switching scenes. Defaults to the active transition. 
+ * @param {String} `with-transition.name` Name of the transition.
+ * @param {int (optional)} `with-transition.duration` Transition duration (in milliseconds).
+ *
+ * @api requests
+ * @name TransitionToProgram
+ * @category studio mode
+ * @since 4.1.0
+ */
+void WSRequestHandler::HandleTransitionToProgram(WSRequestHandler* req) {
+    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 (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;
+            }
+        }
+
+        if (obs_data_has_user_value(transitionInfo, "duration")) {
+            int transitionDuration =
+                obs_data_get_int(transitionInfo, "duration");
+            Utils::SetTransitionDuration(transitionDuration);
+        }
+    }
+
+    Utils::TransitionToProgram();
+    req->SendOKResponse();
+}
+
+/**
+ * Enables Studio Mode.
+ *
+ * @api requests
+ * @name EnableStudioMode
+ * @category studio mode
+ * @since 4.1.0
+ */
+void WSRequestHandler::HandleEnableStudioMode(WSRequestHandler* req) {
+    obs_frontend_set_preview_program_mode(true);
+    req->SendOKResponse();
+}
+
+/**
+ * Disables Studio Mode.
+ *
+ * @api requests
+ * @name DisableStudioMode
+ * @category studio mode
+ * @since 4.1.0
+ */
+void WSRequestHandler::HandleDisableStudioMode(WSRequestHandler* req) {
+    obs_frontend_set_preview_program_mode(false);
+    req->SendOKResponse();
+}
+
+/**
+ * Toggles Studio Mode.
+ *
+ * @api requests
+ * @name ToggleStudioMode
+ * @category studio mode
+ * @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();
+}

src/WSRequestHandler_Transitions.cpp

@@ -0,0 +1,126 @@
+#include <QString>
+#include "Utils.h"
+
+#include "WSRequestHandler.h"
+
+/**
+ * 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.
+ *
+ * @api requests
+ * @name GetTransitionList
+ * @category transitions
+ * @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);
+
+    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 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);
+}
+
+/**
+ * Get the name of the currently selected transition in the frontend's dropdown menu.
+ *
+ * @return {String} `name` Name of the selected transition.
+ * @return {int (optional)} `duration` Transition duration (in milliseconds) if supported by the transition.
+ *
+ * @api requests
+ * @name GetCurrentTransition
+ * @category transitions
+ * @since 0.3
+ */
+void WSRequestHandler::HandleGetCurrentTransition(WSRequestHandler* req) {
+    OBSSourceAutoRelease currentTransition = obs_frontend_get_current_transition();
+
+    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());
+
+    req->SendOKResponse(response);
+}
+
+/**
+ * Set the active transition.
+ *
+ * @param {String} `transition-name` The name of the transition.
+ *
+ * @api requests
+ * @name SetCurrentTransition
+ * @category transitions
+ * @since 0.3
+ */
+void WSRequestHandler::HandleSetCurrentTransition(WSRequestHandler* req) {
+    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");
+}
+
+/**
+ * Set the duration of the currently selected transition if supported.
+ *
+ * @param {int} `duration` Desired duration of the transition (in milliseconds).
+ *
+ * @api requests
+ * @name SetTransitionDuration
+ * @category transitions
+ * @since 4.0.0
+ */
+void WSRequestHandler::HandleSetTransitionDuration(WSRequestHandler* req) {
+    if (!req->hasField("duration")) {
+        req->SendErrorResponse("missing request parameters");
+        return;
+    }
+
+    int ms = obs_data_get_int(req->data, "duration");
+    Utils::SetTransitionDuration(ms);
+    req->SendOKResponse();
+}
+
+/**
+ * Get the duration of the currently selected transition if supported.
+ *
+ * @return {int} `transition-duration` Duration of the current transition (in milliseconds).
+ *
+ * @api requests
+ * @name GetTransitionDuration
+ * @category transitions
+ * @since 4.1.0
+ */
+void WSRequestHandler::HandleGetTransitionDuration(WSRequestHandler* req) {
+    OBSDataAutoRelease response = obs_data_create();
+    obs_data_set_int(response, "transition-duration",
+        Utils::GetTransitionDuration());
+
+    req->SendOKResponse(response);
+}

src/WSServer.cpp

@@ -19,6 +19,8 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <QtWebSockets/QWebSocket>
 #include <QtCore/QThread>
 #include <QtCore/QByteArray>
+#include <QMainWindow>
+#include <QMessageBox>
 #include <obs-frontend-api.h>
 
 #include "WSServer.h"
@@ -34,7 +36,8 @@ WSServer::WSServer(QObject* parent)
     : QObject(parent),
       _wsServer(Q_NULLPTR),
       _clients(),
-      _clMutex(QMutex::Recursive) {
+      _clMutex(QMutex::Recursive)
+{
     _wsServer = new QWebSocketServer(
         QStringLiteral("obs-websocket"),
         QWebSocketServer::NonSecureMode);
@@ -53,23 +56,42 @@ void WSServer::Start(quint16 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());
+
+        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();
+
+        QMessageBox::warning(mainWindow, title, msg);
+    }
 }
 
 void WSServer::Stop() {
-    _clMutex.lock();
+    QMutexLocker locker(&_clMutex);
     for(QWebSocket* pClient : _clients) {
         pClient->close();
     }
-    _clMutex.unlock();
+    locker.unlock();
 
     _wsServer->close();
+
+    blog(LOG_INFO, "server stopped successfully");
 }
 
 void WSServer::broadcast(QString message) {
-    _clMutex.lock();
+    QMutexLocker locker(&_clMutex);
     for(QWebSocket* pClient : _clients) {
         if (Config::Current()->AuthRequired
             && (pClient->property(PROP_AUTHENTICATED).toBool() == false)) {
@@ -78,7 +100,6 @@ void WSServer::broadcast(QString message) {
         }
         pClient->sendTextMessage(message);
     }
-    _clMutex.unlock();
 }
 
 void WSServer::onNewConnection() {
@@ -91,9 +112,9 @@ void WSServer::onNewConnection() {
 
         pSocket->setProperty(PROP_AUTHENTICATED, false);
 
-        _clMutex.lock();
+        QMutexLocker locker(&_clMutex);
         _clients << pSocket;
-        _clMutex.unlock();
+        locker.unlock();
 
         QHostAddress clientAddr = pSocket->peerAddress();
         QString clientIp = Utils::FormatIPAddress(clientAddr);
@@ -101,13 +122,13 @@ void WSServer::onNewConnection() {
         blog(LOG_INFO, "new client connection from %s:%d",
             clientIp.toUtf8().constData(), pSocket->peerPort());
 
-        QString msg = QString(obs_module_text("OBSWebsocket.ConnectNotify.ClientIP"))
-            + QString(" ")
-            + Utils::FormatIPAddress(clientAddr);
+        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,
-            QString(obs_module_text("OBSWebsocket.ConnectNotify.Connected")));
+        Utils::SysTrayNotify(msg, QSystemTrayIcon::Information, title);
     }
 }
 
@@ -124,9 +145,9 @@ void WSServer::onSocketDisconnected() {
     if (pSocket) {
         pSocket->setProperty(PROP_AUTHENTICATED, false);
 
-        _clMutex.lock();
+        QMutexLocker locker(&_clMutex);
         _clients.removeAll(pSocket);
-        _clMutex.unlock();
+        locker.unlock();
 
         pSocket->deleteLater();
 
@@ -136,12 +157,12 @@ void WSServer::onSocketDisconnected() {
         blog(LOG_INFO, "client %s:%d disconnected",
             clientIp.toUtf8().constData(), pSocket->peerPort());
 
-        QString msg = QString(obs_module_text("OBSWebsocket.ConnectNotify.ClientIP"))
-            + QString(" ")
-            + Utils::FormatIPAddress(clientAddr);
+        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,
-            QString(obs_module_text("OBSWebsocket.ConnectNotify.Disconnected")));
+        Utils::SysTrayNotify(msg, QSystemTrayIcon::Information, title);
     }
 }

src/forms/settings-dialog.cpp

@@ -18,11 +18,10 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 #include <obs-frontend-api.h>
 
-#include "obs-websocket.h"
-#include "Config.h"
-#include "WSServer.h"
+#include "../obs-websocket.h"
+#include "../Config.h"
+#include "../WSServer.h"
 #include "settings-dialog.h"
-#include "ui_settings-dialog.h"
 
 #define CHANGE_ME "changeme"
 
@@ -41,55 +40,48 @@ SettingsDialog::SettingsDialog(QWidget* parent) :
     AuthCheckboxChanged();
 }
 
-void SettingsDialog::showEvent(QShowEvent* event)
-{
+void SettingsDialog::showEvent(QShowEvent* event) {
     Config* conf = Config::Current();
 
     ui->serverEnabled->setChecked(conf->ServerEnabled);
     ui->serverPort->setValue(conf->ServerPort);
-    
+
     ui->debugEnabled->setChecked(conf->DebugEnabled);
+    ui->alertsEnabled->setChecked(conf->AlertsEnabled);
 
     ui->authRequired->setChecked(conf->AuthRequired);
     ui->password->setText(CHANGE_ME);
 }
 
-void SettingsDialog::ToggleShowHide()
-{
+void SettingsDialog::ToggleShowHide() {
     if (!isVisible())
         setVisible(true);
     else
         setVisible(false);
 }
 
-void SettingsDialog::AuthCheckboxChanged()
-{
+void SettingsDialog::AuthCheckboxChanged() {
     if (ui->authRequired->isChecked())
         ui->password->setEnabled(true);
     else
         ui->password->setEnabled(false);
 }
 
-void SettingsDialog::FormAccepted()
-{
+void SettingsDialog::FormAccepted() {
     Config* conf = Config::Current();
 
     conf->ServerEnabled = ui->serverEnabled->isChecked();
     conf->ServerPort = ui->serverPort->value();
-    
+
     conf->DebugEnabled = ui->debugEnabled->isChecked();
+    conf->AlertsEnabled = ui->alertsEnabled->isChecked();
 
-    if (ui->authRequired->isChecked())
-    {
-        if (ui->password->text() != CHANGE_ME)
-        {
-            QByteArray pwd = ui->password->text().toUtf8();
-            const char *new_password = pwd;
-
-            conf->SetPassword(new_password);
+    if (ui->authRequired->isChecked()) {
+        if (ui->password->text() != CHANGE_ME) {
+            conf->SetPassword(ui->password->text());
         }
 
-        if (strcmp(Config::Current()->Secret, "") != 0)
+        if (!Config::Current()->Secret.isEmpty())
             conf->AuthRequired = true;
         else
             conf->AuthRequired = false;
@@ -107,7 +99,6 @@ void SettingsDialog::FormAccepted()
         WSServer::Instance->Stop();
 }
 
-SettingsDialog::~SettingsDialog()
-{
+SettingsDialog::~SettingsDialog() {
     delete ui;
 }

src/forms/settings-dialog.h

@@ -21,9 +21,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 #include <QDialog>
 
-namespace Ui {
-class SettingsDialog;
-}
+#include "ui_settings-dialog.h"
 
 class SettingsDialog : public QDialog
 {

src/forms/settings-dialog.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>407</width>
-    <height>175</height>
+    <height>195</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -80,6 +80,16 @@
       </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>
@@ -113,11 +123,11 @@
    <hints>
     <hint type="sourcelabel">
      <x>248</x>
-     <y>274</y>
+     <y>294</y>
     </hint>
     <hint type="destinationlabel">
      <x>157</x>
-     <y>294</y>
+     <y>314</y>
     </hint>
    </hints>
   </connection>
@@ -129,11 +139,11 @@
    <hints>
     <hint type="sourcelabel">
      <x>316</x>
-     <y>280</y>
+     <y>300</y>
     </hint>
     <hint type="destinationlabel">
      <x>286</x>
-     <y>294</y>
+     <y>314</y>
     </hint>
    </hints>
   </connection>

src/obs-websocket.cpp

@@ -28,6 +28,12 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include "Config.h"
 #include "forms/settings-dialog.h"
 
+void ___source_dummy_addref(obs_source_t*) {}
+void ___sceneitem_dummy_addref(obs_sceneitem_t*) {}
+void ___data_dummy_addref(obs_data_t*) {}
+void ___data_array_dummy_addref(obs_data_array_t*) {}
+void ___output_dummy_addref(obs_output_t*) {}
+
 OBS_DECLARE_MODULE()
 OBS_MODULE_USE_DEFAULT_LOCALE("obs-websocket", "en-US")
 

src/obs-websocket.h

@@ -19,8 +19,27 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #ifndef OBSWEBSOCKET_H
 #define OBSWEBSOCKET_H
 
+#include <obs.hpp>
+
+void ___source_dummy_addref(obs_source_t*);
+void ___sceneitem_dummy_addref(obs_sceneitem_t*);
+void ___data_dummy_addref(obs_data_t*);
+void ___data_array_dummy_addref(obs_data_array_t*);
+void ___output_dummy_addref(obs_output_t*);
+
+using OBSSourceAutoRelease =
+	OBSRef<obs_source_t*, ___source_dummy_addref, obs_source_release>;
+using OBSSceneItemAutoRelease =
+	OBSRef<obs_sceneitem_t*, ___sceneitem_dummy_addref, obs_sceneitem_release>;
+using OBSDataAutoRelease =
+	OBSRef<obs_data_t*, ___data_dummy_addref, obs_data_release>;
+using OBSDataArrayAutoRelease =
+	OBSRef<obs_data_array_t*, ___data_array_dummy_addref, obs_data_array_release>;
+using OBSOutputAutoRelease =
+	OBSRef<obs_output_t*, ___output_dummy_addref, obs_output_release>;
+
 #define PROP_AUTHENTICATED "wsclient_authenticated"
-#define OBS_WEBSOCKET_VERSION "4.2.0"
+#define OBS_WEBSOCKET_VERSION "4.4.0"
 
 #define blog(level, msg, ...) blog(level, "[obs-websocket] " msg, ##__VA_ARGS__)