base: Update source code to build against 27.2.4

CI: Update package name to not collide with 5.0.0
Events: Fix memory leak
2024-08-30 18:12:16 +00:00 · 2022-08-02 15:58:09 -07:00 · 2022-08-02 15:51:19 -07:00 · 2022-05-31 01:03:05 +09:00 · 2022-03-01 17:20:20 -08:00 · 2022-03-01 17:10:39 -08:00
47 changed files with 201 additions and 395 deletions
--- a/.github/images/obsws_logo.png
+++ b/.github/images/obsws_logo.png
--- a/CI/linux/install-dependencies-ubuntu.sh
+++ b/CI/linux/install-dependencies-ubuntu.sh
@ -15,12 +15,15 @@ sudo apt-get install -y \
 	obs-studio \
 	qtbase5-dev

+wget https://launchpad.net/~gol-d-ace/+archive/ubuntu/obs-studio/+build/22244364/+files/obs-studio_27.1.3-0obsproject1~focal_amd64.deb
+sudo dpkg -i ./*.deb
+
 echo "[obs-websocket] Installed OBS Version: $(obs --version)"

 ls /usr/include/
 ls /usr/include/obs/

 # Dirty hack
-sudo wget -O /usr/include/obs/obs-frontend-api.h https://raw.githubusercontent.com/obsproject/obs-studio/27.0.0/UI/obs-frontend-api/obs-frontend-api.h
+sudo wget -O /usr/include/obs/obs-frontend-api.h https://raw.githubusercontent.com/obsproject/obs-studio/27.1.3/UI/obs-frontend-api/obs-frontend-api.h

 sudo ldconfig
--- a/CI/linux/package-plugin-ubuntu.sh
+++ b/CI/linux/package-plugin-ubuntu.sh
@ -14,7 +14,7 @@ cd ./build

 PAGER="cat" sudo checkinstall -y --type=debian --fstrans=no --nodoc \
 	--backup=no --deldoc=yes --install=no \
-	--pkgname=obs-websocket --pkgversion="$PKG_VERSION" \
+	--pkgname=obs-websocket-compat --pkgversion="$PKG_VERSION" \
 	--pkglicense="GPLv2.0" --maintainer="stephane.lepin@gmail.com" \
 	--pkggroup="video" \
 	--pkgsource="https://github.com/Palakis/obs-websocket" \
--- a/CI/macos/build-plugin-macos.sh
+++ b/CI/macos/build-plugin-macos.sh
@ -23,4 +23,5 @@ cmake .. \
 	-DOBS_FRONTEND_LIB="$(pwd)/../../obs-studio/build/UI/obs-frontend-api/libobs-frontend-api.dylib" \
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	-DCMAKE_INSTALL_PREFIX=/usr \
+	-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 \
 && make -j4
--- a/CI/macos/install-build-obs-macos.sh
+++ b/CI/macos/install-build-obs-macos.sh
@ -26,7 +26,7 @@ echo "[obs-websocket] Cloning obs-studio from GitHub.."
 git clone https://github.com/obsproject/obs-studio
 cd obs-studio
 OBSLatestTag=$(git describe --tags --abbrev=0)
-git checkout $OBSLatestTag
+git checkout 27.1.3
 mkdir build && cd build
 echo "[obs-websocket] Building obs-studio.."
 cmake .. \
--- a/CI/macos/install-dependencies-macos.sh
+++ b/CI/macos/install-dependencies-macos.sh
@ -42,7 +42,7 @@ if [ "${HAS_PACKAGES}" = "" ]; then
 	echo "[obs-websocket] Installing Packaging app (might require password due to 'sudo').."
 	curl -L -O http://s.sudre.free.fr/Software/files/Packages.dmg
 	sudo hdiutil attach ./Packages.dmg
-	sudo installer -pkg /Volumes/Packages\ 1.2.9/Install\ Packages.pkg -target /
+	sudo installer -pkg /Volumes/Packages\ 1.2.10/Install\ Packages.pkg -target /
 fi

 # OBS Deps
--- a/CI/macos/obs-websocket.pkgproj
+++ b/CI/macos/obs-websocket.pkgproj
@ -36,7 +36,7 @@
 																		<key>GID</key>
 																		<integer>80</integer>
 																		<key>PATH</key>
-																		<string>../../build/obs-websocket.so</string>
+																		<string>../../build/obs-websocket-compat.so</string>
 																		<key>PATH_TYPE</key>
 																		<integer>1</integer>
 																		<key>PERMISSIONS</key>
@ -80,7 +80,7 @@
 														<key>GID</key>
 														<integer>80</integer>
 														<key>PATH</key>
-														<string>obs-websocket</string>
+														<string>obs-websocket-compat</string>
 														<key>PATH_TYPE</key>
 														<integer>0</integer>
 														<key>PERMISSIONS</key>
@ -514,11 +514,11 @@
 			<key>CONCLUSION_ACTION</key>
 			<integer>0</integer>
 			<key>IDENTIFIER</key>
-			<string>fr.palakis.obs-websocket</string>
+			<string>fr.palakis.obs-websocket-compat</string>
 			<key>OVERWRITE_PERMISSIONS</key>
 			<false/>
 			<key>VERSION</key>
-			<string>4.9.1</string>
+			<string>4.9.1-compat</string>
 		</dict>
 		<key>PROJECT_COMMENTS</key>
 		<dict>
@ -715,7 +715,7 @@
 				</dict>
 			</array>
 			<key>NAME</key>
-			<string>obs-websocket</string>
+			<string>obs-websocket-compat</string>
 		</dict>
 	</dict>
 	<key>TYPE</key>
--- a/CI/macos/package-plugin-macos.sh
+++ b/CI/macos/package-plugin-macos.sh
@ -19,7 +19,7 @@ VERSION="$GIT_HASH-$GIT_BRANCH_OR_TAG"
 FILENAME_UNSIGNED="obs-websocket-$VERSION-Unsigned.pkg"
 FILENAME="obs-websocket-$VERSION.pkg"

-echo "[obs-websocket] Modifying obs-websocket.so linking"
+echo "[obs-websocket] Modifying obs-websocket-compat.so linking"
 install_name_tool \
 	-change /tmp/obsdeps/lib/QtWidgets.framework/Versions/5/QtWidgets \
 		@executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtWidgets \
@ -27,15 +27,15 @@ install_name_tool \
 		@executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui \
 	-change /tmp/obsdeps/lib/QtCore.framework/Versions/5/QtCore \
 		@executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore \
-	./build/obs-websocket.so
+	./build/obs-websocket-compat.so

 # Check if replacement worked
 echo "[obs-websocket] Dependencies for obs-websocket"
-otool -L ./build/obs-websocket.so
+otool -L ./build/obs-websocket-compat.so

 if [[ "$RELEASE_MODE" == "True" ]]; then
-	echo "[obs-websocket] Signing plugin binary: obs-websocket.so"
-	codesign --sign "$CODE_SIGNING_IDENTITY" ./build/obs-websocket.so
+	echo "[obs-websocket] Signing plugin binary: obs-websocket-compat.so"
+	codesign --sign "$CODE_SIGNING_IDENTITY" ./build/obs-websocket-compat.so
 else
 	echo "[obs-websocket] Skipped plugin codesigning"
 fi
@ -44,7 +44,7 @@ echo "[obs-websocket] Actual package build"
 packagesbuild ./CI/macos/obs-websocket.pkgproj

 echo "[obs-websocket] Renaming obs-websocket.pkg to $FILENAME"
-mv ./release/obs-websocket.pkg ./release/$FILENAME_UNSIGNED
+mv ./release/obs-websocket-compat.pkg ./release/$FILENAME_UNSIGNED

 if [[ "$RELEASE_MODE" == "True" ]]; then
 	echo "[obs-websocket] Signing installer: $FILENAME"
--- a/CI/windows/prepare-obs-windows.cmd
+++ b/CI/windows/prepare-obs-windows.cmd
@ -5,18 +5,19 @@ SETLOCAL EnableDelayedExpansion
 REM If obs-studio directory does not exist, clone the git repo
 if not exist %OBS_PATH% (
    echo obs-studio directory does not exist
-    git clone https://github.com/obsproject/obs-studio %OBS_PATH%
+    git clone -b 27.1.3 https://github.com/obsproject/obs-studio %OBS_PATH%
    cd /D %OBS_PATH%\
    git describe --tags --abbrev=0 > "%OBS_PATH%\obs-studio-latest-tag.txt"
-    set /p OBS_LATEST_TAG=<"%OBS_PATH%\obs-studio-latest-tag.txt"
+    REM set /p OBS_LATEST_TAG=<"%OBS_PATH%\obs-studio-latest-tag.txt"
+    set /p OBS_LATEST_TAG=<"27.1.3"
 )

 REM Prepare OBS Studio builds

 echo Running CMake...
 cd /D %OBS_PATH%
-echo   git checkout %OBS_LATEST_TAG%
-git checkout %OBS_LATEST_TAG%
+REM echo   git checkout %OBS_LATEST_TAG%
+REM git checkout %OBS_LATEST_TAG%
 echo:

 if not exist build32 mkdir build32
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.5)
-project(obs-websocket VERSION 4.9.1)
+project(obs-websocket-compat VERSION 4.9.1)

 set(CMAKE_PREFIX_PATH "${QTDIR}")
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
@ -22,7 +22,7 @@ endif()
 find_package(LibObs REQUIRED)
 find_package(Qt5 REQUIRED COMPONENTS Core Widgets)

-set(obs-websocket_SOURCES
+set(obs-websocket-compat_SOURCES
 	src/obs-websocket.cpp
 	src/WSServer.cpp
 	src/ConnectionProperties.cpp
@ -50,7 +50,7 @@ set(obs-websocket_SOURCES
 	src/protocol/OBSRemoteProtocol.cpp
 	src/forms/settings-dialog.cpp)

-set(obs-websocket_HEADERS
+set(obs-websocket-compat_HEADERS
 	src/obs-websocket.h
 	src/WSServer.h
 	src/ConnectionProperties.h
@ -65,9 +65,9 @@ set(obs-websocket_HEADERS
 	src/forms/settings-dialog.h)

 # --- Platform-independent build settings ---
-add_library(obs-websocket MODULE
-	${obs-websocket_SOURCES}
-	${obs-websocket_HEADERS})
+add_library(obs-websocket-compat MODULE
+	${obs-websocket-compat_SOURCES}
+	${obs-websocket-compat_HEADERS})

 include_directories(
 	"${LIBOBS_INCLUDE_DIR}/../UI/obs-frontend-api"
@ -76,7 +76,7 @@ include_directories(
 	"${CMAKE_CURRENT_SOURCE_DIR}/deps/asio/asio/include"
 	"${CMAKE_CURRENT_SOURCE_DIR}/deps/websocketpp")

-target_link_libraries(obs-websocket
+target_link_libraries(obs-websocket-compat
 	libobs
 	Qt5::Core
 	Qt5::Widgets)
@ -109,14 +109,14 @@ if(WIN32)
 		"${LIBOBS_INCLUDE_DIR}/../${OBS_BUILDDIR_ARCH}/UI"
 	)

-	target_link_libraries(obs-websocket
+	target_link_libraries(obs-websocket-compat
 		"${OBS_FRONTEND_LIB}")

 	# --- 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
+	add_custom_command(TARGET obs-websocket-compat POST_BUILD
 		# If config is Release or RelWithDebInfo, package release files
 		COMMAND if $<OR:$<CONFIG:Release>,$<CONFIG:RelWithDebInfo>>==1 (
 			"${CMAKE_COMMAND}" -E make_directory
@ -126,60 +126,44 @@ if(WIN32)
 		COMMAND if $<OR:$<CONFIG:Release>,$<CONFIG:RelWithDebInfo>>==1 (
 			"${CMAKE_COMMAND}" -E copy_directory
 			"${PROJECT_SOURCE_DIR}/data"
-			"${RELEASE_DIR}/data/obs-plugins/obs-websocket"
+			"${RELEASE_DIR}/data/obs-plugins/obs-websocket-compat"
 		)

 		COMMAND if $<OR:$<CONFIG:Release>,$<CONFIG:RelWithDebInfo>>==1 (
 			"${CMAKE_COMMAND}" -E copy
-			"$<TARGET_FILE:obs-websocket>"
+			"$<TARGET_FILE:obs-websocket-compat>"
 			"${RELEASE_DIR}/obs-plugins/${ARCH_NAME}"
 		)

-		# In Release or RelWithDebInfo mode, copy Qt image format plugins
-		COMMAND if $<OR:$<CONFIG:Release>,$<CONFIG:RelWithDebInfo>>==1 (
-			"${CMAKE_COMMAND}" -E make_directory
-			"${RELEASE_DIR}/bin/${ARCH_NAME}/imageformats"
-		)
-		COMMAND if $<OR:$<CONFIG:Release>,$<CONFIG:RelWithDebInfo>>==1 (
-			"${CMAKE_COMMAND}" -E copy
-			"${QTDIR}/plugins/imageformats/qicns.dll"
-			"${QTDIR}/plugins/imageformats/qico.dll"
-			"${QTDIR}/plugins/imageformats/qjpeg.dll"
-			"${QTDIR}/plugins/imageformats/qtiff.dll"
-			"${QTDIR}/plugins/imageformats/qwbmp.dll"
-			"${QTDIR}/plugins/imageformats/qwebp.dll"
-			"${RELEASE_DIR}/bin/${ARCH_NAME}/imageformats"
-		)
-
 		# If config is RelWithDebInfo, package PDB file for target
 		COMMAND if $<CONFIG:RelWithDebInfo>==1 (
 			"${CMAKE_COMMAND}" -E copy
-			"$<TARGET_PDB_FILE:obs-websocket>"
+			"$<TARGET_PDB_FILE:obs-websocket-compat>"
 			"${RELEASE_DIR}/obs-plugins/${ARCH_NAME}"
 		)

 		# In the Debug configuration, copy to obs-studio dev environment for immediate testing
 		COMMAND if $<CONFIG:Debug>==1 (
 			"${CMAKE_COMMAND}" -E copy
-				"$<TARGET_FILE:obs-websocket>"
+				"$<TARGET_FILE:obs-websocket-compat>"
 				"${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>"
+			"$<TARGET_PDB_FILE:obs-websocket-compat>"
 			"${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"
+			"${LIBOBS_INCLUDE_DIR}/../${OBS_BUILDDIR_ARCH}/rundir/$<CONFIG>/data/obs-plugins/obs-websocket-compat"
 		)

 		COMMAND if $<CONFIG:Debug>==1 (
 			"${CMAKE_COMMAND}" -E copy_directory
 			"${PROJECT_SOURCE_DIR}/data"
-			"${LIBOBS_INCLUDE_DIR}/../${OBS_BUILDDIR_ARCH}/rundir/$<CONFIG>/data/obs-plugins/obs-websocket"
+			"${LIBOBS_INCLUDE_DIR}/../${OBS_BUILDDIR_ARCH}/rundir/$<CONFIG>/data/obs-plugins/obs-websocket-compat"
 		)
 	)
 	# --- End of sub-section ---
@ -191,8 +175,8 @@ endif()
 if(UNIX AND NOT APPLE)
 	include(GNUInstallDirs)

-	set_target_properties(obs-websocket PROPERTIES PREFIX "")
-	target_link_libraries(obs-websocket obs-frontend-api)
+	set_target_properties(obs-websocket-compat PROPERTIES PREFIX "")
+	target_link_libraries(obs-websocket-compat obs-frontend-api)

 	file(GLOB locale_files data/locale/*.ini)

@ -203,16 +187,16 @@ if(UNIX AND NOT APPLE)
 	)

 	if(${USE_UBUNTU_FIX})
-		install(TARGETS obs-websocket LIBRARY
+		install(TARGETS obs-websocket-compat LIBRARY
 			DESTINATION "/usr/lib/obs-plugins"
 			PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
 	endif()
-	install(TARGETS obs-websocket LIBRARY
+	install(TARGETS obs-websocket-compat LIBRARY
 		DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/obs-plugins"
 		PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)

 	install(FILES ${locale_files}
-		DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/obs/obs-plugins/obs-websocket/locale")
+		DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/obs/obs-plugins/obs-websocket-compat/locale")
 endif()
 # --- End of section ---

@ -221,7 +205,7 @@ 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}")
+	set_target_properties(obs-websocket-compat PROPERTIES PREFIX "")
+	target_link_libraries(obs-websocket-compat "${OBS_FRONTEND_LIB}")
 endif()
 # -- End of section --
--- a/README.md
+++ b/README.md
@ -1,9 +1,5 @@
 # obs-websocket

-<p align="center">
-  <img src="/.github/images/obsws_logo.png" width=150 align="center">
-</p>
-
 WebSockets API for OBS Studio.

 [![Build Status](https://dev.azure.com/Palakis/obs-websocket/_apis/build/status/Palakis.obs-websocket?branchName=4.x-current)](https://dev.azure.com/Palakis/obs-websocket/_build/latest?definitionId=2&branchName=4.x-current)
@ -52,11 +48,13 @@ Here's a list of available language APIs for obs-websocket :
 - Python 3.6+ with asyncio: [simpleobsws](https://github.com/IRLToolkit/simpleobsws) by tt2468
 - Java 8+: [obs-websocket-java](https://github.com/Twasi/websocket-obs-java) by TwasiNET
 - Java 11+: [obs-java-client](https://github.com/harm27/obs-java-client) by harm27
- Golang: [go-obs-websocket](https://github.com/christopher-dG/go-obs-websocket) by Chris de Graaf
+- Go: [go-obs-websocket](https://github.com/christopher-dG/go-obs-websocket) by Chris de Graaf
+- Go: [goobs](https://github.com/andreykaipov/goobs) by Andrey Kaipov
 - Rust: [obws](https://github.com/dnaka91/obws) by dnaka91
 - Dart: [obs_websocket](https://pub.dev/packages/obs_websocket) by faithoflifedev
 - HTTP API: [obs-websocket-http](https://github.com/IRLToolkit/obs-websocket-http) by tt2468
 - CLI: [obs-cli](https://github.com/leafac/obs-cli) by leafac
+- Godot: [obs-websocket-gd](https://github.com/you-win/obs-websocket-gd) by you-win

 I'd like to know what you're building with or for obs-websocket. If you do something in this fashion, feel free to drop a message in `#project-showoff` in the [discord server!](https://discord.gg/WBaSQ3A)

--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@ -5,6 +5,7 @@ trigger:
  branches:
    include:
      - '4.x-current'
+      - '4.x-compat'
  tags:
    include:
      - '*'
@ -113,13 +114,13 @@ jobs:
      displayName: 'Build obs-websocket 32-bit'
      inputs:
        msbuildArguments: '/m /p:Configuration=$(build_config)'
-        solution: '.\build32\obs-websocket.sln'
+        solution: '.\build32\obs-websocket-compat.sln'

    - task: MSBuild@1
      displayName: 'Build obs-websocket 64-bit'
      inputs:
        msbuildArguments: '/m /p:Configuration=$(build_config)'
-        solution: '.\build64\obs-websocket.sln'
+        solution: '.\build64\obs-websocket-compat.sln'

    - script: ./CI/windows/package-plugin-windows.cmd
      displayName: 'Package obs-websocket'
--- a/data/locale/ar-SA.ini
+++ b/data/locale/ar-SA.ini
@ -1 +0,0 @@
-
--- a/data/locale/de-DE.ini
+++ b/data/locale/de-DE.ini
@ -1,18 +0,0 @@
-OBSWebsocket.Settings.DialogTitle="WebSockets-Servereinstellungen"
-OBSWebsocket.Settings.ServerEnable="WebSockets-Server aktivieren"
-OBSWebsocket.Settings.ServerPort="Server-Port"
-OBSWebsocket.Settings.AuthRequired="Authentifizierung aktivieren"
-OBSWebsocket.Settings.Password="Passwort"
-OBSWebsocket.Settings.LockToIPv4="Nur IPv4 verwenden (deaktiviert IPv6)"
-OBSWebsocket.Settings.DebugEnable="Debug-Protokollierung aktivieren"
-OBSWebsocket.Settings.AlertsEnable="Infobereichbenachrichtigungen 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-Serverfehler"
-OBSWebsocket.Server.StartFailed.Message="Der WebSocket-Server konnte nicht gestartet werden, mögliche Gründe:\n - Der TCP-Port %1 wird möglicherweise gerade von einem anderen Programm verwendet. Versuchen Sie einen anderen Port in den Websocket-Servereinstellungen zu setzen oder alle Programme zu beenden, die den Port möglicherweise verwenden.\n - Fehler: %2"
-OBSWebsocket.ProfileChanged.Started="WebSockets-Server in diesem Profil aktiviert. Server gestartet."
-OBSWebsocket.ProfileChanged.Stopped="WebSockets-Server in diesem Profil deaktiviert. Server gestoppt."
-OBSWebsocket.ProfileChanged.Restarted="WebSockets-Server in diesem Profil geändert. Server startet neu."
-
--- a/data/locale/en-US.ini
+++ b/data/locale/en-US.ini
@ -1,21 +1,21 @@
-OBSWebsocket.Settings.DialogTitle="WebSockets Server Settings"
-OBSWebsocket.Settings.ServerEnable="Enable WebSockets server"
-OBSWebsocket.Settings.ServerPort="Server Port"
-OBSWebsocket.Settings.AuthRequired="Enable authentication"
-OBSWebsocket.Settings.Password="Password"
-OBSWebsocket.Settings.LockToIPv4="Lock server to only using IPv4"
-OBSWebsocket.Settings.DebugEnable="Enable debug logging"
-OBSWebsocket.Settings.AlertsEnable="Enable System Tray Alerts"
-OBSWebsocket.Settings.AuthDisabledWarning="Running obs-websocket with authentication disabled is not recommended, as it allows attackers to easily collect sensetive data. Are you sure you want to proceed?"
-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="WebSockets Server failure"
-OBSWebsocket.Server.StartFailed.Message="The WebSockets 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 - Error message: %2"
-OBSWebsocket.ProfileChanged.Started="WebSockets server enabled in this profile. Server started."
-OBSWebsocket.ProfileChanged.Stopped="WebSockets server disabled in this profile. Server stopped."
-OBSWebsocket.ProfileChanged.Restarted="WebSockets server port changed in this profile. Server restarted."
-OBSWebsocket.InitialPasswordSetup.Title="obs-websocket - Server Password Configuration"
-OBSWebsocket.InitialPasswordSetup.Text="It looks like you are running obs-websocket for the first time. Do you want to configure a password now for the WebSockets server? Setting a password is highly recommended."
-OBSWebsocket.InitialPasswordSetup.DismissedText="You can configure a server password later in the WebSockets Server Settings. (Under the Tools menu of OBS Studio)"
+OBSWebsocketCompat.Settings.DialogTitle="WebSockets Server Settings (4.x Compat)"
+OBSWebsocketCompat.Settings.ServerEnable="Enable WebSockets server"
+OBSWebsocketCompat.Settings.ServerPort="Server Port"
+OBSWebsocketCompat.Settings.AuthRequired="Enable authentication"
+OBSWebsocketCompat.Settings.Password="Password"
+OBSWebsocketCompat.Settings.LockToIPv4="Lock server to only using IPv4"
+OBSWebsocketCompat.Settings.DebugEnable="Enable debug logging"
+OBSWebsocketCompat.Settings.AlertsEnable="Enable System Tray Alerts"
+OBSWebsocketCompat.Settings.AuthDisabledWarning="Running obs-websocket with authentication disabled is not recommended, as it allows attackers to easily collect sensetive data. Are you sure you want to proceed?"
+OBSWebsocketCompat.NotifyConnect.Title="New WebSocket connection"
+OBSWebsocketCompat.NotifyConnect.Message="Client %1 connected"
+OBSWebsocketCompat.NotifyDisconnect.Title="WebSocket client disconnected"
+OBSWebsocketCompat.NotifyDisconnect.Message="Client %1 disconnected"
+OBSWebsocketCompat.Server.StartFailed.Title="WebSockets Server failure"
+OBSWebsocketCompat.Server.StartFailed.Message="The WebSockets compat server failed to start, maybe because:\n - TCP port %1 may currently be in use by the main obs-websocket plugin. Try setting a different TCP port in the obs-websocket Server Settings, or stop any application that could be using this port.\n - Error message: %2"
+OBSWebsocketCompat.ProfileChanged.Started="WebSockets server enabled in this profile. Server started."
+OBSWebsocketCompat.ProfileChanged.Stopped="WebSockets server disabled in this profile. Server stopped."
+OBSWebsocketCompat.ProfileChanged.Restarted="WebSockets server port changed in this profile. Server restarted."
+OBSWebsocketCompat.InitialPasswordSetup.Title="obs-websocket - Server Password Configuration"
+OBSWebsocketCompat.InitialPasswordSetup.Text="It looks like you are running obs-websocket for the first time. Do you want to configure a password now for the WebSockets server? Setting a password is highly recommended."
+OBSWebsocketCompat.InitialPasswordSetup.DismissedText="You can configure a server password later in the WebSockets Server Settings. (Under the Tools menu of OBS Studio)"
--- a/data/locale/es-ES.ini
+++ b/data/locale/es-ES.ini
@ -1,16 +0,0 @@
-OBSWebsocket.Settings.DialogTitle="Configuración del servidor WebSocket"
-OBSWebsocket.Settings.ServerEnable="Habilitar el servidor WebSockets"
-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 en 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="Falla en el servidor WebSockets"
-OBSWebsocket.ProfileChanged.Started="El servidor WebSocket esta habilitado en este perfil. El servidor ha iniciado."
-OBSWebsocket.ProfileChanged.Stopped="Servidor WebSockets deshabilitado en este perfil. Servidor detenido."
-OBSWebsocket.ProfileChanged.Restarted="Puerto del servidor WebSockets cambiado en este perfil. Servidor reiniciado."
-
--- a/data/locale/fr-FR.ini
+++ b/data/locale/fr-FR.ini
@ -1,16 +0,0 @@
-OBSWebsocket.Settings.DialogTitle="Paramètres du 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.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 WebSockets"
-OBSWebsocket.ProfileChanged.Started="Serveur WebSockets actif dans ce profil."
-OBSWebsocket.ProfileChanged.Stopped="Serveur WebSockets désactivé dans ce profil."
-OBSWebsocket.ProfileChanged.Restarted="Le port actuel diffère du port configuré dans ce profil. Serveur WebSockets redémarré."
-
--- a/data/locale/hi-IN.ini
+++ b/data/locale/hi-IN.ini
@ -1 +0,0 @@
-
--- a/data/locale/it-IT.ini
+++ b/data/locale/it-IT.ini
@ -1,18 +0,0 @@
-OBSWebsocket.Settings.DialogTitle="Impostazioni del server di WebSocket"
-OBSWebsocket.Settings.ServerEnable="Abilitare il server WebSockets"
-OBSWebsocket.Settings.ServerPort="Porta del server"
-OBSWebsocket.Settings.AuthRequired="Abilitare l'autenticazione"
-OBSWebsocket.Settings.Password="Password"
-OBSWebsocket.Settings.LockToIPv4="Blocca il server per usare solo IPv4"
-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="L'avvio del server WebSockets è fallito, forse perché:\n - La porta TCP %1 può attualmente essere in uso altrove su questo sistema, forse da un'altra applicazione. Provare a impostare una porta TCP diversa nelle impostazioni del server WebSocket o interrompere qualsiasi applicazione che potrebbe utilizzare questa porta.\n - Messaggio di errore: %2"
-OBSWebsocket.ProfileChanged.Started="Server WebSockets abilitato in questo profilo. Il server è avviato."
-OBSWebsocket.ProfileChanged.Stopped="Server WebSocket disabilitato in questo profilo. Server interrotto."
-OBSWebsocket.ProfileChanged.Restarted="La porta del server WebSocket è stata modificata in questo profilo. Il server è stato riavviato."
-
--- a/data/locale/ja-JP.ini
+++ b/data/locale/ja-JP.ini
@ -1,16 +0,0 @@
-OBSWebsocket.Settings.DialogTitle="Websocket サーバー設定"
-OBSWebsocket.Settings.ServerEnable="WebSockets サーバーを有効にする"
-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="WebSockets サーバー障害"
-OBSWebsocket.ProfileChanged.Started="このプロファイルでWebSocketサーバが有効になりました。サーバを起動しました。"
-OBSWebsocket.ProfileChanged.Stopped="このプロファイルでWebSocketサーバが無効になりました。サーバを停止しました。"
-OBSWebsocket.ProfileChanged.Restarted="このプロファイルでWebSocketサーバの通信ポートが変更されました。サーバを再起動しました。"
-
--- a/data/locale/ko-KR.ini
+++ b/data/locale/ko-KR.ini
@ -1,18 +0,0 @@
-OBSWebsocket.Settings.DialogTitle="웹소켓 서버 설정"
-OBSWebsocket.Settings.ServerEnable="웹소켓 서버 활성화"
-OBSWebsocket.Settings.ServerPort="서버 포트"
-OBSWebsocket.Settings.AuthRequired="인증 활성화"
-OBSWebsocket.Settings.Password="비밀번호"
-OBSWebsocket.Settings.LockToIPv4="IPv4만 이용하여 서버를 연결"
-OBSWebsocket.Settings.DebugEnable="디버그 로깅 활성화"
-OBSWebsocket.Settings.AlertsEnable="시스템 트레이 알림 활성화"
-OBSWebsocket.NotifyConnect.Title="새로운 웹소켓 연결"
-OBSWebsocket.NotifyConnect.Message="클라이언트 %1 가 연결되었습니다"
-OBSWebsocket.NotifyDisconnect.Title="웹소켓 클라이언트가 연결 해제되었습니다"
-OBSWebsocket.NotifyDisconnect.Message="클라이언트 %1 가 연결이 해제되었습니다"
-OBSWebsocket.Server.StartFailed.Title="웹소켓 서버 시작이 실패하였습니다"
-OBSWebsocket.Server.StartFailed.Message="웹소켓 서버가 시작되지 못했습니다. \n 시스템 상의 다른 프로그램이 TCP 포트 %1을 사용 중인 것으로 보입니다. 다른 TCP 포트를 사용하거나, 해당 포트를 사용 중인 프로그램을 종료하고 다시 시도해주세요. \n 에러 메시지: %2"
-OBSWebsocket.ProfileChanged.Started="프로파일 설정에 따라 웹소켓 서버가 활성화되었습니다. 서버가 시작되었습니다."
-OBSWebsocket.ProfileChanged.Stopped="프로파일 설정에 따라 웹소켓 서버가 비활성화되었습니다. 서버가 중지되었습니다."
-OBSWebsocket.ProfileChanged.Restarted="프로파일 설정에 따라 웹소켓 포트가 변경되었습니다. 서버가 재시작되었습니다."
-
--- a/data/locale/nl-NL.ini
+++ b/data/locale/nl-NL.ini
@ -1,18 +0,0 @@
-OBSWebsocket.Settings.DialogTitle="WebSockets Server Instellingen"
-OBSWebsocket.Settings.ServerEnable="WebSockets server inschakelen"
-OBSWebsocket.Settings.ServerPort="Serverpoort"
-OBSWebsocket.Settings.AuthRequired="Verificatie inschakelen"
-OBSWebsocket.Settings.Password="Wachtwoord"
-OBSWebsocket.Settings.LockToIPv4="Server vergrendelen om alleen IPv4 te gebruiken"
-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="Fout in WebSocket server"
-OBSWebsocket.Server.StartFailed.Message="De obs-websocket server kan niet worden gestart, misschien omdat: \n - TCP-poort %1 momenteel elders wordt gebruikt op dit systeem, eventueel door een andere toepassing. Probeer een andere TCP-poort in te stellen in de WebSocket Server-instellingen of stop elke toepassing die deze poort zou kunnen gebruiken.\n Een onbekende Netwerkfout op uw systeem. Probeer het opnieuw door de instellingen te wijzigen, OBS te herstarten of uw systeem te herstarten."
-OBSWebsocket.ProfileChanged.Started="WebSockets server ingeschakeld in dit profiel. Server gestart."
-OBSWebsocket.ProfileChanged.Stopped="WebSockets server uitgeschakeld in dit profiel. Server is gestopt."
-OBSWebsocket.ProfileChanged.Restarted="WebSockets server poort is veranderd in dit profiel. Server is herstart."
-
--- a/data/locale/pl-PL.ini
+++ b/data/locale/pl-PL.ini
@ -1,15 +0,0 @@
-OBSWebsocket.Settings.DialogTitle="Ustawienia serwera WebSockets"
-OBSWebsocket.Settings.ServerEnable="Włącz serwer WebSockets"
-OBSWebsocket.Settings.ServerPort="Port serwera"
-OBSWebsocket.Settings.AuthRequired="Wymagaj uwierzytelniania"
-OBSWebsocket.Settings.Password="Hasło"
-OBSWebsocket.Settings.LockToIPv4="Zablokuj serwer tylko za pomocą IPv4"
-OBSWebsocket.Settings.DebugEnable="Włącz rejestrowanie debugowania"
-OBSWebsocket.Settings.AlertsEnable="Włącz powiadomienia w 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 rozłączony"
-OBSWebsocket.Server.StartFailed.Title="Awaria serwera WebSockets"
-OBSWebsocket.ProfileChanged.Started="Serwer WebSockets włączony w tym profilu. Serwer uruchomiony."
-
--- a/data/locale/pt-PT.ini
+++ b/data/locale/pt-PT.ini
@ -1,18 +0,0 @@
-OBSWebsocket.Settings.DialogTitle="Configurações do servidor de WebSockets"
-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.LockToIPv4="Forçar apenas o uso de IPv4 (desabilitar IPv6)"
-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 de WebSockets falhou ao iniciar, possivelmente porque:\n - A porta TCP %1 pode já estar em uso em algum outro lugar neste sistema, possivelmente por outro aplicativo. Tente definir uma porta TCP diferente nas configurações do servidor de WebSockets, ou pare qualquer aplicativo que possa estar usando essa porta.\n - Mensagem de erro: %2"
-OBSWebsocket.ProfileChanged.Started="Servidor de WebSockets habilitado nesse perfil. Servidor iniciado."
-OBSWebsocket.ProfileChanged.Stopped="Servidor de WebSockets desabilitado nesse perfil. Servidor parado."
-OBSWebsocket.ProfileChanged.Restarted="Porta do servidor de WebSockets foi alterada neste perfil. Servidor reiniciado."
-
--- a/data/locale/ru-RU.ini
+++ b/data/locale/ru-RU.ini
@ -1,18 +0,0 @@
-OBSWebsocket.Settings.DialogTitle="Настройки сервера WebSockets"
-OBSWebsocket.Settings.ServerEnable="Включить сервер WebSockets"
-OBSWebsocket.Settings.ServerPort="Порт сервера"
-OBSWebsocket.Settings.AuthRequired="Включить авторизацию"
-OBSWebsocket.Settings.Password="Пароль"
-OBSWebsocket.Settings.LockToIPv4="Блокировка сервера только с использованием IPv4"
-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="Сбой сервера WebSockets"
-OBSWebsocket.Server.StartFailed.Message="Сервер WebSockets не запустился, возможно, потому, что:\n-TCP-порт %1 в настоящее время может использоваться в другом месте этой системы, возможно, другим приложением. Попробуйте установить другой TCP-порт в настройках сервера WebSocket или остановить любое приложение, которое может использовать этот порт.\n-сообщение об ошибке: %2"
-OBSWebsocket.ProfileChanged.Started="Сервер WebSockets включен в этом профиле. Сервер запущен."
-OBSWebsocket.ProfileChanged.Stopped="Сервер WebSockets отключен в этом профиле. Сервер остановлен."
-OBSWebsocket.ProfileChanged.Restarted="Порт сервера WebSockets изменен в этом профиле. Сервер перезапущен."
-
--- a/data/locale/zh-CN.ini
+++ b/data/locale/zh-CN.ini
@ -1,16 +0,0 @@
-OBSWebsocket.Settings.DialogTitle="WebSockets 服务器设置"
-OBSWebsocket.Settings.ServerEnable="启用 WebSockets 服务器"
-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="WebSockets 服务器错误"
-OBSWebsocket.ProfileChanged.Started="此配置文件中启用了 WebSockets 服务器。服务器已启动。"
-OBSWebsocket.ProfileChanged.Stopped="此配置文件中禁用了 WebSockets 服务器。服务器已停止。"
-OBSWebsocket.ProfileChanged.Restarted="此配置文件中的 WebSockets 服务器端口已更改。服务器已重新启动。"
-
--- a/data/locale/zh-TW.ini
+++ b/data/locale/zh-TW.ini
@ -1,9 +0,0 @@
-OBSWebsocket.Settings.ServerPort="伺服器連接埠"
-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 伺服器錯誤"
-
--- a/deps/websocketpp
+++ b/deps/websocketpp
--- a/docs/generated/comments.json
+++ b/docs/generated/comments.json
@ -5420,7 +5420,7 @@
          "{boolean} `active` Whether audio track is active or not."
        ],
        "api": "requests",
-        "name": "SetTracks",
+        "name": "SetAudioTracks",
        "category": "sources",
        "since": "4.9.1",
        "params": [
@ -5443,7 +5443,7 @@
        "names": [
          {
            "name": "",
-            "description": "SetTracks"
+            "description": "SetAudioTracks"
          }
        ],
        "categories": [
@ -5460,7 +5460,7 @@
        ],
        "heading": {
          "level": 2,
-          "text": "SetTracks"
+          "text": "SetAudioTracks"
        },
        "lead": "",
        "type": "class",
@ -5479,7 +5479,7 @@
          "{boolean} `track6`"
        ],
        "api": "requests",
-        "name": "GetTracks",
+        "name": "GetAudioTracks",
        "category": "sources",
        "since": "4.9.1",
        "returns": [
@ -5524,7 +5524,7 @@
        "names": [
          {
            "name": "",
-            "description": "GetTracks"
+            "description": "GetAudioTracks"
          }
        ],
        "categories": [
@ -5541,7 +5541,7 @@
        ],
        "heading": {
          "level": 2,
-          "text": "GetTracks"
+          "text": "GetAudioTracks"
        },
        "lead": "",
        "type": "class",
--- a/docs/generated/protocol.md
+++ b/docs/generated/protocol.md
@ -164,8 +164,8 @@ You can also refer to any of the [client libraries](https://github.com/Palakis/o
    + [GetSourceTypesList](#getsourcetypeslist)
    + [GetVolume](#getvolume)
    + [SetVolume](#setvolume)
-    + [SetTracks](#settracks)
-    + [GetTracks](#gettracks)
+    + [SetAudioTracks](#setaudiotracks)
+    + [GetAudioTracks](#getaudiotracks)
    + [GetMute](#getmute)
    + [SetMute](#setmute)
    + [ToggleMute](#togglemute)
@ -2213,7 +2213,7 @@ _No additional response items._

 ---

-### SetTracks
+### SetAudioTracks


 - Added in v4.9.1
@ -2235,7 +2235,7 @@ _No additional response items._

 ---

-### GetTracks
+### GetAudioTracks


 - Added in v4.9.1
--- a/installer/installer.iss
+++ b/installer/installer.iss
@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

 #define MyAppName "obs-websocket"
-#define MyAppVersion "4.9.1"
+#define MyAppVersion "4.9.1-compat"
 #define MyAppPublisher "Stephane Lepin"
 #define MyAppURL "http://github.com/Palakis/obs-websocket"

--- a/src/Config.cpp
+++ b/src/Config.cpp
@ -274,9 +274,9 @@ void Config::OnFrontendEvent(enum obs_frontend_event event, void* param)

 	if (event == OBS_FRONTEND_EVENT_PROFILE_CHANGED) {
 		obs_frontend_push_ui_translation(obs_module_get_string);
-		QString startMessage = QObject::tr("OBSWebsocket.ProfileChanged.Started");
-		QString stopMessage = QObject::tr("OBSWebsocket.ProfileChanged.Stopped");
-		QString restartMessage = QObject::tr("OBSWebsocket.ProfileChanged.Restarted");
+		QString startMessage = QObject::tr("OBSWebsocketCompat.ProfileChanged.Started");
+		QString stopMessage = QObject::tr("OBSWebsocketCompat.ProfileChanged.Stopped");
+		QString restartMessage = QObject::tr("OBSWebsocketCompat.ProfileChanged.Restarted");
 		obs_frontend_pop_ui_translation();

 		bool previousEnabled = config->ServerEnabled;
@ -332,9 +332,9 @@ void Config::FirstRunPasswordSetup()
 	}

 	obs_frontend_push_ui_translation(obs_module_get_string);
-	QString dialogTitle = QObject::tr("OBSWebsocket.InitialPasswordSetup.Title");
-	QString dialogText = QObject::tr("OBSWebsocket.InitialPasswordSetup.Text");
-	QString dismissedText = QObject::tr("OBSWebsocket.InitialPasswordSetup.DismissedText");
+	QString dialogTitle = QObject::tr("OBSWebsocketCompat.InitialPasswordSetup.Title");
+	QString dialogText = QObject::tr("OBSWebsocketCompat.InitialPasswordSetup.Text");
+	QString dismissedText = QObject::tr("OBSWebsocketCompat.InitialPasswordSetup.DismissedText");
 	obs_frontend_pop_ui_translation();

 	auto mainWindow = reinterpret_cast<QMainWindow*>(
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@ -378,8 +378,7 @@ obs_source_t* Utils::GetTransitionFromName(QString searchName) {
 		QString transitionName = obs_source_get_name(transition);

 		if (transitionName == searchName) {
-			foundTransition = transition;
-			obs_source_addref(foundTransition);
+			foundTransition = obs_source_get_ref(transition);
 			break;
 		}
 	}
--- a/src/WSEvents.cpp
+++ b/src/WSEvents.cpp
@ -252,14 +252,14 @@ void WSEvents::broadcastUpdate(const char* updateType,
 	if (!_srv->isListening()) {
 		return;
 	}
-	std::optional<uint64_t> streamTime;
+	uint64_t streamTime = 0;
 	if (obs_frontend_streaming_active()) {
-		streamTime = std::make_optional(getStreamingTime());
+		streamTime = getStreamingTime();
 	}

-	std::optional<uint64_t> recordingTime;
+	uint64_t recordingTime;
 	if (obs_frontend_recording_active()) {
-		recordingTime = std::make_optional(getRecordingTime());
+		recordingTime = getRecordingTime();
 	}

 	RpcEvent event(QString(updateType), streamTime, recordingTime, additionalFields);
@ -610,8 +610,10 @@ void WSEvents::OnTransitionListChange() {
 */
 void WSEvents::OnProfileChange() {
 	OBSDataAutoRelease fields = obs_data_create();
-	obs_data_set_string(fields, "profile", obs_frontend_get_current_profile());
+	char *profile = obs_frontend_get_current_profile();
+	obs_data_set_string(fields, "profile", profile);
 	broadcastUpdate("ProfileChanged", fields);
+	bfree(profile);
 }

 /**
--- a/src/WSRequestHandler_Recording.cpp
+++ b/src/WSRequestHandler_Recording.cpp
@ -6,15 +6,6 @@
 #include "Utils.h"
 #include "WSEvents.h"

-RpcResponse ifCanPause(const RpcRequest& request, std::function<RpcResponse()> callback)
-{
-	if (!obs_frontend_recording_active()) {
-		return request.failed("recording is not active");
-	}
-
-	return callback();
-}
-
 /**
 * Get current recording status.
 *
@ -103,14 +94,14 @@ RpcResponse WSRequestHandler::StartRecording(const RpcRequest& request) {
 * @since 4.7.0
 */
 RpcResponse WSRequestHandler::PauseRecording(const RpcRequest& request) {
-	return ifCanPause(request, [request]() {
-		if (obs_frontend_recording_paused()) {
+	if (!obs_frontend_recording_active())
+		return request.failed("recording is not active");
+
+	if (obs_frontend_recording_paused())
 		return request.failed("recording already paused");
-		}

 	obs_frontend_recording_pause(true);
 	return request.success();
-	});
 }

 /**
@ -123,14 +114,14 @@ RpcResponse WSRequestHandler::PauseRecording(const RpcRequest& request) {
 * @since 4.7.0
 */
 RpcResponse WSRequestHandler::ResumeRecording(const RpcRequest& request) {
-	return ifCanPause(request, [request]() {
-		if (!obs_frontend_recording_paused()) {
+	if (!obs_frontend_recording_active())
+		return request.failed("recording is not active");
+
+	if (!obs_frontend_recording_paused())
 		return request.failed("recording is not paused");
-		}

 	obs_frontend_recording_pause(false);
 	return request.success();
-	});
 }

 /**
--- a/src/WSRequestHandler_Sources.cpp
+++ b/src/WSRequestHandler_Sources.cpp
@ -323,7 +323,7 @@ RpcResponse WSRequestHandler::SetVolume(const RpcRequest& request)
 * @param {boolean} `active` Whether audio track is active or not.
 *
 * @api requests
-* @name SetTracks
+* @name SetAudioTracks
 * @category sources
 * @since 4.9.1
 */
@ -372,7 +372,7 @@ RpcResponse WSRequestHandler::SetAudioTracks(const RpcRequest& request)
 * @return {boolean} `track6`
 *
 * @api requests
-* @name GetTracks
+* @name GetAudioTracks
 * @category sources
 * @since 4.9.1
 */
--- a/src/WSServer.cpp
+++ b/src/WSServer.cpp
@ -105,8 +105,8 @@ void WSServer::start(quint16 port, bool lockToIPv4)
 		blog(LOG_INFO, "server: listen failed: %s", errorCodeMessage.c_str());

 		obs_frontend_push_ui_translation(obs_module_get_string);
-		QString errorTitle = tr("OBSWebsocket.Server.StartFailed.Title");
-		QString errorMessage = tr("OBSWebsocket.Server.StartFailed.Message").arg(_serverPort).arg(errorCodeMessage.c_str());
+		QString errorTitle = tr("OBSWebsocketCompat.Server.StartFailed.Title");
+		QString errorMessage = tr("OBSWebsocketCompat.Server.StartFailed.Message").arg(_serverPort).arg(errorCodeMessage.c_str());
 		obs_frontend_pop_ui_translation();

 		QMainWindow* mainWindow = reinterpret_cast<QMainWindow*>(obs_frontend_get_main_window());
@ -124,12 +124,20 @@ void WSServer::start(quint16 port, bool lockToIPv4)

 void WSServer::stop()
 {
+	auto config = GetConfig();
+	if (config && config->DebugEnabled)
+		blog(LOG_INFO, "[WSServer::stop] Stopping...");
+
 	if (!_server.is_listening()) {
+		if (config && config->DebugEnabled)
+			blog(LOG_INFO, "[WSServer::stop] Server not listening.");
 		return;
 	}

 	_server.stop_listening();
 	for (connection_hdl hdl : _connections) {
+		if (config && config->DebugEnabled)
+			blog(LOG_INFO, "[WSServer::stop] Closing an active connection...");
 		websocketpp::lib::error_code errorCode;
 		_server.pause_reading(hdl, errorCode);
 		if (errorCode) {
@ -142,17 +150,24 @@ void WSServer::stop()
 			blog(LOG_ERROR, "Error: %s", errorCode.message().c_str());
 			continue;
 		}
+		if (config && config->DebugEnabled)
+			blog(LOG_INFO, "[WSServer::stop] Finished closing connection.");
 	}

+	if (config && config->DebugEnabled)
+		blog(LOG_INFO, "[WSServer::stop] Stopping thread pool...");
 	_threadPool.waitForDone();

-	while (_connections.size() > 0) {
+	if (config && config->DebugEnabled)
+		blog(LOG_INFO, "[WSServer::stop] Waiting for all connections to close...");
+	while (_connections.size() > 0)
 		std::this_thread::sleep_for(std::chrono::milliseconds(10));
-	}

+	if (config && config->DebugEnabled)
+		blog(LOG_INFO, "[WSServer::stop] Performing join on IO thread...");
 	_serverThread.join();

-	blog(LOG_INFO, "server stopped successfully");
+	blog(LOG_INFO, "Server stopped successfully.");
 }

 void WSServer::broadcast(const RpcEvent& event)
@ -264,8 +279,8 @@ QString WSServer::getRemoteEndpoint(connection_hdl hdl)
 void WSServer::notifyConnection(QString clientIp)
 {
 	obs_frontend_push_ui_translation(obs_module_get_string);
-	QString title = tr("OBSWebsocket.NotifyConnect.Title");
-	QString msg = tr("OBSWebsocket.NotifyConnect.Message").arg(clientIp);
+	QString title = tr("OBSWebsocketCompat.NotifyConnect.Title");
+	QString msg = tr("OBSWebsocketCompat.NotifyConnect.Message").arg(clientIp);
 	obs_frontend_pop_ui_translation();

 	Utils::SysTrayNotify(msg, QSystemTrayIcon::Information, title);
@ -274,8 +289,8 @@ void WSServer::notifyConnection(QString clientIp)
 void WSServer::notifyDisconnection(QString clientIp)
 {
 	obs_frontend_push_ui_translation(obs_module_get_string);
-	QString title = tr("OBSWebsocket.NotifyDisconnect.Title");
-	QString msg = tr("OBSWebsocket.NotifyDisconnect.Message").arg(clientIp);
+	QString title = tr("OBSWebsocketCompat.NotifyDisconnect.Title");
+	QString msg = tr("OBSWebsocketCompat.NotifyDisconnect.Message").arg(clientIp);
 	obs_frontend_pop_ui_translation();

 	Utils::SysTrayNotify(msg, QSystemTrayIcon::Information, title);
--- a/src/WSServer.h
+++ b/src/WSServer.h
@ -26,6 +26,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <QtCore/QVariantHash>
 #include <QtCore/QThreadPool>

+#include <asio.hpp>
 #include <websocketpp/config/asio_no_tls.hpp>
 #include <websocketpp/server.hpp>

--- a/src/forms/settings-dialog.cpp
+++ b/src/forms/settings-dialog.cpp
@ -81,10 +81,10 @@ void SettingsDialog::AuthCheckboxChanged() {
 	}
 	else {
 		obs_frontend_push_ui_translation(obs_module_get_string);
-		QString authDisabledWarning = QObject::tr("OBSWebsocket.Settings.AuthDisabledWarning");
+		QString authDisabledWarning = QObject::tr("OBSWebsocketCompat.Settings.AuthDisabledWarning");
 		obs_frontend_pop_ui_translation();

-		QMessageBox::StandardButton response = QMessageBox::question(this, "obs-websocket", authDisabledWarning);
+		QMessageBox::StandardButton response = QMessageBox::question(this, "obs-websocket 4.9.1-compat", authDisabledWarning);
 		if (response == QMessageBox::Yes) {
 			ui->password->setEnabled(false);
 		} else {
--- a/src/forms/settings-dialog.ui
+++ b/src/forms/settings-dialog.ui
@ -17,7 +17,7 @@
   </sizepolicy>
  </property>
  <property name="windowTitle">
-   <string>OBSWebsocket.Settings.DialogTitle</string>
+   <string>OBSWebsocketCompat.Settings.DialogTitle</string>
  </property>
  <property name="sizeGripEnabled">
   <bool>false</bool>
@ -31,14 +31,14 @@
     <item row="3" column="1">
      <widget class="QCheckBox" name="authRequired">
       <property name="text">
-        <string>OBSWebsocket.Settings.AuthRequired</string>
+        <string>OBSWebsocketCompat.Settings.AuthRequired</string>
       </property>
      </widget>
     </item>
     <item row="4" column="0">
      <widget class="QLabel" name="lbl_password">
       <property name="text">
-        <string>OBSWebsocket.Settings.Password</string>
+        <string>OBSWebsocketCompat.Settings.Password</string>
       </property>
      </widget>
     </item>
@ -52,7 +52,7 @@
     <item row="1" column="1">
      <widget class="QCheckBox" name="serverEnabled">
       <property name="text">
-        <string>OBSWebsocket.Settings.ServerEnable</string>
+        <string>OBSWebsocketCompat.Settings.ServerEnable</string>
       </property>
       <property name="checked">
        <bool>true</bool>
@ -62,7 +62,7 @@
     <item row="2" column="0">
      <widget class="QLabel" name="lbl_serverPort">
       <property name="text">
-        <string>OBSWebsocket.Settings.ServerPort</string>
+        <string>OBSWebsocketCompat.Settings.ServerPort</string>
       </property>
      </widget>
     </item>
@ -82,7 +82,7 @@
     <item row="6" column="1">
      <widget class="QCheckBox" name="alertsEnabled">
       <property name="text">
-        <string>OBSWebsocket.Settings.AlertsEnable</string>
+        <string>OBSWebsocketCompat.Settings.AlertsEnable</string>
       </property>
       <property name="checked">
        <bool>true</bool>
@ -92,7 +92,7 @@
     <item row="7" column="1">
      <widget class="QCheckBox" name="debugEnabled">
       <property name="text">
-        <string>OBSWebsocket.Settings.DebugEnable</string>
+        <string>OBSWebsocketCompat.Settings.DebugEnable</string>
       </property>
       <property name="checked">
        <bool>false</bool>
@ -102,7 +102,7 @@
     <item row="5" column="1">
      <widget class="QCheckBox" name="lockToIPv4">
       <property name="text">
-        <string>OBSWebsocket.Settings.LockToIPv4</string>
+        <string>OBSWebsocketCompat.Settings.LockToIPv4</string>
       </property>
      </widget>
     </item>
--- a/src/obs-websocket.cpp
+++ b/src/obs-websocket.cpp
@ -30,12 +30,6 @@ 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*) {}
-
 void ___data_item_dummy_addref(obs_data_item_t*) {}
 void ___data_item_release(obs_data_item_t* dataItem) {
 	obs_data_item_release(&dataItem);
@ -53,6 +47,7 @@ bool obs_module_load(void) {
 	blog(LOG_INFO, "you can haz websockets (version %s)", OBS_WEBSOCKET_VERSION);
 	blog(LOG_INFO, "qt version (compile-time): %s ; qt version (run-time): %s",
 		QT_VERSION_STR, qVersion());
+	blog(LOG_INFO, "[obs_module_load] Linked ASIO Version: %d", ASIO_VERSION);

 	// Core setup
 	_config = ConfigPtr(new Config());
@ -69,7 +64,7 @@ bool obs_module_load(void) {
 	obs_frontend_pop_ui_translation();

 	const char* menuActionText =
-		obs_module_text("OBSWebsocket.Settings.DialogTitle");
+		obs_module_text("OBSWebsocketCompat.Settings.DialogTitle");
 	QAction* menuAction =
 		(QAction*)obs_frontend_add_tools_menu_qaction(menuActionText);
 	QObject::connect(menuAction, &QAction::triggered, [] {
--- a/src/obs-websocket.h
+++ b/src/obs-websocket.h
@ -21,23 +21,6 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <obs.hpp>
 #include <memory>

-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>;
-
 void ___data_item_dummy_addref(obs_data_item_t*);
 void ___data_item_release(obs_data_item_t*);
 using OBSDataItemAutoRelease =
@ -57,6 +40,6 @@ WSServerPtr GetServer();
 WSEventsPtr GetEventsSystem();
 void ShowPasswordSetting();

-#define OBS_WEBSOCKET_VERSION "4.9.1"
+#define OBS_WEBSOCKET_VERSION "4.9.1-compat"

-#define blog(level, msg, ...) blog(level, "[obs-websocket] " msg, ##__VA_ARGS__)
+#define blog(level, msg, ...) blog(level, "[obs-websocket 4.9.1-compat] " msg, ##__VA_ARGS__)
--- a/src/plugin-macros.generated.h
+++ b/src/plugin-macros.generated.h
@ -0,0 +1,31 @@
+/*
+obs-websocket
+Copyright (C) 2016-2021 Stephane Lepin <stephane.lepin@gmail.com>
+Copyright (C) 2020-2021 Kyle Manning <tt2468@gmail.com>
+
+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/>
+*/
+
+#pragma once
+
+#include <util/base.h>
+#define blog(level, msg, ...) blog(level, "[obs-websocket] " msg, ##__VA_ARGS__)
+
+#define blog_debug(msg, ...) if (IsDebugEnabled()) blog(LOG_INFO, "[debug] " msg, ##__VA_ARGS__)
+
+#define OBS_WEBSOCKET_VERSION "5.0.0"
+
+#define OBS_WEBSOCKET_RPC_VERSION 1
+
+#define QT_TO_UTF8(str) str.toUtf8().constData()
--- a/src/protocol/OBSRemoteProtocol.cpp
+++ b/src/protocol/OBSRemoteProtocol.cpp
@ -64,15 +64,15 @@ std::string OBSRemoteProtocol::encodeEvent(const RpcEvent& event)
 	QString updateType = event.updateType();
 	obs_data_set_string(eventData, "update-type", updateType.toUtf8().constData());

-	std::optional<uint64_t> streamTime = event.streamTime();
-	if (streamTime.has_value()) {
-		QString streamingTimecode = Utils::nsToTimestamp(streamTime.value());
+	auto streamTime = event.streamTime();
+	if (streamTime) {
+		QString streamingTimecode = Utils::nsToTimestamp(streamTime);
 		obs_data_set_string(eventData, "stream-timecode", streamingTimecode.toUtf8().constData());
 	}

-	std::optional<uint64_t> recordingTime = event.recordingTime();
-	if (recordingTime.has_value()) {
-		QString recordingTimecode = Utils::nsToTimestamp(recordingTime.value());
+	auto recordingTime = event.recordingTime();
+	if (recordingTime) {
+		QString recordingTimecode = Utils::nsToTimestamp(recordingTime);
 		obs_data_set_string(eventData, "rec-timecode", recordingTimecode.toUtf8().constData());
 	}

@ -132,7 +132,7 @@ obs_data_t* OBSRemoteProtocol::buildResponse(const char* messageId, const char*
 	return response;
 }

-std::string OBSRemoteProtocol::jsonDataToString(OBSDataAutoRelease data)
+std::string OBSRemoteProtocol::jsonDataToString(obs_data_t *data)
 {
 	std::string responseString = obs_data_get_json(data);
 	return responseString;
--- a/src/protocol/OBSRemoteProtocol.h
+++ b/src/protocol/OBSRemoteProtocol.h
@ -37,5 +37,5 @@ private:
 	static obs_data_t* successResponse(const char* messageId, obs_data_t* fields = nullptr);
 	static obs_data_t* errorResponse(const char* messageId, const char* errorMessage, obs_data_t* additionalFields = nullptr);
 	static obs_data_t* buildResponse(const char* messageId, const char*, obs_data_t* fields = nullptr);
-	static std::string jsonDataToString(OBSDataAutoRelease data);
+	static std::string jsonDataToString(obs_data_t *data);
 };
--- a/src/rpc/RpcEvent.cpp
+++ b/src/rpc/RpcEvent.cpp
@ -20,7 +20,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>

 RpcEvent::RpcEvent(
 	const QString& updateType,
-	std::optional<uint64_t> streamTime, std::optional<uint64_t> recordingTime,
+	uint64_t streamTime, uint64_t recordingTime,
 	obs_data_t* additionalFields
 ) :
 	_updateType(updateType),
--- a/src/rpc/RpcEvent.h
+++ b/src/rpc/RpcEvent.h
@ -18,7 +18,6 @@ with this program. If not, see <https://www.gnu.org/licenses/>

 #pragma once

-#include <optional>
 #include <obs-data.h>
 #include <QtCore/QString>

@ -29,7 +28,7 @@ class RpcEvent
 public:
 	explicit RpcEvent(
 		const QString& updateType,
-		std::optional<uint64_t> streamTime, std::optional<uint64_t> recordingTime,
+		uint64_t streamTime, uint64_t recordingTime,
 		obs_data_t* additionalFields = nullptr
 	);

@ -38,12 +37,12 @@ public:
 		return _updateType;
 	}

-	const std::optional<uint64_t> streamTime() const
+	const uint64_t streamTime() const
 	{
 		return _streamTime;
 	}

-	const std::optional<uint64_t> recordingTime() const
+	const uint64_t recordingTime() const
 	{
 		return _recordingTime;
 	}
@ -55,7 +54,7 @@ public:

 private:
 	QString _updateType;
-	std::optional<uint64_t> _streamTime;
-	std::optional<uint64_t> _recordingTime;
+	uint64_t _streamTime;
+	uint64_t _recordingTime;
 	OBSDataAutoRelease _additionalFields;
 };
Author	SHA1	Message	Date
tt2468	7906057440	base: Update source code to build against 27.2.4	2022-08-02 15:58:09 -07:00
tt2468	96c6b03aa6	CI: Update package name to not collide with 5.0.0	2022-08-02 15:51:19 -07:00
Norihiro Kamae	7ea9b16b37	Events: Fix memory leak `bfree` was missing after calling `obs_frontend_get_current_profile()`.	2022-05-31 01:03:05 +09:00
tt2468	ff6b774687	CMakeLists: Don't include imageformats plugins	2022-03-01 17:20:20 -08:00
tt2468	9bdaefded9	CI: Update packages version	2022-03-01 17:10:39 -08:00
tt2468	4a88612693	CI: Use focal	2022-03-01 16:59:05 -08:00
tt2468	f8a88c54ce	CI: force use obs 27.1.3 on linux	2022-03-01 16:53:41 -08:00
tt2468	df2049b751	Locale: Update start failure message	2022-01-28 15:55:30 -08:00
tt2468	dc9afeb213	Config: Reuse 4.x configs directly Since compat is not meant to run alongside real 4.x, we shouldn't care about reusing the original settings.	2022-01-28 15:43:50 -08:00
tt2468	13c1c108ea	Config: Set default port back to 4444	2022-01-28 15:43:14 -08:00
tt2468	16ee66e6dc	Base: Add logging for compile time ASIO version	2022-01-07 23:02:05 -08:00
tt2468	d563dd3146	deps: Downgrade asio to 1.12.1 Even though we statically link ASIO, it has issues with the kqueue_reactor() on macos segfaulting when other plugins using different ASIO versions are installed. So that means we're stuck using 1.12.1 until we can find some kind of fix for the crash issue.	2022-01-04 00:39:52 -08:00
tt2468	65a17071d2	deps: Upgrade to versions used by `master`	2022-01-03 23:35:02 -08:00
tt2468	d993ce8b1a	CI: Attempt fix of directory name	2022-01-03 18:39:45 -08:00
tt2468	9c4a114c94	CI: Use specific branch instead of checkout Azure is a dumb platform, meaning `git` is randomly not found. So we'll just use something else then.	2022-01-03 17:34:11 -08:00
tt2468	7062062ec5	CI: Fix sln file location on windows	2022-01-03 17:26:51 -08:00
tt2468	be7c334a72	CI: Fix binary name on macos	2022-01-03 17:20:26 -08:00
tt2468	b5f267d3bb	RPC: Remove usage of std::optional Stupid 10.13 doesnt support C++17. No idea how we built 4.9.0	2022-01-03 17:06:13 -08:00
tt2468	d0d89dd133	CI: Use specifically 27.1.3 for build	2022-01-03 16:48:34 -08:00
tt2468	a0e8cb6b4c	CI: Set target to 10.13 This was accidentally removed in 4.9.1	2022-01-03 16:44:52 -08:00
tt2468	348e875969	CI: Update more versions	2022-01-03 16:30:08 -08:00
tt2468	be0fb682e0	CI: Build on 4.x-compat	2022-01-03 16:28:22 -08:00
tt2468	ea8f14e41b	Base: Update files for compat release	2022-01-03 16:26:42 -08:00
tt2468	a8a3f3aafe	WSServer: Add debug logging to stop() Some users have been having issues with OBS hanging on server stop, so this will help troubleshoot.	2021-11-18 15:58:33 -08:00
tt2468	387376e5e0	.github: Remove logo	2021-11-16 22:59:15 -08:00
tt2468	80cefdcfda	README: Remove logo	2021-11-16 22:58:22 -08:00
tt2468	6a14110720	Merge pull request #833 from you-win/feature/add-obs-websocket-gd-to-readme Readme: Add obs-websocket-gd to readme	2021-10-07 12:37:08 -07:00
Tim Yuen	8bfe2bf04c	Readme: Add obs-websocket-gd to readme Add the obs-websocket-gd project to the readme as an available language API.	2021-10-07 11:11:05 -04:00
Stéphane Lepin	bbf4b321d7	Merge pull request #780 from Palakis/fix/obsdata-double-release Protocol: Fix double free of obs_data_t*	2021-07-18 21:11:07 +02:00
Azure CI	310c297a36	docs(ci): Update protocol.md - `5d14cb7` [skip ci]	2021-07-18 19:01:49 +00:00
tt2468	5d14cb7af8	Merge pull request #791 from dvangennip/4.x-current WSRequestHandler_Sources: fix comment name for Set/GetAudioTrack	2021-07-18 12:01:08 -07:00
tt2468	48291506f5	Merge pull request #792 from andreykaipov/docs/go Docs: Add another Go client library	2021-07-08 19:20:22 -07:00
Andrey Kaipov	b0badd0630	Docs: Add another Go client library	2021-07-08 21:21:25 -04:00
Doménique van Gennip	c5ef671e0c	WSRequestHandler_Sources: fix comment name for Set/GetAudioTrack Functions were named SetTracks and GetTracks rather than SetAudioTracks and GetAudioTracks as in the actual code, so this mismatch gets picked up by the protocol docs (but not anymore).	2021-07-03 21:04:49 +10:00
tt2468	ffb97aaabc	Protocol: Fix double free of obs_data_t*	2021-06-20 16:26:45 -07:00