base: Update version to 5.2.3

Fixes #1136

.cmake-format.json

@@ -1,4 +1,10 @@
 {
+  "format": {
+    "line_width": 120,
+    "tab_size": 2,
+    "enable_sort": true,
+    "autosort": true
+  },
   "additional_commands": {
     "find_qt": {
       "flags": [],
@@ -8,6 +14,33 @@
         "COMPONENTS_MACOS": "+",
         "COMPONENTS_LINUX": "+"
       }
+    },
+    "set_target_properties_obs": {
+      "pargs": 1,
+      "flags": [],
+      "kwargs": {
+        "PROPERTIES": {
+          "kwargs": {
+            "PREFIX": 1,
+            "OUTPUT_NAME": 1,
+            "FOLDER": 1,
+            "VERSION": 1,
+            "SOVERSION": 1,
+            "FRAMEWORK": 1,
+            "BUNDLE": 1,
+            "AUTOMOC": 1,
+            "AUTOUIC": 1,
+            "AUTORCC": 1,
+            "AUTOUIC_SEARCH_PATHS": 1,
+            "BUILD_RPATH": 1,
+            "INSTALL_RPATH": 1,
+            "XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC": 1,
+            "XCODE_ATTRIBUTE_CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION": 1,
+            "XCODE_ATTRIBUTE_GCC_WARN_SHADOW":1 ,
+            "LIBRARY_OUTPUT_DIRECTORY": 1
+          }
+        }
+      }
     }
   }
 }

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -28,10 +28,8 @@ body:
     - macOS 10.14
     - macOS 10.13
     - Ubuntu 22.04 LTS
-    - Ubuntu 21.04
     - Ubuntu 20.10
     - Ubuntu 20.04 LTS
-    - Ubuntu 18.04 LTS
     - Other
   validations:
     required: true
@@ -49,16 +47,10 @@ body:
     label: OBS Studio Version
     description: What version of OBS Studio are you using?
     options:
-    - 28.0.0
+    - 29.0.x
+    - 28.1.x
+    - 28.0.x
     - 27.2.4
-    - 27.2.3
-    - 27.2.2
-    - 27.2.1
-    - 27.2.0
-    - 27.1.3
-    - 27.1.1
-    - 27.1.0
-    - 27.0.1
     - Git
     - Other
   validations:
@@ -76,9 +68,9 @@ body:
     label: obs-websocket Version
     description: What version of obs-websocket are you using?
     options:
+    - 5.1.0
     - 5.0.1
     - 5.0.0
-    - 5.0.0-beta1
     - Git
   validations:
     required: true

.gitignore

@@ -2,7 +2,6 @@
 .DS_Store
 .idea
 .vscode
-**.generated.h
 /build/
 /build32/
 /build64/
@@ -10,5 +9,4 @@
 /package/
 /installer/Output/
 /docs/node_modules/
-/installer/installer-windows.generated.iss
 /cmake-build-debug/

.gitmodules

@@ -1,12 +1,3 @@
-[submodule "deps/websocketpp"]
-	path = deps/websocketpp
-	url = https://github.com/zaphoyd/websocketpp.git
-[submodule "deps/asio"]
-	path = deps/asio
-	url = https://github.com/chriskohlhoff/asio.git
-[submodule "deps/json"]
-	path = deps/json
-	url = https://github.com/nlohmann/json.git
 [submodule "deps/qr"]
 	path = deps/qr
 	url = https://github.com/nayuki/QR-Code-generator.git

CMakeLists.txt

@@ -1,52 +1,38 @@
-project(obs-websocket VERSION 5.0.1)
+cmake_minimum_required(VERSION 3.16...3.25)
+
+legacy_check()
+
+set(obs-websocket_VERSION 5.2.3)
 set(OBS_WEBSOCKET_RPC_VERSION 1)
 
 option(ENABLE_WEBSOCKET "Enable building OBS with websocket plugin" ON)
-
-if(NOT ENABLE_WEBSOCKET OR NOT ENABLE_UI)
-  message(STATUS "OBS:  DISABLED   obs-websocket")
+if(NOT ENABLE_WEBSOCKET)
+  target_disable(obs-websocket)
   return()
 endif()
 
 # Submodule deps check
-if(NOT
-   (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/deps/json/CMakeLists.txt
-    AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/deps/websocketpp/CMakeLists.txt
-    AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/deps/qr/cpp/QrCode.hpp
-    AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/deps/asio/asio/include/asio.hpp))
-  obs_status(FATAL_ERROR "obs-websocket submodule deps not available.")
+if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/deps/qr/cpp/QrCode.hpp")
+  message(FATAL_ERROR "obs-websocket submodule deps not available.")
 endif()
 
-# Plugin tests flag
-option(PLUGIN_TESTS "Enable plugin runtime tests" OFF)
-
-# Qt build stuff
-set(CMAKE_PREFIX_PATH "${QTDIR}")
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON) # For resources.qrc
-
 # Find Qt
 find_qt(COMPONENTS Core Widgets Svg Network)
 
-# Find nlohmann
-set(JSON_BuildTests
-    OFF
-    CACHE INTERNAL "")
-add_subdirectory(deps/json)
+# Find nlohmann JSON
+find_package(nlohmann_json 3 REQUIRED)
 
-# Tell websocketpp not to use system boost
-add_definitions(-DASIO_STANDALONE)
+# Find WebSocket++
+find_package(Websocketpp 0.8 REQUIRED)
 
-# Configure files
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/plugin-macros.h.in
-               ${CMAKE_CURRENT_SOURCE_DIR}/src/plugin-macros.generated.h)
+# Find Asio
+find_package(Asio 1.12.1 REQUIRED)
 
-# Setup target
 add_library(obs-websocket MODULE)
 add_library(OBS::websocket ALIAS obs-websocket)
 
+target_sources(obs-websocket PRIVATE)
+
 target_sources(
   obs-websocket
   PRIVATE src/obs-websocket.cpp
@@ -54,50 +40,59 @@ target_sources(
           src/Config.cpp
           src/Config.h
           lib/obs-websocket-api.h
-          src/forms/SettingsDialog.cpp
-          src/forms/SettingsDialog.h
           src/forms/ConnectInfo.cpp
           src/forms/ConnectInfo.h
           src/forms/resources.qrc
+          src/forms/SettingsDialog.cpp
+          src/forms/SettingsDialog.h
           src/WebSocketApi.cpp
-          src/WebSocketApi.h
-          src/websocketserver/WebSocketServer.cpp
+          src/WebSocketApi.h)
+
+target_sources(
+  obs-websocket
+  PRIVATE src/websocketserver/WebSocketServer.cpp
           src/websocketserver/WebSocketServer_Protocol.cpp
           src/websocketserver/WebSocketServer.h
           src/websocketserver/rpc/WebSocketSession.cpp
           src/websocketserver/rpc/WebSocketSession.h
           src/websocketserver/types/WebSocketCloseCode.h
-          src/websocketserver/types/WebSocketOpCode.h
-          src/eventhandler/EventHandler.cpp
-          src/eventhandler/EventHandler_General.cpp
-          src/eventhandler/EventHandler_Config.cpp
-          src/eventhandler/EventHandler_Scenes.cpp
-          src/eventhandler/EventHandler_Inputs.cpp
-          src/eventhandler/EventHandler_Transitions.cpp
-          src/eventhandler/EventHandler_Filters.cpp
-          src/eventhandler/EventHandler_Outputs.cpp
-          src/eventhandler/EventHandler_SceneItems.cpp
-          src/eventhandler/EventHandler_MediaInputs.cpp
-          src/eventhandler/EventHandler_Ui.cpp
+          src/websocketserver/types/WebSocketOpCode.h)
+
+target_sources(
+  obs-websocket
+  PRIVATE src/eventhandler/EventHandler.cpp
           src/eventhandler/EventHandler.h
-          src/eventhandler/types/EventSubscription.h
-          src/requesthandler/RequestHandler.cpp
-          src/requesthandler/RequestHandler_General.cpp
-          src/requesthandler/RequestHandler_Config.cpp
-          src/requesthandler/RequestHandler_Sources.cpp
-          src/requesthandler/RequestHandler_Scenes.cpp
-          src/requesthandler/RequestHandler_Inputs.cpp
-          src/requesthandler/RequestHandler_Transitions.cpp
-          src/requesthandler/RequestHandler_Filters.cpp
-          src/requesthandler/RequestHandler_SceneItems.cpp
-          src/requesthandler/RequestHandler_Outputs.cpp
-          src/requesthandler/RequestHandler_Stream.cpp
-          src/requesthandler/RequestHandler_Record.cpp
-          src/requesthandler/RequestHandler_MediaInputs.cpp
-          src/requesthandler/RequestHandler_Ui.cpp
-          src/requesthandler/RequestHandler.h
-          src/requesthandler/RequestBatchHandler.cpp
+          src/eventhandler/EventHandler_Config.cpp
+          src/eventhandler/EventHandler_General.cpp
+          src/eventhandler/EventHandler_Filters.cpp
+          src/eventhandler/EventHandler_Inputs.cpp
+          src/eventhandler/EventHandler_MediaInputs.cpp
+          src/eventhandler/EventHandler_Outputs.cpp
+          src/eventhandler/EventHandler_Scenes.cpp
+          src/eventhandler/EventHandler_SceneItems.cpp
+          src/eventhandler/EventHandler_Transitions.cpp
+          src/eventhandler/EventHandler_Ui.cpp
+          src/eventhandler/types/EventSubscription.h)
+
+target_sources(
+  obs-websocket
+  PRIVATE src/requesthandler/RequestBatchHandler.cpp
           src/requesthandler/RequestBatchHandler.h
+          src/requesthandler/RequestHandler.cpp
+          src/requesthandler/RequestHandler.h
+          src/requesthandler/RequestHandler_Config.cpp
+          src/requesthandler/RequestHandler_Filters.cpp
+          src/requesthandler/RequestHandler_General.cpp
+          src/requesthandler/RequestHandler_Inputs.cpp
+          src/requesthandler/RequestHandler_MediaInputs.cpp
+          src/requesthandler/RequestHandler_Outputs.cpp
+          src/requesthandler/RequestHandler_Sources.cpp
+          src/requesthandler/RequestHandler_Record.cpp
+          src/requesthandler/RequestHandler_Scenes.cpp
+          src/requesthandler/RequestHandler_SceneItems.cpp
+          src/requesthandler/RequestHandler_Stream.cpp
+          src/requesthandler/RequestHandler_Transitions.cpp
+          src/requesthandler/RequestHandler_Ui.cpp
           src/requesthandler/rpc/Request.cpp
           src/requesthandler/rpc/Request.h
           src/requesthandler/rpc/RequestBatchRequest.cpp
@@ -105,34 +100,50 @@ target_sources(
           src/requesthandler/rpc/RequestResult.cpp
           src/requesthandler/rpc/RequestResult.h
           src/requesthandler/types/RequestStatus.h
-          src/requesthandler/types/RequestBatchExecutionType.h
+          src/requesthandler/types/RequestBatchExecutionType.h)
+
+target_sources(
+  obs-websocket
+  PRIVATE src/utils/Compat.cpp
+          src/utils/Compat.h
           src/utils/Crypto.cpp
           src/utils/Crypto.h
           src/utils/Json.cpp
           src/utils/Json.h
           src/utils/Obs.cpp
-          src/utils/Obs_StringHelper.cpp
-          src/utils/Obs_NumberHelper.cpp
-          src/utils/Obs_ArrayHelper.cpp
-          src/utils/Obs_ObjectHelper.cpp
-          src/utils/Obs_SearchHelper.cpp
-          src/utils/Obs_ActionHelper.cpp
           src/utils/Obs.h
+          src/utils/Obs_ActionHelper.cpp
+          src/utils/Obs_ArrayHelper.cpp
+          src/utils/Obs_NumberHelper.cpp
+          src/utils/Obs_ObjectHelper.cpp
+          src/utils/Obs_StringHelper.cpp
+          src/utils/Obs_SearchHelper.cpp
           src/utils/Obs_VolumeMeter.cpp
           src/utils/Obs_VolumeMeter.h
           src/utils/Obs_VolumeMeter_Helpers.h
           src/utils/Platform.cpp
           src/utils/Platform.h
-          src/utils/Compat.cpp
-          src/utils/Compat.h
-          src/utils/Utils.h
-          deps/qr/cpp/QrCode.cpp
-          deps/qr/cpp/QrCode.hpp)
+          src/utils/Utils.h)
 
-target_include_directories(
+target_sources(obs-websocket PRIVATE deps/qr/cpp/QrCode.cpp deps/qr/cpp/QrCode.hpp)
+
+configure_file(src/plugin-macros.h.in plugin-macros.generated.h)
+target_sources(obs-websocket PRIVATE plugin-macros.generated.h)
+
+target_compile_definitions(
+  obs-websocket PRIVATE ASIO_STANDALONE $<$<BOOL:PLUGIN_TESTS>:PLUGIN_TESTS>
+                        $<$<PLATFORM_ID:Windows>:_WEBSOCKETPP_CPP11_STL_> $<$<PLATFORM_ID:Windows>:_WIN32_WINNT=0x0603>)
+
+target_compile_options(
   obs-websocket
-  PRIVATE ${Qt5Core_INCLUDES} ${Qt5Widgets_INCLUDES} ${Qt5Svg_INCLUDES}
-          ${Qt5Network_INCLUDES} "deps/asio/asio/include" "deps/websocketpp")
+  PRIVATE
+    $<$<PLATFORM_ID:Windows>:/wd4267>
+    $<$<PLATFORM_ID:Windows>:/wd4996>
+    $<$<PLATFORM_ID:Darwin,Linux,FreeBSD>:-Wall>
+    $<$<COMPILE_LANG_AND_ID:CXX,GNU,AppleClang,Clang>:-Wno-error=float-conversion;-Wno-error=shadow>
+    $<$<COMPILE_LANG_AND_ID:CXX,GNU>:-Wno-error=format-overflow;-Wno-error=int-conversion;-Wno-error=comment>
+    $<$<COMPILE_LANG_AND_ID:CXX,AppleClang,Clang>:-Wno-error=null-pointer-subtraction;-Wno-error=deprecated-declarations;-Wno-error=implicit-int-conversion;-Wno-error=shorten-64-to-32;-Wno-comma;-Wno-quoted-include-in-framework-header>
+)
 
 target_link_libraries(
   obs-websocket
@@ -142,33 +153,21 @@ target_link_libraries(
           Qt::Widgets
           Qt::Svg
           Qt::Network
-          nlohmann_json::nlohmann_json)
+          nlohmann_json::nlohmann_json
+          Websocketpp::Websocketpp
+          Asio::Asio)
 
-target_compile_features(obs-websocket PRIVATE cxx_std_17)
-
-set_target_properties(obs-websocket PROPERTIES FOLDER "plugins/obs-websocket")
-
-if(PLUGIN_TESTS)
-  target_compile_definitions(obs-websocket PRIVATE PLUGIN_TESTS)
-endif()
-
-# Random other things
-if(WIN32)
-  add_definitions(-D_WEBSOCKETPP_CPP11_STL_)
-endif()
-
-if(MSVC)
-  target_compile_options(obs-websocket PRIVATE /wd4267 /wd4996)
-else()
-  target_compile_options(
+set_target_properties_obs(
   obs-websocket
-    PRIVATE
-      -Wall
-      "$<$<COMPILE_LANG_AND_ID:CXX,GNU>:-Wno-error=format-overflow>"
-      "$<$<COMPILE_LANG_AND_ID:CXX,AppleClang,Clang>:-Wno-error=null-pointer-subtraction;-Wno-error=deprecated-declarations>"
-  )
-endif()
+  PROPERTIES FOLDER plugins
+             PREFIX ""
+             AUTOMOC ON
+             AUTOUIC ON
+             AUTORCC ON)
 
-# Final CMake helpers
-setup_plugin_target(obs-websocket)
-setup_target_resources(obs-websocket "obs-plugins/obs-websocket")
+if(OS_WINDOWS)
+  set_property(
+    TARGET obs-websocket
+    APPEND
+    PROPERTY AUTORCC_OPTIONS --format-version 1)
+endif()

README.md

@@ -31,21 +31,30 @@ It is **highly recommended** to keep obs-websocket protected with a password aga
 
 ### Client software
 
+- [Macro Deck](https://macrodeck.org/)
 - [Touch Portal](https://www.touch-portal.com/)
 - [Twitchat](https://twitchat.fr/)
 - [OBS-web](https://github.com/Niek/obs-web) - hosted client at [obs-web.niek.tv/](http://obs-web.niek.tv/)
+- [Streamer.bot](https://streamer.bot/)
+- [Deckboard](https://deckboard.app/)
+- [OBS Blade](https://github.com/Kounex/obs_blade)
+- [Aitum](https://aitum.tv/)
+- [Kruiz Control](https://github.com/Kruiser8/Kruiz-Control)
+- [Bitfocus Companion Module](https://bitfocus.io/companion/)
 
 ### Client libraries (for developers)
 
 Here's a list of available language APIs for obs-websocket:
 
 - Python 3.7+ (Asyncio): [simpleobsws](https://github.com/IRLToolkit/simpleobsws/tree/master) by IRLToolkit
+- Python 3.10+ (Non-Asyncio): [obsws-python](https://pypi.org/project/obsws-python) by aatikturk and onyx-and-iris
 - Rust: [obws](https://github.com/dnaka91/obws) by dnaka91
 - Godot 3.4.x: [obs-websocket-gd](https://github.com/you-win/obs-websocket-gd) by you-win
 - Javascript (Node and web): [obs-websocket-js](https://github.com/obs-websocket-community-projects/obs-websocket-js) by OBS Websocket Community
   - C (uses obs-websocket-js): [v8-libwebsocket-obs-websocket](https://github.com/dgatwood/v8-libwebsocket-obs-websocket)
 - Go: [goobs](https://github.com/andreykaipov/goobs) by andreykaipov
 - Dart/Flutter (can target all supported platforms): [obs_websocket](https://github.com/faithoflifedev/obs_websocket) by faithoflifedev
+- Java: [obs-websocket-java](https://github.com/obs-websocket-community-projects/obs-websocket-java) by OBS Websocket Community
 
 The 5.x server is a typical WebSocket server running by default on port 4455 (the port number can be changed in the Settings dialog under `Tools`).
 The protocol we use is documented in [PROTOCOL.md](docs/generated/protocol.md).

cmake/legacy.cmake

@@ -0,0 +1,174 @@
+project(obs-websocket VERSION 5.2.3)
+set(OBS_WEBSOCKET_RPC_VERSION 1)
+
+option(ENABLE_WEBSOCKET "Enable building OBS with websocket plugin" ON)
+
+if(NOT ENABLE_WEBSOCKET OR NOT ENABLE_UI)
+  message(STATUS "OBS:  DISABLED   obs-websocket")
+  return()
+endif()
+
+# Submodule deps check
+if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/deps/qr/cpp/QrCode.hpp)
+  obs_status(FATAL_ERROR "obs-websocket submodule deps not available.")
+endif()
+
+# Plugin tests flag
+option(PLUGIN_TESTS "Enable plugin runtime tests" OFF)
+
+# Find Qt
+find_qt(COMPONENTS Core Widgets Svg Network)
+
+# Find nlohmann JSON
+find_package(nlohmann_json 3 REQUIRED)
+
+# Find WebSocket++
+find_package(Websocketpp 0.8 REQUIRED)
+
+# Find Asio
+find_package(Asio 1.12.1 REQUIRED)
+
+# Tell websocketpp not to use system boost
+add_definitions(-DASIO_STANDALONE)
+
+# Configure files
+configure_file(src/plugin-macros.h.in plugin-macros.generated.h)
+
+# Setup target
+add_library(obs-websocket MODULE)
+add_library(OBS::websocket ALIAS obs-websocket)
+
+set_target_properties(
+  obs-websocket
+  PROPERTIES AUTOMOC ON
+             AUTOUIC ON
+             AUTORCC ON)
+
+if(_QT_VERSION EQUAL 6 AND OS_WINDOWS)
+  set_target_properties(obs-websocket PROPERTIES AUTORCC_OPTIONS "--format-version;1")
+endif()
+
+target_include_directories(obs-websocket PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+
+target_sources(
+  obs-websocket
+  PRIVATE src/obs-websocket.cpp
+          src/obs-websocket.h
+          src/Config.cpp
+          src/Config.h
+          lib/obs-websocket-api.h
+          src/forms/SettingsDialog.cpp
+          src/forms/SettingsDialog.h
+          src/forms/ConnectInfo.cpp
+          src/forms/ConnectInfo.h
+          src/forms/resources.qrc
+          src/WebSocketApi.cpp
+          src/WebSocketApi.h
+          src/websocketserver/WebSocketServer.cpp
+          src/websocketserver/WebSocketServer_Protocol.cpp
+          src/websocketserver/WebSocketServer.h
+          src/websocketserver/rpc/WebSocketSession.cpp
+          src/websocketserver/rpc/WebSocketSession.h
+          src/websocketserver/types/WebSocketCloseCode.h
+          src/websocketserver/types/WebSocketOpCode.h
+          src/eventhandler/EventHandler.cpp
+          src/eventhandler/EventHandler_General.cpp
+          src/eventhandler/EventHandler_Config.cpp
+          src/eventhandler/EventHandler_Scenes.cpp
+          src/eventhandler/EventHandler_Inputs.cpp
+          src/eventhandler/EventHandler_Transitions.cpp
+          src/eventhandler/EventHandler_Filters.cpp
+          src/eventhandler/EventHandler_Outputs.cpp
+          src/eventhandler/EventHandler_SceneItems.cpp
+          src/eventhandler/EventHandler_MediaInputs.cpp
+          src/eventhandler/EventHandler_Ui.cpp
+          src/eventhandler/EventHandler.h
+          src/eventhandler/types/EventSubscription.h
+          src/requesthandler/RequestHandler.cpp
+          src/requesthandler/RequestHandler_General.cpp
+          src/requesthandler/RequestHandler_Config.cpp
+          src/requesthandler/RequestHandler_Sources.cpp
+          src/requesthandler/RequestHandler_Scenes.cpp
+          src/requesthandler/RequestHandler_Inputs.cpp
+          src/requesthandler/RequestHandler_Transitions.cpp
+          src/requesthandler/RequestHandler_Filters.cpp
+          src/requesthandler/RequestHandler_SceneItems.cpp
+          src/requesthandler/RequestHandler_Outputs.cpp
+          src/requesthandler/RequestHandler_Stream.cpp
+          src/requesthandler/RequestHandler_Record.cpp
+          src/requesthandler/RequestHandler_MediaInputs.cpp
+          src/requesthandler/RequestHandler_Ui.cpp
+          src/requesthandler/RequestHandler.h
+          src/requesthandler/RequestBatchHandler.cpp
+          src/requesthandler/RequestBatchHandler.h
+          src/requesthandler/rpc/Request.cpp
+          src/requesthandler/rpc/Request.h
+          src/requesthandler/rpc/RequestBatchRequest.cpp
+          src/requesthandler/rpc/RequestBatchRequest.h
+          src/requesthandler/rpc/RequestResult.cpp
+          src/requesthandler/rpc/RequestResult.h
+          src/requesthandler/types/RequestStatus.h
+          src/requesthandler/types/RequestBatchExecutionType.h
+          src/utils/Crypto.cpp
+          src/utils/Crypto.h
+          src/utils/Json.cpp
+          src/utils/Json.h
+          src/utils/Obs.cpp
+          src/utils/Obs_StringHelper.cpp
+          src/utils/Obs_NumberHelper.cpp
+          src/utils/Obs_ArrayHelper.cpp
+          src/utils/Obs_ObjectHelper.cpp
+          src/utils/Obs_SearchHelper.cpp
+          src/utils/Obs_ActionHelper.cpp
+          src/utils/Obs.h
+          src/utils/Obs_VolumeMeter.cpp
+          src/utils/Obs_VolumeMeter.h
+          src/utils/Obs_VolumeMeter_Helpers.h
+          src/utils/Platform.cpp
+          src/utils/Platform.h
+          src/utils/Compat.cpp
+          src/utils/Compat.h
+          src/utils/Utils.h
+          deps/qr/cpp/QrCode.cpp
+          deps/qr/cpp/QrCode.hpp)
+
+target_link_libraries(
+  obs-websocket
+  PRIVATE OBS::libobs
+          OBS::frontend-api
+          Qt::Core
+          Qt::Widgets
+          Qt::Svg
+          Qt::Network
+          nlohmann_json::nlohmann_json
+          Websocketpp::Websocketpp
+          Asio::Asio)
+
+target_compile_features(obs-websocket PRIVATE cxx_std_17)
+
+set_target_properties(obs-websocket PROPERTIES FOLDER "plugins/obs-websocket")
+
+if(PLUGIN_TESTS)
+  target_compile_definitions(obs-websocket PRIVATE PLUGIN_TESTS)
+endif()
+
+# Random other things
+if(WIN32)
+  add_definitions(-D_WEBSOCKETPP_CPP11_STL_)
+endif()
+
+if(MSVC)
+  target_compile_options(obs-websocket PRIVATE /wd4267 /wd4996)
+else()
+  target_compile_options(
+    obs-websocket
+    PRIVATE
+      -Wall
+      "$<$<COMPILE_LANG_AND_ID:CXX,GNU>:-Wno-error=format-overflow>"
+      "$<$<COMPILE_LANG_AND_ID:CXX,AppleClang,Clang>:-Wno-error=null-pointer-subtraction;-Wno-error=deprecated-declarations>"
+  )
+endif()
+
+# Final CMake helpers
+setup_plugin_target(obs-websocket)
+setup_target_resources(obs-websocket "obs-plugins/obs-websocket")

cmake/macos/Info.plist.in

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleName</key>
+	<string>obs-websocket</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.obsproject.obs-websocket</string>
+	<key>CFBundleVersion</key>
+	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
+	<key>CFBundleShortVersionString</key>
+	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleExecutable</key>
+	<string>obs-websocket</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
+	<key>LSMinimumSystemVersion</key>
+	<string>${CMAKE_OSX_DEPLOYMENT_TARGET}</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>(c) 2016-${CURRENT_YEAR} Stéphane Lepin, Kyle Manning</string>
+</dict>
+</plist>

data/locale/ar-SA.ini

@@ -1,5 +1,5 @@
 OBSWebSocket.Plugin.Description="التحكم عن بعد في استوديو OBS من خلال WebSocket"
-OBSWebSocket.Settings.DialogTitle="إعدادات obs-websocket"
+OBSWebSocket.Settings.DialogTitle="إعدادات خادم WebSocket"
 OBSWebSocket.Settings.PluginSettingsTitle="إعدادات الإضافات"
 OBSWebSocket.Settings.ServerEnable="تمكين خادم WebSocket"
 OBSWebSocket.Settings.AlertsEnable="تمكين تنبيهات شريط النظام"

data/locale/ca-ES.ini

@@ -1,10 +1,10 @@
-OBSWebSocket.Plugin.Description="Control remot de l'OBS Studio mitjançant un servidor web"
-OBSWebSocket.Settings.DialogTitle="Configuració del servidor web de l'OBS"
+OBSWebSocket.Plugin.Description="Control remot de l'OBS Studio mitjançant WebSocket"
+OBSWebSocket.Settings.DialogTitle="Configuració del servidor WebSocket"
 OBSWebSocket.Settings.PluginSettingsTitle="Configuració del complement"
-OBSWebSocket.Settings.ServerEnable="Habilita el servidor web"
+OBSWebSocket.Settings.ServerEnable="Habilita el servidor WebSocket"
 OBSWebSocket.Settings.AlertsEnable="Habilita les notificacions a la barra de tasques"
 OBSWebSocket.Settings.DebugEnable="Habilita l'informe de depuració"
-OBSWebSocket.Settings.DebugEnableHoverText="Habilita l'informe de depuració només per a la instància actual de l'OBS i no queda resident en inicis posteriors.\nUtilitzeu --websocket_debug si us cal que el canvi sigui persistent."
+OBSWebSocket.Settings.DebugEnableHoverText="Habilita l'informe de depuració només per a la instància actual de l'OBS. No persisteix en inicis posteriors.\nUtilitzeu --websocket_debug si us cal que el canvi sigui persistent."
 OBSWebSocket.Settings.ServerSettingsTitle="Configuració del servidor"
 OBSWebSocket.Settings.AuthRequired="Habilita l'autenticació"
 OBSWebSocket.Settings.Password="Contrasenya del servidor"
@@ -15,29 +15,29 @@ OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Atenció: Actualment en direc
 OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Sembla que una sortida (retransmissió, gravació, etc.) està actualment activa."
 OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Segur que voleu mostrar la vostra informació de connexió?"
 OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Atenció: Risc potencial de seguretat"
-OBSWebSocket.Settings.Save.UserPasswordWarningMessage="El servidor web del l'OBS (obs-websocket) emmagatzema la contrasenya del servidor com a text pla. És altament recomanable l'ús d'una contrasenya generada automàticament."
+OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket emmagatzema la contrasenya del servidor com a text pla. És altament recomanable l'ús d'una contrasenya generada automàticament."
 OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Segur que voleu utilitzar la vostra contrasenya?"
 OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Error: Configuració no vàlida"
 OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Utilitzeu una contrasenya de 6 o més caràcters."
-OBSWebSocket.SessionTable.Title="Sessions de servidor connectades"
+OBSWebSocket.SessionTable.Title="Sessions de WebSocket connectades"
 OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Adreça remota"
 OBSWebSocket.SessionTable.SessionDurationColumnTitle="Durada de la sessió"
 OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Missatges d'entrada/sortida"
 OBSWebSocket.SessionTable.IdentifiedTitle="Identificat"
-OBSWebSocket.SessionTable.KickButtonColumnTitle="Expulsió?"
+OBSWebSocket.SessionTable.KickButtonColumnTitle="Expulsar?"
 OBSWebSocket.SessionTable.KickButtonText="Expulsa"
-OBSWebSocket.ConnectInfo.DialogTitle="Informació de connexió del servidor Web (WebSocket)"
+OBSWebSocket.ConnectInfo.DialogTitle="Informació de connexió del servidor WebSocket"
 OBSWebSocket.ConnectInfo.CopyText="Copia"
 OBSWebSocket.ConnectInfo.ServerIp="Adreça IP (més acurada)"
 OBSWebSocket.ConnectInfo.ServerPort="Port"
 OBSWebSocket.ConnectInfo.ServerPassword="Contrasenya"
 OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[Autenticació inhabilitada]"
 OBSWebSocket.ConnectInfo.QrTitle="QR de la connexió"
-OBSWebSocket.TrayNotification.Identified.Title="Connexió nova de servidor Web (WebSocket)"
+OBSWebSocket.TrayNotification.Identified.Title="Connexió nova de WebSocket"
 OBSWebSocket.TrayNotification.Identified.Body="Client %1 identificat."
-OBSWebSocket.TrayNotification.AuthenticationFailed.Title="Ha fallat l'autenticació del servidor Web"
+OBSWebSocket.TrayNotification.AuthenticationFailed.Title="Ha fallat l'autenticació del servidor WebSocket"
 OBSWebSocket.TrayNotification.AuthenticationFailed.Body="Ha fallat l'autenticació del client %1."
-OBSWebSocket.TrayNotification.Disconnected.Title="Client desconnectat del servidor Web"
+OBSWebSocket.TrayNotification.Disconnected.Title="Client desconnectat del servidor WebSocket"
 OBSWebSocket.TrayNotification.Disconnected.Body="Client %1 desconnectat."
-OBSWebSocket.Server.StartFailed.Title="Ha fallat el servidor Web (WebSocket)"
-OBSWebSocket.Server.StartFailed.Message="El servidor Web ha fallat en iniciar. Potser el port TCP %1 ja està en ús per altre programa del sistema. Proveu un port diferent a la configuració del servidor Web (WebSocket), o atureu qualsevol altra aplicació que pugui utilitzar aquest port.\n Missatge d'error: %2"
+OBSWebSocket.Server.StartFailed.Title="Ha fallat el servidor WebSocket"
+OBSWebSocket.Server.StartFailed.Message="El servidor WebSocket ha fallat en iniciar. Potser el port TCP %1 ja està en ús per altre programa del sistema. Proveu un port diferent a la configuració del servidor WebSocket, o atureu qualsevol altra aplicació que pugui utilitzar aquest port.\n Missatge d'error: %2"

data/locale/cs-CZ.ini

@@ -1,5 +1,5 @@
 OBSWebSocket.Plugin.Description="Vzdálené ovládání OBS Studia přes WebSocket"
-OBSWebSocket.Settings.DialogTitle="Nastavení obs-websocket"
+OBSWebSocket.Settings.DialogTitle="Nastavení WebSocket serveru"
 OBSWebSocket.Settings.PluginSettingsTitle="Nastavení pluginu"
 OBSWebSocket.Settings.ServerEnable="Povolit WebSocketový server"
 OBSWebSocket.Settings.AlertsEnable="Povolit upozornění v systémové liště"

data/locale/da-DK.ini

@@ -1,5 +1,4 @@
 OBSWebSocket.Plugin.Description="Fjernstyring af OBS Studio via WebSocket"
-OBSWebSocket.Settings.DialogTitle="obs-websocket Indstillinger"
 OBSWebSocket.Settings.PluginSettingsTitle="Plugin-indstillinger"
 OBSWebSocket.Settings.ServerEnable="Aktivér WebSocket-server"
 OBSWebSocket.Settings.AlertsEnable="Aktivér Systembakke Alarmer"

data/locale/de-DE.ini

@@ -1,5 +1,5 @@
 OBSWebSocket.Plugin.Description="OBS Studio per WebSocket fernsteuern"
-OBSWebSocket.Settings.DialogTitle="obs-websocket-Einstellungen"
+OBSWebSocket.Settings.DialogTitle="WebSocket-Servereinstellungen"
 OBSWebSocket.Settings.PluginSettingsTitle="Plugineinstellungen"
 OBSWebSocket.Settings.ServerEnable="WebSocket-Server aktivieren"
 OBSWebSocket.Settings.AlertsEnable="Warnungen im Infobereich aktivieren"

data/locale/el-GR.ini

@@ -0,0 +1,42 @@
+OBSWebSocket.Plugin.Description="Απομακρυσμένος έλεγχος του OBS Studio μέσω WebSocket"
+OBSWebSocket.Settings.PluginSettingsTitle="Ρυθμίσεις Προσθέτων"
+OBSWebSocket.Settings.ServerEnable="Ενεργοποίηση διακομιστή WebSocket"
+OBSWebSocket.Settings.AlertsEnable="Ενεργοποίηση Ειδοποιήσεων στο System Tray"
+OBSWebSocket.Settings.DebugEnable="Ενεργοποίηση καταγραφής σφαλμάτων"
+OBSWebSocket.Settings.DebugEnableHoverText="Ενεργοποιεί την καταγραφή σφαλμάτων για την τρέχουσα εικόνα του OBS. Δεν επιμένει κατά τη φόρτωση.\nΧρησιμοποίησε το --websocket_debug για να ενεργοποιηθεί κατά τη φόρτωση."
+OBSWebSocket.Settings.ServerSettingsTitle="Ρυθμίσεις Διακομιστή"
+OBSWebSocket.Settings.AuthRequired="Ενεργοποίηση Επαλήθευσης Στοιχείων"
+OBSWebSocket.Settings.Password="Κωδικός Διακομιστή"
+OBSWebSocket.Settings.GeneratePassword="Δημιουργία Κωδικού"
+OBSWebSocket.Settings.ServerPort="Θύρα Διακομιστή"
+OBSWebSocket.Settings.ShowConnectInfo="Εμφάνιση Πληροφοριών Σύνδεσης"
+OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Προειδοποίηση: Ενεργό επί του Παρόντος"
+OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Φαίνεται ότι μια έξοδος (ροή, εγγραφή, κλπ.) είναι ενεργή αυτή τη στιγμή."
+OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Είστε βέβαιοι ότι θέλετε να εμφανιστούν οι πληροφορίες σύνδεσης σας?"
+OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Προειδοποίηση: Πιθανό Πρόβλημα Ασφαλείας"
+OBSWebSocket.Settings.Save.UserPasswordWarningMessage="Το obs-websocket αποθηκεύει τον κωδικό πρόσβασης του διακομιστή ως απλό κείμενο. Χρησιμοποιώντας έναν κωδικό πρόσβασης που δημιουργείται από το obs-websocket συνιστάται ιδιαίτερα."
+OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Είστε βέβαιοι ότι θέλετε να χρησιμοποιήσετε το δικό σας κωδικό πρόσβασης?"
+OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Σφάλμα: Μη Έγκυρη Ρύθμιση"
+OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Πρέπει να χρησιμοποιήσετε έναν κωδικό πρόσβασης με 6 ή περισσότερους χαρακτήρες."
+OBSWebSocket.SessionTable.Title="Συνδεδεμένες Συνεδρίες WebSocket"
+OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Απομακρυσμένη Διεύθυνση"
+OBSWebSocket.SessionTable.SessionDurationColumnTitle="Διάρκεια Συνεδρίας"
+OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Εισερχόμενα/Εξερχόμενα Μηνύματα"
+OBSWebSocket.SessionTable.IdentifiedTitle="Ταυτοποιήθηκε"
+OBSWebSocket.SessionTable.KickButtonColumnTitle="Διακοπή?"
+OBSWebSocket.SessionTable.KickButtonText="Διακοπή"
+OBSWebSocket.ConnectInfo.DialogTitle="Πληροφορίες Σύνδεσης WebSocket"
+OBSWebSocket.ConnectInfo.CopyText="Αντιγραφή"
+OBSWebSocket.ConnectInfo.ServerIp="IP Διακομιστή (Βέλτιστη Εκτίμηση)"
+OBSWebSocket.ConnectInfo.ServerPort="Θύρα Διακομιστή"
+OBSWebSocket.ConnectInfo.ServerPassword="Κωδικός Διακομιστή"
+OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[Ταυτοποίηση Απενεργοποιημένη]"
+OBSWebSocket.ConnectInfo.QrTitle="Σύνδεση με QR"
+OBSWebSocket.TrayNotification.Identified.Title="Νέα Σύνδεση WebSocket"
+OBSWebSocket.TrayNotification.Identified.Body="Ο πελάτης %1 ταυτοποιήθηκε."
+OBSWebSocket.TrayNotification.AuthenticationFailed.Title="Αποτυχία Ταυτοποίησης WebSocket"
+OBSWebSocket.TrayNotification.AuthenticationFailed.Body="Αποτυχία ταυτοποίησης του πελάτη %1."
+OBSWebSocket.TrayNotification.Disconnected.Title="Αποσυνδέθηκε ο Πελάτης του WebSocket"
+OBSWebSocket.TrayNotification.Disconnected.Body="Ο πελάτης %1 αποσυνδέθηκε."
+OBSWebSocket.Server.StartFailed.Title="Αποτυχία Διακομιστή WebSocket"
+OBSWebSocket.Server.StartFailed.Message="Ο διακομιστής WebSocket απέτυχε να ξεκινήσει. Η θύρα %1 TCP μπορεί ήδη να χρησιμοποιείται από μια άλλη εφαρμογή σε αυτό το σύστημα. Δοκιμάστε να ορίσετε μια διαφορετική θύρα TCP στις ρυθμίσεις διακομιστή WebSocket ή να σταματήσετε οποιαδήποτε εφαρμογή που θα μπορούσε να χρησιμοποιήσει αυτή τη θύρα.\n Μήνυμα σφάλματος: %2"

data/locale/en-US.ini

@@ -1,6 +1,6 @@
 OBSWebSocket.Plugin.Description="Remote-control of OBS Studio through WebSocket"
 
-OBSWebSocket.Settings.DialogTitle="obs-websocket Settings"
+OBSWebSocket.Settings.DialogTitle="WebSocket Server Settings"
 
 OBSWebSocket.Settings.PluginSettingsTitle="Plugin Settings"
 OBSWebSocket.Settings.ServerEnable="Enable WebSocket server"

data/locale/es-ES.ini

@@ -1,5 +1,5 @@
 OBSWebSocket.Plugin.Description="Control remoto de OBS Studio a través de WebSocket"
-OBSWebSocket.Settings.DialogTitle="Ajustes de obs-websocket"
+OBSWebSocket.Settings.DialogTitle="Ajustes del servidor WebSocket"
 OBSWebSocket.Settings.PluginSettingsTitle="Ajustes del plugin"
 OBSWebSocket.Settings.ServerEnable="Habilitar servidor WebSocket"
 OBSWebSocket.Settings.AlertsEnable="Habilitar alertas en la bandeja del sistema"

data/locale/et-EE.ini

@@ -1,5 +1,5 @@
 OBSWebSocket.Plugin.Description="OBS Studio kaugjuhtimine WebSocketi kaudu"
-OBSWebSocket.Settings.DialogTitle="obs-websocket seaded"
+OBSWebSocket.Settings.DialogTitle="WebSocket serveri seaded"
 OBSWebSocket.Settings.PluginSettingsTitle="Plugina seaded"
 OBSWebSocket.Settings.ServerEnable="Luba WebSocket server"
 OBSWebSocket.Settings.AlertsEnable="Luba hoiatused tegumireal"

data/locale/eu-ES.ini

@@ -0,0 +1,42 @@
+OBSWebSocket.Plugin.Description="OBS Studioren urruneko kontrolatzailea WebSocket-en bidez"
+OBSWebSocket.Settings.PluginSettingsTitle="Plugin Ezarpenak"
+OBSWebSocket.Settings.ServerEnable="WebSocket zerbitzaria gaitu"
+OBSWebSocket.Settings.AlertsEnable="Aktibatu sistema-erretiluko alertak"
+OBSWebSocket.Settings.DebugEnable="Gaitu arazketa erregistroa"
+OBSWebSocket.Settings.DebugEnableHoverText="OBSren uneko instantzian arazketa erregistroa gaitzen du. Berriro irekitzerakoan ez da mantenduko . \nErabili --websocket_debug kargatzerakoan gaitzeko."
+OBSWebSocket.Settings.ServerSettingsTitle="Zerbitzariaren Ezarpenak"
+OBSWebSocket.Settings.AuthRequired="Autentifikazioa aktibatu"
+OBSWebSocket.Settings.Password="Zerbitzari pasahitza"
+OBSWebSocket.Settings.GeneratePassword="Pasahitza sortu"
+OBSWebSocket.Settings.ServerPort="Zerbitzari portua"
+OBSWebSocket.Settings.ShowConnectInfo="Konexio-informazioa erakutsi"
+OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Adi: Zuzenean zaude"
+OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Irteera bat (stream, grabazioa, etab.) aktibo dagoela badirudi."
+OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Ziur zaude konexio-informazioa erakutsi nahi duzula?"
+OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Adi: Segurtasun arazo potentziala"
+OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket-ek zerbitzariaren pasahitza testu sinple gisa gordetzen du. obs-websocket bidez sortutako pasahitza erabiltzea gomendatzen da."
+OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Ziur zaude zure pasahitza erabili nahi duzula?"
+OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Errorea: konfigurazio baliogabea"
+OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="6 karaktere edo gehiagoko pasahitza erabili behar duzu."
+OBSWebSocket.SessionTable.Title="Konektatutako WebSocket saioak"
+OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Urruneko helbidea"
+OBSWebSocket.SessionTable.SessionDurationColumnTitle="Saioaren iraupena"
+OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Sarrera-/irteera-mezuak"
+OBSWebSocket.SessionTable.IdentifiedTitle="Identifikatuta"
+OBSWebSocket.SessionTable.KickButtonColumnTitle="Kanporatu?"
+OBSWebSocket.SessionTable.KickButtonText="Kanporatu"
+OBSWebSocket.ConnectInfo.DialogTitle="WebSocket konexio-informazioa"
+OBSWebSocket.ConnectInfo.CopyText="Kopiatu"
+OBSWebSocket.ConnectInfo.ServerIp="Zerbitzariaren IP-a (proposamen hoberena)"
+OBSWebSocket.ConnectInfo.ServerPort="Zerbitzari portua"
+OBSWebSocket.ConnectInfo.ServerPassword="Zerbitzari pasahitza"
+OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[Autorizazioa desgaituta]"
+OBSWebSocket.ConnectInfo.QrTitle="Konexioaren QR kodea"
+OBSWebSocket.TrayNotification.Identified.Title="WebSocket konexio berria"
+OBSWebSocket.TrayNotification.Identified.Body="%1 bezeroa identifikatuta."
+OBSWebSocket.TrayNotification.AuthenticationFailed.Title="WebSocket Autentikazioan hutsegitea"
+OBSWebSocket.TrayNotification.AuthenticationFailed.Body="%1 bezeroak autentifikatzen huts egin du."
+OBSWebSocket.TrayNotification.Disconnected.Title="WebSocket Bezeroa deskonektatu da"
+OBSWebSocket.TrayNotification.Disconnected.Body="%1 bezeroa deskonektatu da."
+OBSWebSocket.Server.StartFailed.Title="WebSocket Zerbitzari hutsegitea"
+OBSWebSocket.Server.StartFailed.Message="WebSocket zerbitzaria ez da hasi. %1 TCP portua agian dagoeneko beste aplikazio batek erabiltzen ari du sistema honetan. Saiatu beste TCP portu bat konfiguratzen WebSocket zerbitzariaren konfigurazioan, edo portu hori erabiltzen ari den edozein aplikazio geldiarazi.\nErrore-mezua: %2"

data/locale/fa-IR.ini

@@ -1,3 +1,43 @@
+OBSWebSocket.Plugin.Description="کنترل از راه دور OBS Studio از طریق WebSocket"
+OBSWebSocket.Settings.DialogTitle="تنظیمات سرور سوکت وب"
+OBSWebSocket.Settings.PluginSettingsTitle="تنظیمات پلاگین"
+OBSWebSocket.Settings.ServerEnable="سرور سوکت وب را فعال کنید"
+OBSWebSocket.Settings.AlertsEnable="هشدارهای سینی سیستم را فعال کنید"
+OBSWebSocket.Settings.DebugEnable="فعال کردن گزارش اشکال زدایی"
+OBSWebSocket.Settings.DebugEnableHoverText="ثبت اشکال زدایی را برای نمونه فعلی OBS فعال می کند. در بارگذاری ادامه نمی‌یابد.\n برای فعال کردن در بارگذاری از --websocket_debug استفاده کنید."
+OBSWebSocket.Settings.ServerSettingsTitle="تنظیمات سرور"
+OBSWebSocket.Settings.AuthRequired="فعال کردن احراز هویت"
+OBSWebSocket.Settings.Password="رمز سرور"
+OBSWebSocket.Settings.GeneratePassword="ایجاد رمز عبور"
+OBSWebSocket.Settings.ServerPort="پورت سرور"
+OBSWebSocket.Settings.ShowConnectInfo="نمایش اطلاعات اتصال"
+OBSWebSocket.Settings.ShowConnectInfoWarningTitle="هشدار: در حال حاضر زنده است"
+OBSWebSocket.Settings.ShowConnectInfoWarningMessage="به نظر می رسد که یک خروجی (جریان، ضبط و غیره) در حال حاضر فعال است."
+OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="آیا مطمئن هستید که می خواهید اطلاعات اتصال خود را نشان دهید؟"
+OBSWebSocket.Settings.Save.UserPasswordWarningTitle="هشدار: مشکل امنیتی احتمالی"
+OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket رمز عبور سرور را به صورت متن ساده ذخیره می کند. استفاده از رمز عبور تولید شده توسط obs-websocket بسیار توصیه می شود."
+OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="آیا مطمئن هستید که می خواهید از رمز عبور خود استفاده کنید؟"
+OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="خطا: پیکربندی نامعتبر است"
+OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="باید از رمز عبور 6 کاراکتر یا بیشتر استفاده کنید."
+OBSWebSocket.SessionTable.Title="جلسات سوکت وب متصل"
+OBSWebSocket.SessionTable.RemoteAddressColumnTitle="آدرس از راه دور"
+OBSWebSocket.SessionTable.SessionDurationColumnTitle="مدت زمان جلسه"
+OBSWebSocket.SessionTable.MessagesInOutColumnTitle="پیام های ورودی/خارجی"
+OBSWebSocket.SessionTable.IdentifiedTitle="تایید هویت شده"
 OBSWebSocket.SessionTable.KickButtonColumnTitle="لگد زدن؟"
 OBSWebSocket.SessionTable.KickButtonText="اخراج"
+OBSWebSocket.ConnectInfo.DialogTitle="اطلاعات اتصال سوکت وب"
 OBSWebSocket.ConnectInfo.CopyText="رونوشت‌"
+OBSWebSocket.ConnectInfo.ServerIp="IP سرور (بهترین حدس)"
+OBSWebSocket.ConnectInfo.ServerPort="پورت سرور"
+OBSWebSocket.ConnectInfo.ServerPassword="رمز سرور"
+OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[احراز غیر فعال]"
+OBSWebSocket.ConnectInfo.QrTitle="QR را وصل کنید"
+OBSWebSocket.TrayNotification.Identified.Title="اتصال سوکت وب جدید"
+OBSWebSocket.TrayNotification.Identified.Body="سرویس گیرنده %1 شناسایی شد."
+OBSWebSocket.TrayNotification.AuthenticationFailed.Title="خرابی تأیید اعتبار سوکت وب"
+OBSWebSocket.TrayNotification.AuthenticationFailed.Body="سرویس گیرنده %1 احراز هویت نشد."
+OBSWebSocket.TrayNotification.Disconnected.Title="سرویس گیرنده سوکت وب قطع شد"
+OBSWebSocket.TrayNotification.Disconnected.Body="سرویس گیرنده %1 قطع شد."
+OBSWebSocket.Server.StartFailed.Title="خرابی سرور سوکت وب"
+OBSWebSocket.Server.StartFailed.Message="سرور WebSocket راه‌اندازی نشد. درگاه TCP % 1 ممکن است قبلاً در جای دیگری در این سیستم توسط برنامه دیگری استفاده شده باشد. یک پورت TCP دیگر را در تنظیمات سرور WebSocket تنظیم کنید، یا هر برنامه‌ای را که می‌تواند از این پورت استفاده کند متوقف کنید.\n پیام خطا: %2"

data/locale/fi-FI.ini

@@ -1,5 +1,5 @@
 OBSWebSocket.Plugin.Description="OBS Studion etähallinta WebSocketin kautta"
-OBSWebSocket.Settings.DialogTitle="obs-websocketin asetukset"
+OBSWebSocket.Settings.DialogTitle="WebSocket-palvelimen asetukset"
 OBSWebSocket.Settings.PluginSettingsTitle="Liitännäisen asetukset"
 OBSWebSocket.Settings.ServerEnable="Ota WebSocket-palvelin käyttöön"
 OBSWebSocket.Settings.AlertsEnable="Ota ilmoitusalueen ilmoitukset käyttöön"

data/locale/fil-PH.ini

@@ -0,0 +1,39 @@
+OBSWebSocket.Plugin.Description="Remote-control ng OBS Studio sa pamamagitan ng WebSocket"
+OBSWebSocket.Settings.DialogTitle="Mga Setting Ng WebSocket Server"
+OBSWebSocket.Settings.PluginSettingsTitle="Mga Setting ng Plugin"
+OBSWebSocket.Settings.ServerEnable="Paganahin ang WebSocket server"
+OBSWebSocket.Settings.AlertsEnable="Paganahin ang System Tray Alerto"
+OBSWebSocket.Settings.DebugEnable="Paganahin ang Debug Log"
+OBSWebSocket.Settings.DebugEnableHoverText="Paganahin ang debug log para sa kasalukuyang instance ng OBS. Hindi nagpapatuloy sa pag-load.\nGumamit ng --websocket_debug upang paganahin ang pag-load."
+OBSWebSocket.Settings.ServerSettingsTitle="Mga setting ng Server"
+OBSWebSocket.Settings.AuthRequired="Paggamit ng Pagpapatunay"
+OBSWebSocket.Settings.Password="Password ng server"
+OBSWebSocket.Settings.GeneratePassword="Mag-Generate ng Password"
+OBSWebSocket.Settings.ShowConnectInfo="Ipakita ang Impormasyon sa Pagkonekta"
+OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Babala: Kasalukuyang nakalive"
+OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Lumalabas na kasalukuyang aktibo ang isang output (stream, recording, atbp.)."
+OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Sigurado ka bang gusto mong ipakita ang iyong impormasyon sa pagkonekta?"
+OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Babala: Potensyal na Isyu sa Seguridad"
+OBSWebSocket.Settings.Save.UserPasswordWarningMessage="Iniimbak ng obs-websocket ang password ng server bilang plain text. Ang paggamit ng password na nabuo ng obs-websocket ay lubos na inirerekomenda."
+OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Sigurado ka bang gusto mong gamitin ang iyong sariling password?"
+OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Error: Di-wastong Configuration"
+OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Dapat kang gumamit ng password na 6 o higit pang mga character."
+OBSWebSocket.SessionTable.Title="Nakakonektang WebSocket Session"
+OBSWebSocket.SessionTable.SessionDurationColumnTitle="Tagal ng Session"
+OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Mga Mensahe In/Out"
+OBSWebSocket.SessionTable.IdentifiedTitle="Kilalanin."
+OBSWebSocket.SessionTable.KickButtonColumnTitle="Sipa?"
+OBSWebSocket.SessionTable.KickButtonText="Sipa"
+OBSWebSocket.ConnectInfo.DialogTitle="Impormasyon ng WebSocket Connect"
+OBSWebSocket.ConnectInfo.CopyText="Kopyahin"
+OBSWebSocket.ConnectInfo.ServerPassword="Password ng server"
+OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[Naka-disable ang Auth]"
+OBSWebSocket.ConnectInfo.QrTitle="Ikonekta ang QR"
+OBSWebSocket.TrayNotification.Identified.Title="Bagong Koneksyon sa WebSocket"
+OBSWebSocket.TrayNotification.Identified.Body="Natukoy ang %1 ng kliyente."
+OBSWebSocket.TrayNotification.AuthenticationFailed.Title="Nabigo sa Pagpapatunay ang WebSocket"
+OBSWebSocket.TrayNotification.AuthenticationFailed.Body="Nabigo ang kliyenteng %1 na patotohanan."
+OBSWebSocket.TrayNotification.Disconnected.Title="Nadiskonekta ang WebSocket Client"
+OBSWebSocket.TrayNotification.Disconnected.Body="Nadiskonekta ang kliyenteng %1."
+OBSWebSocket.Server.StartFailed.Title="Nabigo ng WebSocket Server"
+OBSWebSocket.Server.StartFailed.Message="Nabigong magsimula ang WebSocket server. Ang TCP port %1 ay maaaring ginagamit na sa ibang lugar sa system na ito ng isa pang application. Subukang magtakda ng ibang TCP port sa mga setting ng WebSocket server, o ihinto ang anumang application na maaaring gumagamit ng port na ito.\n Mensahe ng error: %2"

data/locale/fr-FR.ini

@@ -1,5 +1,5 @@
 OBSWebSocket.Plugin.Description="Contrôle à distance d'OBS Studio via WebSocket"
-OBSWebSocket.Settings.DialogTitle="Paramètre du websocket obs"
+OBSWebSocket.Settings.DialogTitle="Paramètres du serveur WebSocket"
 OBSWebSocket.Settings.PluginSettingsTitle="Paramètres du plugin"
 OBSWebSocket.Settings.ServerEnable="Activer le serveur WebSocket"
 OBSWebSocket.Settings.AlertsEnable="Activer les alertes de la zone de notification"

data/locale/gl-ES.ini

@@ -0,0 +1,6 @@
+OBSWebSocket.Settings.ServerSettingsTitle="Configuración do servidor"
+OBSWebSocket.ConnectInfo.CopyText="Copiar"
+OBSWebSocket.ConnectInfo.ServerPort="Porto do Servidor"
+OBSWebSocket.ConnectInfo.ServerPassword="Contrasinal do Servidor"
+OBSWebSocket.TrayNotification.Identified.Body="Cliente %1 identificado."
+OBSWebSocket.TrayNotification.Disconnected.Body="Cliente %1 desconectado."

data/locale/he-IL.ini

@@ -1,5 +1,5 @@
 OBSWebSocket.Plugin.Description="שליטה מרחוק על OBS Studio באמצעות WebSocket"
-OBSWebSocket.Settings.DialogTitle="הגדרות obs-websocket"
+OBSWebSocket.Settings.DialogTitle="הגדרות שרת WebSocket"
 OBSWebSocket.Settings.PluginSettingsTitle="הגדרות תוסף"
 OBSWebSocket.Settings.ServerEnable="הפעלת שרת WebSocket"
 OBSWebSocket.Settings.AlertsEnable="הפעלת התראות במגש המערכת"

data/locale/hi-IN.ini

@@ -1,5 +1,5 @@
 OBSWebSocket.Plugin.Description="WebSocket के माध्यम से OBS स्टूडियो का रिमोट-कंट्रोल"
-OBSWebSocket.Settings.DialogTitle="obs-websocket सेटिंग्स"
+OBSWebSocket.Settings.DialogTitle="वेबसॉकेट सर्वर सेटिंग्स"
 OBSWebSocket.Settings.PluginSettingsTitle="प्लगइन सेटिंग्स"
 OBSWebSocket.Settings.ServerEnable="WebSocket सर्वर सक्षम करें"
 OBSWebSocket.Settings.AlertsEnable="सिस्टम ट्रे अलर्ट सक्षम करें"

data/locale/hr-HR.ini

@@ -0,0 +1 @@
+OBSWebSocket.Settings.DialogTitle="Postavke servera WebSocket"

data/locale/hu-HU.ini

@@ -1,5 +1,5 @@
 OBSWebSocket.Plugin.Description="Az OBS Studio távvezérlése WebSocketen keresztül"
-OBSWebSocket.Settings.DialogTitle="Az obs-websocket beállításai"
+OBSWebSocket.Settings.DialogTitle="WebSocket-kiszolgáló beállításai"
 OBSWebSocket.Settings.PluginSettingsTitle="Bővítménybeállítások"
 OBSWebSocket.Settings.ServerEnable="WebSocket-kiszolgáló engedélyezése"
 OBSWebSocket.Settings.AlertsEnable="Rendszertálca-riasztások bekapcsolása"

data/locale/hy-AM.ini

@@ -1,5 +1,5 @@
 OBSWebSocket.Plugin.Description="OBS Studio-ի հեռակառավարումը WebSocket-ի միջոցով"
-OBSWebSocket.Settings.DialogTitle="obs-websocket կարգավորումներ"
+OBSWebSocket.Settings.DialogTitle="WebSocket Սպասարկչի Կարգավորումները"
 OBSWebSocket.Settings.PluginSettingsTitle="Միացնիչի կարգավորումներ"
 OBSWebSocket.Settings.ServerEnable="Միացնել WebSocket սերվերը"
 OBSWebSocket.Settings.AlertsEnable="Միացնել սկուտեղի ծանուցումները"

data/locale/id-ID.ini

@@ -1,5 +1,5 @@
 OBSWebSocket.Plugin.Description="Kendali jarak jauh OBS Studio melalui WebSocket"
-OBSWebSocket.Settings.DialogTitle="Pengaturan obs-websocket"
+OBSWebSocket.Settings.DialogTitle="Pengaturan Server WebSocket"
 OBSWebSocket.Settings.PluginSettingsTitle="Pengaturan Plugin"
 OBSWebSocket.Settings.ServerEnable="Aktifkan server WebSocket"
 OBSWebSocket.Settings.AlertsEnable="Aktifkan Peringatan Baki Sistem"

data/locale/it-IT.ini

@@ -1,5 +1,5 @@
 OBSWebSocket.Plugin.Description="Controllo remoto di OBS Studio tramite WebSocket"
-OBSWebSocket.Settings.DialogTitle="Impostazioni obs-websocket"
+OBSWebSocket.Settings.DialogTitle="Impostazioni server WebSocket"
 OBSWebSocket.Settings.PluginSettingsTitle="Impostazioni del plugin"
 OBSWebSocket.Settings.ServerEnable="Abilita il server WebSocket"
 OBSWebSocket.Settings.AlertsEnable="Abilita avvisi sulla barra delle applicazioni"

data/locale/ja-JP.ini

@@ -1,5 +1,5 @@
 OBSWebSocket.Plugin.Description="WebSocketを介したOBS Studioのリモートコントロール"
-OBSWebSocket.Settings.DialogTitle="obs-websocket設定"
+OBSWebSocket.Settings.DialogTitle="WebSocket サーバー設定"
 OBSWebSocket.Settings.PluginSettingsTitle="プラグイン設定"
 OBSWebSocket.Settings.ServerEnable="WebSocketサーバーを有効にする"
 OBSWebSocket.Settings.AlertsEnable="システムトレイアラートを有効にする"

data/locale/ka-GE.ini

@@ -1,5 +1,5 @@
 OBSWebSocket.Plugin.Description="OBS Studio-ს დაშორებულად მართვა WebSocket-ით"
-OBSWebSocket.Settings.DialogTitle="obs-websocket-პარამეტრები"
+OBSWebSocket.Settings.DialogTitle="WebSocket-სერვერის პარამეტრები"
 OBSWebSocket.Settings.PluginSettingsTitle="მოდულის პარამეტრები"
 OBSWebSocket.Settings.ServerEnable="WebSocket-სერვერის ჩართვა"
 OBSWebSocket.Settings.AlertsEnable="სისტემური არეში ცნობების ჩართვა"
@@ -14,7 +14,7 @@ OBSWebSocket.Settings.ShowConnectInfo="კავშირის შესახ
 OBSWebSocket.Settings.ShowConnectInfoWarningTitle="გაფრთხილება: პირდაპირ ეთერშია"
 OBSWebSocket.Settings.ShowConnectInfoWarningMessage="როგორც ჩანს, გამოტანა (ნაკადის, ჩანაწერის და სხვ.) ეთერში გადის."
 OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="ნამდვილად გსურთ კავშირის მონაცემების გამოჩენა?"
-OBSWebSocket.Settings.Save.UserPasswordWarningTitle="ყურადღება: უსაფრთხოების შესაძლო სისუსტე"
+OBSWebSocket.Settings.Save.UserPasswordWarningTitle="ყურადღება: სავარაუდო საფრთხე"
 OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket სერვერის პაროლს ტექსტის სახით. დაჟინებით გირჩევთ, გამოიყენოთ obs-websocket-ით შედგენილი პაროლი."
 OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="ნამდვილად გსურთ საკუთარი პაროლის გამოყენება?"
 OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="შეცდომა: არასწორი გამართვა"

data/locale/kmr-TR.ini

@@ -1,5 +1,5 @@
 OBSWebSocket.Plugin.Description="Rêveberina ji dûr ve ya OBS Studio bi riya WebSocket"
-OBSWebSocket.Settings.DialogTitle="Sazkariyên obs-websocket"
+OBSWebSocket.Settings.DialogTitle="Sazkariyên rajekar a WebSocket"
 OBSWebSocket.Settings.PluginSettingsTitle="Sazkariyên pêvekê"
 OBSWebSocket.Settings.ServerEnable="Rajekarê WebSocket çalak bike"
 OBSWebSocket.Settings.AlertsEnable="Hişyariyên darika pergalê çalak bike"

data/locale/ko-KR.ini

@@ -1,5 +1,5 @@
 OBSWebSocket.Plugin.Description="WebSocket으로 OBS Studio를 원격 제어"
-OBSWebSocket.Settings.DialogTitle="obs-websocket 설정"
+OBSWebSocket.Settings.DialogTitle="WebSocket 서버 설정"
 OBSWebSocket.Settings.PluginSettingsTitle="플러그인 설정"
 OBSWebSocket.Settings.ServerEnable="WebSocket 서버 사용"
 OBSWebSocket.Settings.AlertsEnable="시스템 트레이 알림 사용"

data/locale/ms-MY.ini

@@ -1,5 +1,4 @@
 OBSWebSocket.Plugin.Description="Kawalan-jauh OBS Studio melalui WebSocket"
-OBSWebSocket.Settings.DialogTitle="Tetapan obs-websocket"
 OBSWebSocket.Settings.PluginSettingsTitle="Tetapan Pemalam"
 OBSWebSocket.Settings.ServerEnable="Benarkan pelayan WebSocket"
 OBSWebSocket.Settings.AlertsEnable="Benarkan Amaran Talam Sistem"

data/locale/nb-NO.ini

@@ -0,0 +1,2 @@
+OBSWebSocket.Settings.Password="Server Passord"
+OBSWebSocket.Settings.GeneratePassword="Generer Passord"

data/locale/nl-NL.ini

@@ -1,5 +1,5 @@
 OBSWebSocket.Plugin.Description="Op afstand bediening van OBS Studio via WebSocket"
-OBSWebSocket.Settings.DialogTitle="obs-websocket Instellingen"
+OBSWebSocket.Settings.DialogTitle="WebSocket Server Instellingen"
 OBSWebSocket.Settings.PluginSettingsTitle="Plugin instellingen"
 OBSWebSocket.Settings.ServerEnable="WebSocket server inschakelen"
 OBSWebSocket.Settings.AlertsEnable="Systeemtray meldingen inschakelen"
@@ -30,6 +30,7 @@ OBSWebSocket.ConnectInfo.DialogTitle="WebSocket verbindingsinformatie"
 OBSWebSocket.ConnectInfo.CopyText="Kopiëren"
 OBSWebSocket.ConnectInfo.ServerIp="Server IP (Beste inschatting)"
 OBSWebSocket.ConnectInfo.ServerPort="Serverpoort"
+OBSWebSocket.ConnectInfo.ServerPassword="Serverwachtwoord"
 OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[Authenticatie Uitgeschakeld]"
 OBSWebSocket.ConnectInfo.QrTitle="QR koppelen"
 OBSWebSocket.TrayNotification.Identified.Title="Nieuwe WebSocket verbinding"

data/locale/pl-PL.ini

@@ -1,5 +1,5 @@
 OBSWebSocket.Plugin.Description="Zdalna kontrola OBS Studio przez WebSocket"
-OBSWebSocket.Settings.DialogTitle="Ustawienia obs-websocket"
+OBSWebSocket.Settings.DialogTitle="Ustawienia serwera WebSocket"
 OBSWebSocket.Settings.PluginSettingsTitle="Ustawienia wtyczki"
 OBSWebSocket.Settings.ServerEnable="Włącz serwer WebSocket"
 OBSWebSocket.Settings.AlertsEnable="Włącz powiadomienia w zasobniku systemowym"

data/locale/pt-BR.ini

@@ -1,5 +1,5 @@
 OBSWebSocket.Plugin.Description="Controle remoto do OBS Studio através de WebSocket"
-OBSWebSocket.Settings.DialogTitle="Configurações OBS-WebSocket"
+OBSWebSocket.Settings.DialogTitle="Configurações do servidor WebSocket"
 OBSWebSocket.Settings.PluginSettingsTitle="Configurações de Plugin"
 OBSWebSocket.Settings.ServerEnable="Ativar servidor WebSocket"
 OBSWebSocket.Settings.AlertsEnable="Ativar Alertas da Bandeja do Sistema"
@@ -22,7 +22,7 @@ OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Você deve usar uma senh
 OBSWebSocket.SessionTable.Title="Sessões WebSocket Conectadas"
 OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Endereço Remoto"
 OBSWebSocket.SessionTable.SessionDurationColumnTitle="Duração de Sessão"
-OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Mengsagens de Entrada/Saída"
+OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Mensagens"
 OBSWebSocket.SessionTable.IdentifiedTitle="Identificada"
 OBSWebSocket.SessionTable.KickButtonColumnTitle="Expulsar?"
 OBSWebSocket.SessionTable.KickButtonText="Expulsar"

data/locale/pt-PT.ini

@@ -1,5 +1,5 @@
 OBSWebSocket.Plugin.Description="Controlo remoto do OBS Studio através de WebSocket"
-OBSWebSocket.Settings.DialogTitle="Configurações obs-websocket"
+OBSWebSocket.Settings.DialogTitle="Definições do servidor WebSocket"
 OBSWebSocket.Settings.PluginSettingsTitle="Configurações do plugin"
 OBSWebSocket.Settings.ServerEnable="Ativar servidor WebSocket"
 OBSWebSocket.Settings.AlertsEnable="Ativar alertas da bandeja do sistema"

data/locale/ro-RO.ini

@@ -1,10 +1,10 @@
 OBSWebSocket.Plugin.Description="Control de la distanță pentru OBS Studio prin WebSocket"
-OBSWebSocket.Settings.DialogTitle="Setări obs-websocket"
-OBSWebSocket.Settings.PluginSettingsTitle="Setări ale plugin-ului"
+OBSWebSocket.Settings.DialogTitle="Setări ale server-ului WebSocket"
+OBSWebSocket.Settings.PluginSettingsTitle="Setări pentru plugin"
 OBSWebSocket.Settings.ServerEnable="Activează serverul WebSocket"
-OBSWebSocket.Settings.AlertsEnable="Activați alertele din bara de sistem"
+OBSWebSocket.Settings.AlertsEnable="Activează alertele din bara de sistem"
 OBSWebSocket.Settings.DebugEnable="Activează jurnalizarea de depanare"
-OBSWebSocket.Settings.DebugEnableHoverText="Activează jurnalizarea de depanare pentru instanța curentă de OBS. Nu persistă la încărcare.\nUtilizați --websocket_debug pentru a activa la încărcare."
+OBSWebSocket.Settings.DebugEnableHoverText="Activează jurnalizarea de depanare pentru instanța actuală de OBS. Nu persistă la încărcare.\nFolosește --websocket_debug pentru a activa la încărcare."
 OBSWebSocket.Settings.ServerSettingsTitle="Setări server"
 OBSWebSocket.Settings.AuthRequired="Activează autentificarea"
 OBSWebSocket.Settings.Password="Parola serverului"
@@ -12,11 +12,11 @@ OBSWebSocket.Settings.GeneratePassword="Generează parola"
 OBSWebSocket.Settings.ServerPort="Portul serverului"
 OBSWebSocket.Settings.ShowConnectInfo="Afișează informațiile de conectare"
 OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Avertisment: În prezent în direct"
-OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Se pare că o ieșire (flux, înregistrare etc.) este activă în prezent."
-OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Ești sigur că vrei să-ți arăți informațiile de conectare?"
+OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Se pare că un output (transmisiune, înregistrare etc.) este activ în prezent."
+OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Sigur vrei să afișezi informațiile de conectare?"
 OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Avertisment: Potențială problemă de securitate"
 OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket stochează parola serverului ca text simplu. Este foarte recomandat să folosiți o parolă generată de obs-websocket."
-OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Ești sigur că vrei să-ți folosești propria parolă?"
+OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Sigur vrei să-ți folosești propria parolă?"
 OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Eroare: Configurație invalidă"
 OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Trebuie să folosești o parolă care să aibă 6 sau mai multe caractere."
 OBSWebSocket.SessionTable.Title="Sesiuni WebSocket conectate"

data/locale/ru-RU.ini

@@ -1,5 +1,5 @@
 OBSWebSocket.Plugin.Description="Удалённое управление OBS Studio по WebSocket"
-OBSWebSocket.Settings.DialogTitle="Настройки obs-websocket"
+OBSWebSocket.Settings.DialogTitle="Настройки сервера WebSocket"
 OBSWebSocket.Settings.PluginSettingsTitle="Настройки плагина"
 OBSWebSocket.Settings.ServerEnable="Включить сервер WebSocket"
 OBSWebSocket.Settings.AlertsEnable="Включить оповещения в трее"

data/locale/sk-SK.ini

@@ -1,5 +1,5 @@
 OBSWebSocket.Plugin.Description="Vzdialené ovládanie OBS Štúdia cez WebSocket"
-OBSWebSocket.Settings.DialogTitle="Nastavenia obs-websocket"
+OBSWebSocket.Settings.DialogTitle="Serverové nastavenia WebSocket"
 OBSWebSocket.Settings.PluginSettingsTitle="Nastavenia pluginu"
 OBSWebSocket.Settings.ServerEnable="Zapnúť WebSocket server"
 OBSWebSocket.Settings.AlertsEnable="Zapnúť notifikácie zo systémovej lišty"

data/locale/sl-SI.ini

@@ -1,5 +1,5 @@
 OBSWebSocket.Plugin.Description="Oddaljeni nadzor OBS Studia prek WebSocketa"
-OBSWebSocket.Settings.DialogTitle="Nastavitve obs-websocket"
+OBSWebSocket.Settings.DialogTitle="Nastavitve strežnika WebSocket"
 OBSWebSocket.Settings.PluginSettingsTitle="Nastavitve vtičnika"
 OBSWebSocket.Settings.ServerEnable="Omogoči strežnik WebSocket"
 OBSWebSocket.Settings.AlertsEnable="Omogoči opozorila v sistemskem pladnju"

data/locale/sv-SE.ini

@@ -1,5 +1,5 @@
 OBSWebSocket.Plugin.Description="Fjärrkontroll av OBS Studio via WebSocket"
-OBSWebSocket.Settings.DialogTitle="Inställningar för obs-websocket"
+OBSWebSocket.Settings.DialogTitle="WebSocket-serverinställningar"
 OBSWebSocket.Settings.PluginSettingsTitle="Insticksmodulsinställningar"
 OBSWebSocket.Settings.ServerEnable="Aktivera WebSocket-server"
 OBSWebSocket.Settings.AlertsEnable="Aktivera systemfältsmeddelanden"

data/locale/tr-TR.ini

@@ -1,5 +1,5 @@
 OBSWebSocket.Plugin.Description="WebSocket aracılığıyla uzaktan OBS Studio"
-OBSWebSocket.Settings.DialogTitle="obs-websocket Ayarları"
+OBSWebSocket.Settings.DialogTitle="WebSocket Suncusu Ayarları"
 OBSWebSocket.Settings.PluginSettingsTitle="Eklenti Ayarları"
 OBSWebSocket.Settings.ServerEnable="WebSocket sunucuyu etkinleştir"
 OBSWebSocket.Settings.AlertsEnable="Sistem Tepsi Uyarılarını Etkinleştir"

data/locale/uk-UA.ini

@@ -1,5 +1,5 @@
 OBSWebSocket.Plugin.Description="Віддалене керування OBS Studio через WebSocket"
-OBSWebSocket.Settings.DialogTitle="Налаштування obs-websocket"
+OBSWebSocket.Settings.DialogTitle="Налаштування WebSocket сервера"
 OBSWebSocket.Settings.PluginSettingsTitle="Налаштування плагіна"
 OBSWebSocket.Settings.ServerEnable="Увімкнути сервер WebSocket"
 OBSWebSocket.Settings.AlertsEnable="Увімкнути сповіщення у системному лотку"

data/locale/vi-VN.ini

@@ -0,0 +1,39 @@
+OBSWebSocket.Plugin.Description="Điều khiển từ xa OBS Studio thông qua WebSocket"
+OBSWebSocket.Settings.DialogTitle="Cài đặt máy chủ WebSocket"
+OBSWebSocket.Settings.PluginSettingsTitle="Thiết đặt trình cắm"
+OBSWebSocket.Settings.ServerEnable="Bật máy chủ WebSocket"
+OBSWebSocket.Settings.AlertsEnable="Bật cảnh báo khay hệ thống"
+OBSWebSocket.Settings.DebugEnable="Bật ghi nhật ký gỡ lỗi"
+OBSWebSocket.Settings.DebugEnableHoverText="Cho phép ghi nhật ký gỡ lỗi cho phiên bản OBS hiện tại. Không tồn tại khi tải.\nUde --websocket gỡ lỗi để bật khi tải."
+OBSWebSocket.Settings.ServerSettingsTitle="Thiết đặt máy chủ"
+OBSWebSocket.Settings.AuthRequired="Bật xác thực"
+OBSWebSocket.Settings.Password="Mật khẩu máy chủ"
+OBSWebSocket.Settings.GeneratePassword="Tạo mật khẩu"
+OBSWebSocket.Settings.ServerPort="Cổng máy chủ"
+OBSWebSocket.Settings.ShowConnectInfo="Hiện thông tin kết nối"
+OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Cảnh báo: Hiện đang chạy"
+OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Có vẻ như một đầu ra (luồng, bản ghi, v.v.) hiện đang hoạt động."
+OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Bạn có chắc chắn muốn hiển thị thông tin kết nối của mình không?"
+OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Cảnh báo: Vấn đề bảo mật tiềm ẩn"
+OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket lưu trữ mật khẩu máy chủ dưới dạng văn bản thuần túy. Bạn nên sử dụng mật khẩu được tạo bởi obs-websocket."
+OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Bạn có chắc bạn muốn sử dụng mật khẩu của mình?"
+OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Lỗi: Thiết lập không hợp lệ"
+OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Bạn phải sử dụng mật khẩu có 6 ký tự trở lên."
+OBSWebSocket.SessionTable.Title="Các phiên WebSocket được kết nối"
+OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Địa chỉ từ xa"
+OBSWebSocket.SessionTable.SessionDurationColumnTitle="Thời lượng phiên"
+OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Tin nhắn vào/ra"
+OBSWebSocket.SessionTable.IdentifiedTitle="Định dạng"
+OBSWebSocket.ConnectInfo.DialogTitle="Thông tin kết nối WebSocket"
+OBSWebSocket.ConnectInfo.ServerIp="IP Máy chủ (Gợi ý tốt nhất)"
+OBSWebSocket.ConnectInfo.ServerPort="Cổng máy chủ"
+OBSWebSocket.ConnectInfo.ServerPassword="Mật khẩu máy chủ"
+OBSWebSocket.ConnectInfo.QrTitle="Kết nối bằng mã QR"
+OBSWebSocket.TrayNotification.Identified.Title="Tạo cổng kết nối WebSocket mới"
+OBSWebSocket.TrayNotification.Identified.Body="Máy khách %1 được xác định."
+OBSWebSocket.TrayNotification.AuthenticationFailed.Title="Lỗi xác thực WebSocket"
+OBSWebSocket.TrayNotification.AuthenticationFailed.Body="Máy khách %1 không xác thực được."
+OBSWebSocket.TrayNotification.Disconnected.Title="Máy khách WebSocket bị ngắt kết nối"
+OBSWebSocket.TrayNotification.Disconnected.Body="Máy khách %1 bị ngắt kết nối."
+OBSWebSocket.Server.StartFailed.Title="Lỗi máy chủ WebSocket"
+OBSWebSocket.Server.StartFailed.Message="Máy chủ WebSocket không khởi động được. Cổng TCP %1 có thể đã được ứng dụng khác sử dụng ở nơi khác trên hệ thống này. Hãy thử đặt một cổng TCP khác trong cài đặt máy chủ WebSocket hoặc dừng bất kỳ ứng dụng nào có thể đang sử dụng cổng này.\n Thông báo lỗi: %2"

data/locale/zh-CN.ini

@@ -1,10 +1,10 @@
 OBSWebSocket.Plugin.Description="通过 WebSocket 远程控制 OBS Studio"
-OBSWebSocket.Settings.DialogTitle="obs-websocket 设置"
+OBSWebSocket.Settings.DialogTitle="WebSocket 服务器设置"
 OBSWebSocket.Settings.PluginSettingsTitle="插件设置"
 OBSWebSocket.Settings.ServerEnable="开启 WebSocket 服务器"
 OBSWebSocket.Settings.AlertsEnable="开启系统托盘提醒"
 OBSWebSocket.Settings.DebugEnable="开启调试日志"
-OBSWebSocket.Settings.DebugEnableHoverText="启用当前 OBS 实例的调试日志。下次启动时需重新设置。\n使用 --websocket_debug 在启动 OBS 时启用日志。"
+OBSWebSocket.Settings.DebugEnableHoverText="开启当前 OBS 实例的调试日志。下次启动时需重新设置。\n使用 --websocket_debug 在启动 OBS 时开启日志。"
 OBSWebSocket.Settings.ServerSettingsTitle="服务器设置"
 OBSWebSocket.Settings.AuthRequired="开启鉴权"
 OBSWebSocket.Settings.Password="服务器密码"

data/locale/zh-TW.ini

@@ -1,5 +1,5 @@
 OBSWebSocket.Plugin.Description="透過 WebSocket 遠端控制 OBS Studio"
-OBSWebSocket.Settings.DialogTitle="obs-websocket 設定"
+OBSWebSocket.Settings.DialogTitle="WebSocket 伺服器設定"
 OBSWebSocket.Settings.PluginSettingsTitle="外掛程式設定"
 OBSWebSocket.Settings.ServerEnable="啟用 WebSocket 伺服器"
 OBSWebSocket.Settings.AlertsEnable="啟用系統匣通知"

docs/docs/generate_md.py

@@ -9,7 +9,9 @@ enumTypeOrder = [
     'WebSocketCloseCode',
     'RequestBatchExecutionType',
     'RequestStatus',
-    'EventSubscription'
+    'EventSubscription',
+    'ObsMediaInputAction',
+    'ObsOutputState'
 ]
 
 categoryOrder = [

docs/docs/partials/introduction.md

@@ -1,5 +1,5 @@
 
-# obs-websocket 5.0.1 Protocol
+# obs-websocket 5.1.0 Protocol
 
 ## Main Table of Contents
 
@@ -19,6 +19,9 @@
   - [RequestResponse (OpCode 7)](#requestresponse-opcode-7)
   - [RequestBatch (OpCode 8)](#requestbatch-opcode-8)
   - [RequestBatchResponse (OpCode 9)](#requestbatchresponse-opcode-9)
+- [Enumerations](#enums)
+- [Events](#events)
+- [Requests](#requests)
 
 ## General Intro
 
@@ -58,7 +61,7 @@ These steps should be followed precisely. Failure to connect to the server as in
 
 - The server receives and processes the `Identify` sent by the client.
   - If authentication is required and the `Identify` message data does not contain an `authentication` string, or the string is not correct, the connection is closed with `WebSocketCloseCode::AuthenticationFailed`
-  - If the client has requested an `rpcVersion` which the server cannot use, the connection is closed with `WebSocketCloseCode::UnsupportedRpcVersion`. This system allows both the server and client to have seamless backwards compatability.
+  - If the client has requested an `rpcVersion` which the server cannot use, the connection is closed with `WebSocketCloseCode::UnsupportedRpcVersion`. This system allows both the server and client to have seamless backwards compatibility.
   - If any other parameters are malformed (invalid type, etc), the connection is closed with an appropriate close code.
 
 - Once identification is processed on the server, the server responds to the client with an [OpCode 2 `Identified`](#identified-opcode-2).
@@ -143,7 +146,7 @@ Authentication is required
 {
   "op": 0,
   "d": {
-    "obsWebSocketVersion": "5.0.1",
+    "obsWebSocketVersion": "5.1.0",
     "rpcVersion": 1,
     "authentication": {
       "challenge": "+IxH4CnCiqpX1rM9scsNynZzbOe4KhDeYcTNS3PDaeY=",
@@ -159,7 +162,7 @@ Authentication is not required
 {
   "op": 0,
   "d": {
-    "obsWebSocketVersion": "5.0.1",
+    "obsWebSocketVersion": "5.1.0",
     "rpcVersion": 1
   }
 }

docs/generated/protocol.json

@@ -237,6 +237,14 @@
           "initialVersion": "5.0.0",
           "enumValue": 206
         },
+        {
+          "description": "The server is not ready to handle the request.\n\nNote: This usually occurs during OBS scene collection change or exit. Requests may be tried again after a delay if this code is given.",
+          "enumIdentifier": "NotReady",
+          "rpcVersion": "1",
+          "deprecated": false,
+          "initialVersion": "5.3.0",
+          "enumValue": 207
+        },
         {
           "description": "A required request field is missing.",
           "enumIdentifier": "MissingRequestField",
@@ -447,6 +455,83 @@
         }
       ]
     },
+    {
+      "enumType": "ObsOutputState",
+      "enumIdentifiers": [
+        {
+          "description": "Unknown state.",
+          "enumIdentifier": "OBS_WEBSOCKET_OUTPUT_UNKNOWN",
+          "rpcVersion": 1,
+          "deprecated": true,
+          "initialVersion": "5.0.0",
+          "enumValue": "OBS_WEBSOCKET_OUTPUT_UNKNOWN"
+        },
+        {
+          "description": "The output is starting.",
+          "enumIdentifier": "OBS_WEBSOCKET_OUTPUT_STARTING",
+          "rpcVersion": 1,
+          "deprecated": true,
+          "initialVersion": "5.0.0",
+          "enumValue": "OBS_WEBSOCKET_OUTPUT_STARTING"
+        },
+        {
+          "description": "The input has started.",
+          "enumIdentifier": "OBS_WEBSOCKET_OUTPUT_STARTED",
+          "rpcVersion": 1,
+          "deprecated": true,
+          "initialVersion": "5.0.0",
+          "enumValue": "OBS_WEBSOCKET_OUTPUT_STARTED"
+        },
+        {
+          "description": "The output is stopping.",
+          "enumIdentifier": "OBS_WEBSOCKET_OUTPUT_STOPPING",
+          "rpcVersion": 1,
+          "deprecated": true,
+          "initialVersion": "5.0.0",
+          "enumValue": "OBS_WEBSOCKET_OUTPUT_STOPPING"
+        },
+        {
+          "description": "The output has stopped.",
+          "enumIdentifier": "OBS_WEBSOCKET_OUTPUT_STOPPED",
+          "rpcVersion": 1,
+          "deprecated": true,
+          "initialVersion": "5.0.0",
+          "enumValue": "OBS_WEBSOCKET_OUTPUT_STOPPED"
+        },
+        {
+          "description": "The output has disconnected and is reconnecting.",
+          "enumIdentifier": "OBS_WEBSOCKET_OUTPUT_RECONNECTING",
+          "rpcVersion": 1,
+          "deprecated": true,
+          "initialVersion": "5.0.0",
+          "enumValue": "OBS_WEBSOCKET_OUTPUT_RECONNECTING"
+        },
+        {
+          "description": "The output has reconnected successfully.",
+          "enumIdentifier": "OBS_WEBSOCKET_OUTPUT_RECONNECTED",
+          "rpcVersion": 1,
+          "deprecated": true,
+          "initialVersion": "5.1.0",
+          "enumValue": "OBS_WEBSOCKET_OUTPUT_RECONNECTED"
+        },
+        {
+          "description": "The output is now paused.",
+          "enumIdentifier": "OBS_WEBSOCKET_OUTPUT_PAUSED",
+          "rpcVersion": 1,
+          "deprecated": true,
+          "initialVersion": "5.1.0",
+          "enumValue": "OBS_WEBSOCKET_OUTPUT_PAUSED"
+        },
+        {
+          "description": "The output has been resumed (unpaused).",
+          "enumIdentifier": "OBS_WEBSOCKET_OUTPUT_RESUMED",
+          "rpcVersion": 1,
+          "deprecated": true,
+          "initialVersion": "5.0.0",
+          "enumValue": "OBS_WEBSOCKET_OUTPUT_RESUMED"
+        }
+      ]
+    },
     {
       "enumType": "ObsMediaInputAction",
       "enumIdentifiers": [
@@ -1776,16 +1861,16 @@
           "valueType": "Number",
           "valueDescription": "Number of milliseconds to sleep for (if `SERIAL_REALTIME` mode)",
           "valueRestrictions": ">= 0, <= 50000",
-          "valueOptional": false,
-          "valueOptionalBehavior": null
+          "valueOptional": true,
+          "valueOptionalBehavior": "Unknown"
         },
         {
           "valueName": "sleepFrames",
           "valueType": "Number",
           "valueDescription": "Number of frames to sleep for (if `SERIAL_FRAME` mode)",
           "valueRestrictions": ">= 0, <= 10000",
-          "valueOptional": false,
-          "valueOptionalBehavior": null
+          "valueOptional": true,
+          "valueOptionalBehavior": "Unknown"
         }
       ],
       "responseFields": []
@@ -2481,7 +2566,7 @@
       ]
     },
     {
-      "description": "Presses a button in the properties of an input.\n\nNote: Use this in cases where there is a button in the properties of an input that cannot be accessed in any other way. For example, browser sources, where there is a refresh button.",
+      "description": "Presses a button in the properties of an input.\n\nSome known `propertyName` values are:\n\n- `refreshnocache` - Browser source reload button\n\nNote: Use this in cases where there is a button in the properties of an input that cannot be accessed in any other way. For example, browser sources, where there is a refresh button.",
       "requestType": "PressInputPropertiesButton",
       "complexity": 4,
       "rpcVersion": "1",
@@ -2777,7 +2862,13 @@
       "initialVersion": "5.0.0",
       "category": "outputs",
       "requestFields": [],
-      "responseFields": []
+      "responseFields": [
+        {
+          "valueName": "outputs",
+          "valueType": "Array<Object>",
+          "valueDescription": "Array of outputs"
+        }
+      ]
     },
     {
       "description": "Gets the status of an output.",
@@ -2976,7 +3067,7 @@
           "valueDescription": "Whether the output is active"
         },
         {
-          "valueName": "ouputPaused",
+          "valueName": "outputPaused",
           "valueType": "Boolean",
           "valueDescription": "Whether the output is paused"
         },
@@ -3096,7 +3187,7 @@
       ]
     },
     {
-      "description": "Basically GetSceneItemList, but for groups.\n\nUsing groups at all in OBS is discouraged, as they are very broken under the hood.\n\nGroups only",
+      "description": "Basically GetSceneItemList, but for groups.\n\nUsing groups at all in OBS is discouraged, as they are very broken under the hood. Please use nested scenes instead.\n\nGroups only",
       "requestType": "GetGroupSceneItemList",
       "complexity": 3,
       "rpcVersion": "1",
@@ -4955,7 +5046,7 @@
         {
           "valueName": "inputVolumeMul",
           "valueType": "Number",
-          "valueDescription": "New volume level in multimap"
+          "valueDescription": "New volume level multiplier"
         },
         {
           "valueName": "inputVolumeDb",
@@ -5638,6 +5729,23 @@
         }
       ]
     },
+    {
+      "description": "A screenshot has been saved.\n\nNote: Triggered for the screenshot feature available in `Settings -> Hotkeys -> Screenshot Output` ONLY.\nApplications using `Get/SaveSourceScreenshot` should implement a `CustomEvent` if this kind of inter-client\ncommunication is desired.",
+      "eventType": "ScreenshotSaved",
+      "eventSubscription": "Ui",
+      "complexity": 2,
+      "rpcVersion": "1",
+      "deprecated": false,
+      "initialVersion": "5.1.0",
+      "category": "ui",
+      "dataFields": [
+        {
+          "valueName": "savedScreenshotPath",
+          "valueType": "String",
+          "valueDescription": "Path of the saved image file"
+        }
+      ]
+    },
     {
       "description": "An event has been emitted from a vendor.\n\nA vendor is a unique name registered by a third-party plugin or script, which allows for custom requests and events to be added to obs-websocket.\nIf a plugin or script implements vendor requests or events, documentation is expected to be provided with them.",
       "eventType": "VendorEvent",
@@ -5664,6 +5772,23 @@
           "valueDescription": "Vendor-provided event data. {} if event does not provide any data"
         }
       ]
+    },
+    {
+      "description": "Custom event emitted by `BroadcastCustomEvent`.",
+      "eventType": "CustomEvent",
+      "eventSubscription": "General",
+      "complexity": 1,
+      "rpcVersion": "1",
+      "deprecated": false,
+      "initialVersion": "5.0.0",
+      "category": "general",
+      "dataFields": [
+        {
+          "valueName": "eventData",
+          "valueType": "Object",
+          "valueDescription": "Custom event data"
+        }
+      ]
     }
   ]
 }

docs/generated/protocol.md

@@ -1,7 +1,7 @@
 <!-- This file was automatically generated. Do not edit directly! -->
 <!-- markdownlint-disable no-bare-urls -->
 
-# obs-websocket 5.0.1 Protocol
+# obs-websocket 5.1.0 Protocol
 
 ## Main Table of Contents
 
@@ -21,6 +21,9 @@
   - [RequestResponse (OpCode 7)](#requestresponse-opcode-7)
   - [RequestBatch (OpCode 8)](#requestbatch-opcode-8)
   - [RequestBatchResponse (OpCode 9)](#requestbatchresponse-opcode-9)
+- [Enumerations](#enums)
+- [Events](#events)
+- [Requests](#requests)
 
 ## General Intro
 
@@ -60,7 +63,7 @@ These steps should be followed precisely. Failure to connect to the server as in
 
 - The server receives and processes the `Identify` sent by the client.
   - If authentication is required and the `Identify` message data does not contain an `authentication` string, or the string is not correct, the connection is closed with `WebSocketCloseCode::AuthenticationFailed`
-  - If the client has requested an `rpcVersion` which the server cannot use, the connection is closed with `WebSocketCloseCode::UnsupportedRpcVersion`. This system allows both the server and client to have seamless backwards compatability.
+  - If the client has requested an `rpcVersion` which the server cannot use, the connection is closed with `WebSocketCloseCode::UnsupportedRpcVersion`. This system allows both the server and client to have seamless backwards compatibility.
   - If any other parameters are malformed (invalid type, etc), the connection is closed with an appropriate close code.
 
 - Once identification is processed on the server, the server responds to the client with an [OpCode 2 `Identified`](#identified-opcode-2).
@@ -145,7 +148,7 @@ Authentication is required
 {
   "op": 0,
   "d": {
-    "obsWebSocketVersion": "5.0.1",
+    "obsWebSocketVersion": "5.1.0",
     "rpcVersion": 1,
     "authentication": {
       "challenge": "+IxH4CnCiqpX1rM9scsNynZzbOe4KhDeYcTNS3PDaeY=",
@@ -161,7 +164,7 @@ Authentication is not required
 {
   "op": 0,
   "d": {
-    "obsWebSocketVersion": "5.0.1",
+    "obsWebSocketVersion": "5.1.0",
     "rpcVersion": 1
   }
 }
@@ -468,6 +471,7 @@ These are enumeration declarations, which are referenced throughout obs-websocke
   - [RequestStatus::UnknownRequestType](#requeststatusunknownrequesttype)
   - [RequestStatus::GenericError](#requeststatusgenericerror)
   - [RequestStatus::UnsupportedRequestBatchExecutionType](#requeststatusunsupportedrequestbatchexecutiontype)
+  - [RequestStatus::NotReady](#requeststatusnotready)
   - [RequestStatus::MissingRequestField](#requeststatusmissingrequestfield)
   - [RequestStatus::MissingRequestData](#requeststatusmissingrequestdata)
   - [RequestStatus::InvalidRequestField](#requeststatusinvalidrequestfield)
@@ -512,6 +516,24 @@ These are enumeration declarations, which are referenced throughout obs-websocke
   - [EventSubscription::InputActiveStateChanged](#eventsubscriptioninputactivestatechanged)
   - [EventSubscription::InputShowStateChanged](#eventsubscriptioninputshowstatechanged)
   - [EventSubscription::SceneItemTransformChanged](#eventsubscriptionsceneitemtransformchanged)
+- [ObsMediaInputAction](#obsmediainputaction)
+  - [ObsMediaInputAction::OBS_WEBSOCKET_MEDIA_INPUT_ACTION_NONE](#obsmediainputactionobs_websocket_media_input_action_none)
+  - [ObsMediaInputAction::OBS_WEBSOCKET_MEDIA_INPUT_ACTION_PLAY](#obsmediainputactionobs_websocket_media_input_action_play)
+  - [ObsMediaInputAction::OBS_WEBSOCKET_MEDIA_INPUT_ACTION_PAUSE](#obsmediainputactionobs_websocket_media_input_action_pause)
+  - [ObsMediaInputAction::OBS_WEBSOCKET_MEDIA_INPUT_ACTION_STOP](#obsmediainputactionobs_websocket_media_input_action_stop)
+  - [ObsMediaInputAction::OBS_WEBSOCKET_MEDIA_INPUT_ACTION_RESTART](#obsmediainputactionobs_websocket_media_input_action_restart)
+  - [ObsMediaInputAction::OBS_WEBSOCKET_MEDIA_INPUT_ACTION_NEXT](#obsmediainputactionobs_websocket_media_input_action_next)
+  - [ObsMediaInputAction::OBS_WEBSOCKET_MEDIA_INPUT_ACTION_PREVIOUS](#obsmediainputactionobs_websocket_media_input_action_previous)
+- [ObsOutputState](#obsoutputstate)
+  - [ObsOutputState::OBS_WEBSOCKET_OUTPUT_UNKNOWN](#obsoutputstateobs_websocket_output_unknown)
+  - [ObsOutputState::OBS_WEBSOCKET_OUTPUT_STARTING](#obsoutputstateobs_websocket_output_starting)
+  - [ObsOutputState::OBS_WEBSOCKET_OUTPUT_STARTED](#obsoutputstateobs_websocket_output_started)
+  - [ObsOutputState::OBS_WEBSOCKET_OUTPUT_STOPPING](#obsoutputstateobs_websocket_output_stopping)
+  - [ObsOutputState::OBS_WEBSOCKET_OUTPUT_STOPPED](#obsoutputstateobs_websocket_output_stopped)
+  - [ObsOutputState::OBS_WEBSOCKET_OUTPUT_RECONNECTING](#obsoutputstateobs_websocket_output_reconnecting)
+  - [ObsOutputState::OBS_WEBSOCKET_OUTPUT_RECONNECTED](#obsoutputstateobs_websocket_output_reconnected)
+  - [ObsOutputState::OBS_WEBSOCKET_OUTPUT_PAUSED](#obsoutputstateobs_websocket_output_paused)
+  - [ObsOutputState::OBS_WEBSOCKET_OUTPUT_RESUMED](#obsoutputstateobs_websocket_output_resumed)
 
 ## WebSocketOpCode
 
@@ -858,6 +880,18 @@ The request batch execution type is not supported.
 
 ---
 
+### RequestStatus::NotReady
+
+The server is not ready to handle the request.
+
+Note: This usually occurs during OBS scene collection change or exit. Requests may be tried again after a delay if this code is given.
+
+- Identifier Value: `207`
+- Latest Supported RPC Version: `1`
+- Added in v5.3.0
+
+---
+
 ### RequestStatus::MissingRequestField
 
 A required request field is missing.
@@ -1294,6 +1328,182 @@ Subscription value to receive the `SceneItemTransformChanged` high-volume event.
 - Latest Supported RPC Version: `1`
 - Added in v5.0.0
 
+## ObsMediaInputAction
+
+### ObsMediaInputAction::OBS_WEBSOCKET_MEDIA_INPUT_ACTION_NONE
+
+No action.
+
+- Identifier Value: `OBS_WEBSOCKET_MEDIA_INPUT_ACTION_NONE`
+- Latest Supported RPC Version: `1`
+- **⚠️ Deprecated. ⚠️**
+- Added in v5.0.0
+
+---
+
+### ObsMediaInputAction::OBS_WEBSOCKET_MEDIA_INPUT_ACTION_PLAY
+
+Play the media input.
+
+- Identifier Value: `OBS_WEBSOCKET_MEDIA_INPUT_ACTION_PLAY`
+- Latest Supported RPC Version: `1`
+- **⚠️ Deprecated. ⚠️**
+- Added in v5.0.0
+
+---
+
+### ObsMediaInputAction::OBS_WEBSOCKET_MEDIA_INPUT_ACTION_PAUSE
+
+Pause the media input.
+
+- Identifier Value: `OBS_WEBSOCKET_MEDIA_INPUT_ACTION_PAUSE`
+- Latest Supported RPC Version: `1`
+- **⚠️ Deprecated. ⚠️**
+- Added in v5.0.0
+
+---
+
+### ObsMediaInputAction::OBS_WEBSOCKET_MEDIA_INPUT_ACTION_STOP
+
+Stop the media input.
+
+- Identifier Value: `OBS_WEBSOCKET_MEDIA_INPUT_ACTION_STOP`
+- Latest Supported RPC Version: `1`
+- **⚠️ Deprecated. ⚠️**
+- Added in v5.0.0
+
+---
+
+### ObsMediaInputAction::OBS_WEBSOCKET_MEDIA_INPUT_ACTION_RESTART
+
+Restart the media input.
+
+- Identifier Value: `OBS_WEBSOCKET_MEDIA_INPUT_ACTION_RESTART`
+- Latest Supported RPC Version: `1`
+- **⚠️ Deprecated. ⚠️**
+- Added in v5.0.0
+
+---
+
+### ObsMediaInputAction::OBS_WEBSOCKET_MEDIA_INPUT_ACTION_NEXT
+
+Go to the next playlist item.
+
+- Identifier Value: `OBS_WEBSOCKET_MEDIA_INPUT_ACTION_NEXT`
+- Latest Supported RPC Version: `1`
+- **⚠️ Deprecated. ⚠️**
+- Added in v5.0.0
+
+---
+
+### ObsMediaInputAction::OBS_WEBSOCKET_MEDIA_INPUT_ACTION_PREVIOUS
+
+Go to the previous playlist item.
+
+- Identifier Value: `OBS_WEBSOCKET_MEDIA_INPUT_ACTION_PREVIOUS`
+- Latest Supported RPC Version: `1`
+- **⚠️ Deprecated. ⚠️**
+- Added in v5.0.0
+
+## ObsOutputState
+
+### ObsOutputState::OBS_WEBSOCKET_OUTPUT_UNKNOWN
+
+Unknown state.
+
+- Identifier Value: `OBS_WEBSOCKET_OUTPUT_UNKNOWN`
+- Latest Supported RPC Version: `1`
+- **⚠️ Deprecated. ⚠️**
+- Added in v5.0.0
+
+---
+
+### ObsOutputState::OBS_WEBSOCKET_OUTPUT_STARTING
+
+The output is starting.
+
+- Identifier Value: `OBS_WEBSOCKET_OUTPUT_STARTING`
+- Latest Supported RPC Version: `1`
+- **⚠️ Deprecated. ⚠️**
+- Added in v5.0.0
+
+---
+
+### ObsOutputState::OBS_WEBSOCKET_OUTPUT_STARTED
+
+The input has started.
+
+- Identifier Value: `OBS_WEBSOCKET_OUTPUT_STARTED`
+- Latest Supported RPC Version: `1`
+- **⚠️ Deprecated. ⚠️**
+- Added in v5.0.0
+
+---
+
+### ObsOutputState::OBS_WEBSOCKET_OUTPUT_STOPPING
+
+The output is stopping.
+
+- Identifier Value: `OBS_WEBSOCKET_OUTPUT_STOPPING`
+- Latest Supported RPC Version: `1`
+- **⚠️ Deprecated. ⚠️**
+- Added in v5.0.0
+
+---
+
+### ObsOutputState::OBS_WEBSOCKET_OUTPUT_STOPPED
+
+The output has stopped.
+
+- Identifier Value: `OBS_WEBSOCKET_OUTPUT_STOPPED`
+- Latest Supported RPC Version: `1`
+- **⚠️ Deprecated. ⚠️**
+- Added in v5.0.0
+
+---
+
+### ObsOutputState::OBS_WEBSOCKET_OUTPUT_RECONNECTING
+
+The output has disconnected and is reconnecting.
+
+- Identifier Value: `OBS_WEBSOCKET_OUTPUT_RECONNECTING`
+- Latest Supported RPC Version: `1`
+- **⚠️ Deprecated. ⚠️**
+- Added in v5.0.0
+
+---
+
+### ObsOutputState::OBS_WEBSOCKET_OUTPUT_RECONNECTED
+
+The output has reconnected successfully.
+
+- Identifier Value: `OBS_WEBSOCKET_OUTPUT_RECONNECTED`
+- Latest Supported RPC Version: `1`
+- **⚠️ Deprecated. ⚠️**
+- Added in v5.1.0
+
+---
+
+### ObsOutputState::OBS_WEBSOCKET_OUTPUT_PAUSED
+
+The output is now paused.
+
+- Identifier Value: `OBS_WEBSOCKET_OUTPUT_PAUSED`
+- Latest Supported RPC Version: `1`
+- **⚠️ Deprecated. ⚠️**
+- Added in v5.1.0
+
+---
+
+### ObsOutputState::OBS_WEBSOCKET_OUTPUT_RESUMED
+
+The output has been resumed (unpaused).
+
+- Identifier Value: `OBS_WEBSOCKET_OUTPUT_RESUMED`
+- Latest Supported RPC Version: `1`
+- **⚠️ Deprecated. ⚠️**
+- Added in v5.0.0
+
 # Events
 
 ## Events Table of Contents
@@ -1301,6 +1511,7 @@ Subscription value to receive the `SceneItemTransformChanged` high-volume event.
 - [General Events](#general-events)
   - [ExitStarted](#exitstarted)
   - [VendorEvent](#vendorevent)
+  - [CustomEvent](#customevent)
 - [Config Events](#config-events)
   - [CurrentSceneCollectionChanging](#currentscenecollectionchanging)
   - [CurrentSceneCollectionChanged](#currentscenecollectionchanged)
@@ -1360,6 +1571,7 @@ Subscription value to receive the `SceneItemTransformChanged` high-volume event.
   - [MediaInputActionTriggered](#mediainputactiontriggered)
 - [Ui Events](#ui-events)
   - [StudioModeStateChanged](#studiomodestatechanged)
+  - [ScreenshotSaved](#screenshotsaved)
 
 ## General Events
 
@@ -1392,6 +1604,22 @@ If a plugin or script implements vendor requests or events, documentation is exp
 | eventType | String | Vendor-provided event typedef |
 | eventData | Object | Vendor-provided event data. {} if event does not provide any data |
 
+---
+
+### CustomEvent
+
+Custom event emitted by `BroadcastCustomEvent`.
+
+- Complexity Rating: `1/5`
+- Latest Supported RPC Version: `1`
+- Added in v5.0.0
+
+**Data Fields:**
+
+| Name | Type  | Description |
+| ---- | :---: | ----------- |
+| eventData | Object | Custom event data |
+
 ## Config Events
 
 ### CurrentSceneCollectionChanging
@@ -1717,7 +1945,7 @@ An input's volume level has changed.
 | Name | Type  | Description |
 | ---- | :---: | ----------- |
 | inputName | String | Name of the input |
-| inputVolumeMul | Number | New volume level in multimap |
+| inputVolumeMul | Number | New volume level multiplier |
 | inputVolumeDb | Number | New volume level in dB |
 
 ---
@@ -2265,6 +2493,26 @@ Studio mode has been enabled or disabled.
 | ---- | :---: | ----------- |
 | studioModeEnabled | Boolean | True == Enabled, False == Disabled |
 
+---
+
+### ScreenshotSaved
+
+A screenshot has been saved.
+
+Note: Triggered for the screenshot feature available in `Settings -> Hotkeys -> Screenshot Output` ONLY.
+Applications using `Get/SaveSourceScreenshot` should implement a `CustomEvent` if this kind of inter-client
+communication is desired.
+
+- Complexity Rating: `2/5`
+- Latest Supported RPC Version: `1`
+- Added in v5.1.0
+
+**Data Fields:**
+
+| Name | Type  | Description |
+| ---- | :---: | ----------- |
+| savedScreenshotPath | String | Path of the saved image file |
+
 # Requests
 
 ## Requests Table of Contents
@@ -2580,8 +2828,8 @@ Sleeps for a time duration or number of frames. Only available in request batche
 
 | Name | Type  | Description | Value Restrictions | ?Default Behavior |
 | ---- | :---: | ----------- | :----------------: | ----------------- |
-| sleepMillis | Number | Number of milliseconds to sleep for (if `SERIAL_REALTIME` mode) | >= 0, <= 50000 | N/A |
-| sleepFrames | Number | Number of frames to sleep for (if `SERIAL_FRAME` mode) | >= 0, <= 10000 | N/A |
+| ?sleepMillis | Number | Number of milliseconds to sleep for (if `SERIAL_REALTIME` mode) | >= 0, <= 50000 | Unknown |
+| ?sleepFrames | Number | Number of frames to sleep for (if `SERIAL_FRAME` mode) | >= 0, <= 10000 | Unknown |
 
 ## Config Requests
 
@@ -3652,6 +3900,10 @@ Note: Use this in cases where an input provides a dynamic, selectable list of it
 
 Presses a button in the properties of an input.
 
+Some known `propertyName` values are:
+
+- `refreshnocache` - Browser source reload button
+
 Note: Use this in cases where there is a button in the properties of an input that cannot be accessed in any other way. For example, browser sources, where there is a refresh button.
 
 - Complexity Rating: `4/5`
@@ -4029,7 +4281,7 @@ Scenes only
 
 Basically GetSceneItemList, but for groups.
 
-Using groups at all in OBS is discouraged, as they are very broken under the hood.
+Using groups at all in OBS is discouraged, as they are very broken under the hood. Please use nested scenes instead.
 
 Groups only
 
@@ -4521,6 +4773,12 @@ Gets the list of available outputs.
 - Latest Supported RPC Version: `1`
 - Added in v5.0.0
 
+**Response Fields:**
+
+| Name | Type  | Description |
+| ---- | :---: | ----------- |
+| outputs | Array&lt;Object&gt; | Array of outputs |
+
 ---
 
 ### GetOutputStatus
@@ -4733,7 +4991,7 @@ Gets the status of the record output.
 | Name | Type  | Description |
 | ---- | :---: | ----------- |
 | outputActive | Boolean | Whether the output is active |
-| ouputPaused | Boolean | Whether the output is paused |
+| outputPaused | Boolean | Whether the output is paused |
 | outputTimecode | String | Current formatted timecode string for the output |
 | outputDuration | Number | Current duration in milliseconds for the output |
 | outputBytes | Number | Number of bytes sent by the output |

src/eventhandler/EventHandler.cpp

@@ -267,97 +267,10 @@ void EventHandler::OnFrontendEvent(enum obs_frontend_event event, void *private_
 	switch (event) {
 	// General
 	case OBS_FRONTEND_EVENT_FINISHED_LOADING:
-		blog_debug(
-			"[EventHandler::OnFrontendEvent] OBS has finished loading. Connecting final handlers and enabling events...");
-
-		// Connect source signals and enable events only after OBS has fully loaded (to reduce extra logging).
-		eventHandler->_obsLoaded.store(true);
-
-		// In the case that plugins become hotloadable, this will have to go back into `EventHandler::EventHandler()`
-		// Enumerate inputs and connect each one
-		{
-			auto enumInputs = [](void *param, obs_source_t *source) {
-				auto eventHandler = static_cast<EventHandler *>(param);
-				eventHandler->ConnectSourceSignals(source);
-				return true;
-			};
-			obs_enum_sources(enumInputs, private_data);
-		}
-
-		// Enumerate scenes and connect each one
-		{
-			auto enumScenes = [](void *param, obs_source_t *source) {
-				auto eventHandler = static_cast<EventHandler *>(param);
-				eventHandler->ConnectSourceSignals(source);
-				return true;
-			};
-			obs_enum_scenes(enumScenes, private_data);
-		}
-
-		// Enumerate all scene transitions and connect each one
-		{
-			obs_frontend_source_list transitions = {};
-			obs_frontend_get_transitions(&transitions);
-			for (size_t i = 0; i < transitions.sources.num; i++) {
-				obs_source_t *transition = transitions.sources.array[i];
-				eventHandler->ConnectSourceSignals(transition);
-			}
-			obs_frontend_source_list_free(&transitions);
-		}
-
-		blog_debug("[EventHandler::OnFrontendEvent] Finished.");
-
-		if (eventHandler->_obsLoadedCallback)
-			eventHandler->_obsLoadedCallback();
-
+		eventHandler->FrontendFinishedLoadingMultiHandler();
 		break;
-	case OBS_FRONTEND_EVENT_EXIT:
-		eventHandler->HandleExitStarted();
-
-		blog_debug("[EventHandler::OnFrontendEvent] OBS is unloading. Disabling events...");
-		// Disconnect source signals and disable events when OBS starts unloading (to reduce extra logging).
-		eventHandler->_obsLoaded.store(false);
-
-		// In the case that plugins become hotloadable, this will have to go back into `EventHandler::~EventHandler()`
-		// Enumerate inputs and disconnect each one
-		{
-			auto enumInputs = [](void *param, obs_source_t *source) {
-				auto eventHandler = static_cast<EventHandler *>(param);
-				eventHandler->DisconnectSourceSignals(source);
-				return true;
-			};
-			obs_enum_sources(enumInputs, private_data);
-		}
-
-		// Enumerate scenes and disconnect each one
-		{
-			auto enumScenes = [](void *param, obs_source_t *source) {
-				auto eventHandler = static_cast<EventHandler *>(param);
-				eventHandler->DisconnectSourceSignals(source);
-				return true;
-			};
-			obs_enum_scenes(enumScenes, private_data);
-		}
-
-		// Enumerate all scene transitions and disconnect each one
-		{
-			obs_frontend_source_list transitions = {};
-			obs_frontend_get_transitions(&transitions);
-			for (size_t i = 0; i < transitions.sources.num; i++) {
-				obs_source_t *transition = transitions.sources.array[i];
-				eventHandler->DisconnectSourceSignals(transition);
-			}
-			obs_frontend_source_list_free(&transitions);
-		}
-
-		blog_debug("[EventHandler::OnFrontendEvent] Finished.");
-
-		break;
-	case OBS_FRONTEND_EVENT_STUDIO_MODE_ENABLED:
-		eventHandler->HandleStudioModeStateChanged(true);
-		break;
-	case OBS_FRONTEND_EVENT_STUDIO_MODE_DISABLED:
-		eventHandler->HandleStudioModeStateChanged(false);
+	case OBS_FRONTEND_EVENT_SCRIPTING_SHUTDOWN:
+		eventHandler->FrontendExitMultiHandler();
 		break;
 
 	// Config
@@ -427,12 +340,31 @@ void EventHandler::OnFrontendEvent(enum obs_frontend_event event, void *private_
 	// Outputs
 	case OBS_FRONTEND_EVENT_STREAMING_STARTING:
 		eventHandler->HandleStreamStateChanged(OBS_WEBSOCKET_OUTPUT_STARTING);
+		{
+			// Connect signals for stream output reconnects (hacky)
+			OBSOutputAutoRelease streamOutput = obs_frontend_get_streaming_output();
+			if (streamOutput) {
+				signal_handler_t *sh = obs_output_get_signal_handler(streamOutput);
+				signal_handler_connect(sh, "reconnect", StreamOutputReconnectHandler, private_data);
+				signal_handler_connect(sh, "reconnect_success", StreamOutputReconnectSuccessHandler, private_data);
+			}
+		}
 		break;
 	case OBS_FRONTEND_EVENT_STREAMING_STARTED:
 		eventHandler->HandleStreamStateChanged(OBS_WEBSOCKET_OUTPUT_STARTED);
 		break;
 	case OBS_FRONTEND_EVENT_STREAMING_STOPPING:
 		eventHandler->HandleStreamStateChanged(OBS_WEBSOCKET_OUTPUT_STOPPING);
+		{
+			// Disconnect signals for stream output reconnects
+			OBSOutputAutoRelease streamOutput = obs_frontend_get_streaming_output();
+			if (streamOutput) {
+				signal_handler_t *sh = obs_output_get_signal_handler(streamOutput);
+				signal_handler_disconnect(sh, "reconnect", StreamOutputReconnectHandler, private_data);
+				signal_handler_disconnect(sh, "reconnect_success", StreamOutputReconnectSuccessHandler,
+							  private_data);
+			}
+		}
 		break;
 	case OBS_FRONTEND_EVENT_STREAMING_STOPPED:
 		eventHandler->HandleStreamStateChanged(OBS_WEBSOCKET_OUTPUT_STOPPED);
@@ -477,11 +409,112 @@ void EventHandler::OnFrontendEvent(enum obs_frontend_event event, void *private_
 		eventHandler->HandleReplayBufferSaved();
 		break;
 
+	// Ui
+	case OBS_FRONTEND_EVENT_STUDIO_MODE_ENABLED:
+		eventHandler->HandleStudioModeStateChanged(true);
+		break;
+	case OBS_FRONTEND_EVENT_STUDIO_MODE_DISABLED:
+		eventHandler->HandleStudioModeStateChanged(false);
+		break;
+	case OBS_FRONTEND_EVENT_SCREENSHOT_TAKEN:
+		eventHandler->HandleScreenshotSaved();
+		break;
+
 	default:
 		break;
 	}
 }
 
+void EventHandler::FrontendFinishedLoadingMultiHandler()
+{
+	blog_debug(
+		"[EventHandler::FrontendFinishedLoadingMultiHandler] OBS has finished loading. Connecting final handlers and enabling events...");
+
+	// Connect source signals and enable events only after OBS has fully loaded (to reduce extra logging).
+	_obsLoaded.store(true);
+
+	// In the case that plugins become hotloadable, this will have to go back into `EventHandler::EventHandler()`
+	// Enumerate inputs and connect each one
+	{
+		auto enumInputs = [](void *param, obs_source_t *source) {
+			auto eventHandler = static_cast<EventHandler *>(param);
+			eventHandler->ConnectSourceSignals(source);
+			return true;
+		};
+		obs_enum_sources(enumInputs, this);
+	}
+
+	// Enumerate scenes and connect each one
+	{
+		auto enumScenes = [](void *param, obs_source_t *source) {
+			auto eventHandler = static_cast<EventHandler *>(param);
+			eventHandler->ConnectSourceSignals(source);
+			return true;
+		};
+		obs_enum_scenes(enumScenes, this);
+	}
+
+	// Enumerate all scene transitions and connect each one
+	{
+		obs_frontend_source_list transitions = {};
+		obs_frontend_get_transitions(&transitions);
+		for (size_t i = 0; i < transitions.sources.num; i++) {
+			obs_source_t *transition = transitions.sources.array[i];
+			ConnectSourceSignals(transition);
+		}
+		obs_frontend_source_list_free(&transitions);
+	}
+
+	blog_debug("[EventHandler::FrontendFinishedLoadingMultiHandler] Finished.");
+
+	if (_obsLoadedCallback)
+		_obsLoadedCallback();
+}
+
+void EventHandler::FrontendExitMultiHandler()
+{
+	HandleExitStarted();
+
+	blog_debug("[EventHandler::FrontendExitMultiHandler] OBS is unloading. Disabling events...");
+
+	// Disconnect source signals and disable events when OBS starts unloading (to reduce extra logging).
+	_obsLoaded.store(false);
+
+	// In the case that plugins become hotloadable, this will have to go back into `EventHandler::~EventHandler()`
+	// Enumerate inputs and disconnect each one
+	{
+		auto enumInputs = [](void *param, obs_source_t *source) {
+			auto eventHandler = static_cast<EventHandler *>(param);
+			eventHandler->DisconnectSourceSignals(source);
+			return true;
+		};
+		obs_enum_sources(enumInputs, this);
+	}
+
+	// Enumerate scenes and disconnect each one
+	{
+		auto enumScenes = [](void *param, obs_source_t *source) {
+			auto eventHandler = static_cast<EventHandler *>(param);
+			eventHandler->DisconnectSourceSignals(source);
+			return true;
+		};
+		obs_enum_scenes(enumScenes, this);
+	}
+
+	// Enumerate all scene transitions and disconnect each one
+	{
+		obs_frontend_source_list transitions = {};
+		obs_frontend_get_transitions(&transitions);
+		for (size_t i = 0; i < transitions.sources.num; i++) {
+			obs_source_t *transition = transitions.sources.array[i];
+			DisconnectSourceSignals(transition);
+		}
+		obs_frontend_source_list_free(&transitions);
+	}
+
+	blog_debug("[EventHandler::FrontendExitMultiHandler] Finished.");
+}
+
 // Only called for creation of a public source
 void EventHandler::SourceCreatedMultiHandler(void *param, calldata_t *data)
 {
@@ -597,3 +630,17 @@ void EventHandler::SourceRenamedMultiHandler(void *param, calldata_t *data)
 		break;
 	}
 }
+
+void EventHandler::StreamOutputReconnectHandler(void *param, calldata_t *)
+{
+	auto eventHandler = static_cast<EventHandler *>(param);
+
+	eventHandler->HandleStreamStateChanged(OBS_WEBSOCKET_OUTPUT_RECONNECTING);
+}
+
+void EventHandler::StreamOutputReconnectSuccessHandler(void *param, calldata_t *)
+{
+	auto eventHandler = static_cast<EventHandler *>(param);
+
+	eventHandler->HandleStreamStateChanged(OBS_WEBSOCKET_OUTPUT_RECONNECTED);
+}

src/eventhandler/EventHandler.h

@@ -27,7 +27,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include "../obs-websocket.h"
 #include "../utils/Obs.h"
 #include "../utils/Obs_VolumeMeter.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 class EventHandler {
 public:
@@ -61,6 +61,8 @@ private:
 
 	// Signal handler: frontend
 	static void OnFrontendEvent(enum obs_frontend_event event, void *private_data);
+	void FrontendFinishedLoadingMultiHandler();
+	void FrontendExitMultiHandler();
 
 	// Signal handler: libobs
 	static void SourceCreatedMultiHandler(void *param, calldata_t *data);
@@ -76,9 +78,12 @@ private:
 	static void SourceMediaNextMultiHandler(void *param, calldata_t *data);
 	static void SourceMediaPreviousMultiHandler(void *param, calldata_t *data);
 
+	// Signal handler: output
+	static void StreamOutputReconnectHandler(void *param, calldata_t *data);
+	static void StreamOutputReconnectSuccessHandler(void *param, calldata_t *data);
+
 	// General
 	void HandleExitStarted();
-	void HandleStudioModeStateChanged(bool enabled);
 
 	// Config
 	void HandleCurrentSceneCollectionChanging();
@@ -170,4 +175,8 @@ private:
 	static void HandleMediaInputPlaybackEnded(void *param,
 						  calldata_t *data); // Direct callback
 	void HandleMediaInputActionTriggered(obs_source_t *source, ObsMediaInputAction action);
+
+	// Ui
+	void HandleStudioModeStateChanged(bool enabled);
+	void HandleScreenshotSaved();
 };

src/eventhandler/EventHandler_Inputs.cpp

@@ -200,7 +200,7 @@ void EventHandler::HandleInputMuteStateChanged(void *param, calldata_t *data)
  * An input's volume level has changed.
  *
  * @dataField inputName      | String | Name of the input
- * @dataField inputVolumeMul | Number | New volume level in multimap
+ * @dataField inputVolumeMul | Number | New volume level multiplier
  * @dataField inputVolumeDb  | Number | New volume level in dB
  *
  * @eventType InputVolumeChanged

src/eventhandler/EventHandler_Outputs.cpp

@@ -24,10 +24,12 @@ static bool GetOutputStateActive(ObsOutputState state)
 	switch (state) {
 	case OBS_WEBSOCKET_OUTPUT_STARTED:
 	case OBS_WEBSOCKET_OUTPUT_RESUMED:
+	case OBS_WEBSOCKET_OUTPUT_RECONNECTED:
 		return true;
 	case OBS_WEBSOCKET_OUTPUT_STARTING:
 	case OBS_WEBSOCKET_OUTPUT_STOPPING:
 	case OBS_WEBSOCKET_OUTPUT_STOPPED:
+	case OBS_WEBSOCKET_OUTPUT_RECONNECTING:
 	case OBS_WEBSOCKET_OUTPUT_PAUSED:
 		return false;
 	default:

src/eventhandler/EventHandler_Scenes.cpp

@@ -103,7 +103,10 @@ void EventHandler::HandleCurrentProgramSceneChanged()
 	OBSSourceAutoRelease currentScene = obs_frontend_get_current_scene();
 
 	json eventData;
+	if (currentScene)
 		eventData["sceneName"] = obs_source_get_name(currentScene);
+	else
+		eventData["sceneName"] = nullptr;
 	BroadcastEvent(EventSubscription::Scenes, "CurrentProgramSceneChanged", eventData);
 }
 

src/eventhandler/EventHandler_Ui.cpp

@@ -38,3 +38,27 @@ void EventHandler::HandleStudioModeStateChanged(bool enabled)
 	eventData["studioModeEnabled"] = enabled;
 	BroadcastEvent(EventSubscription::Ui, "StudioModeStateChanged", eventData);
 }
+
+/**
+ * A screenshot has been saved.
+ *
+ * Note: Triggered for the screenshot feature available in `Settings -> Hotkeys -> Screenshot Output` ONLY.
+ * Applications using `Get/SaveSourceScreenshot` should implement a `CustomEvent` if this kind of inter-client
+ * communication is desired.
+ *
+ * @dataField savedScreenshotPath | String | Path of the saved image file
+ *
+ * @eventType ScreenshotSaved
+ * @eventSubscription Ui
+ * @complexity 2
+ * @rpcVersion -1
+ * @initialVersion 5.1.0
+ * @api events
+ * @category ui
+ */
+void EventHandler::HandleScreenshotSaved()
+{
+	json eventData;
+	eventData["savedScreenshotPath"] = Utils::Obs::StringHelper::GetLastScreenshotFileName();
+	BroadcastEvent(EventSubscription::Ui, "ScreenshotSaved", eventData);
+}

src/forms/ConnectInfo.cpp

@@ -105,7 +105,7 @@ void ConnectInfo::SetClipboardText(QString text)
 
 void ConnectInfo::DrawQr(QString qrText)
 {
-	QPixmap map(230, 230);
+	QPixmap map(236, 236);
 	map.fill(Qt::white);
 	QPainter painter(&map);
 

src/forms/ConnectInfo.h

@@ -21,7 +21,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 #include <QtWidgets/QDialog>
 
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 #include "ui_ConnectInfo.h"
 

src/forms/ConnectInfo.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>451</width>
-    <height>412</height>
+    <height>432</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -19,7 +19,7 @@
   <property name="maximumSize">
    <size>
     <width>451</width>
-    <height>412</height>
+    <height>432</height>
    </size>
   </property>
   <property name="windowTitle">
@@ -31,12 +31,21 @@
      <x>10</x>
      <y>10</y>
      <width>431</width>
-     <height>101</height>
+     <height>121</height>
     </rect>
    </property>
    <layout class="QFormLayout" name="formLayout">
+    <property name="formAlignment">
+     <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+    </property>
     <item row="0" column="0">
      <widget class="QLabel" name="serverIpLabel">
+      <property name="maximumSize">
+       <size>
+        <width>200</width>
+        <height>16777215</height>
+       </size>
+      </property>
       <property name="text">
        <string>OBSWebSocket.ConnectInfo.ServerIp</string>
       </property>
@@ -46,6 +55,12 @@
      <layout class="QHBoxLayout" name="horizontalLayout">
       <item>
        <widget class="QLineEdit" name="serverIpLineEdit">
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+        </property>
         <property name="readOnly">
          <bool>true</bool>
         </property>
@@ -53,6 +68,12 @@
       </item>
       <item>
        <widget class="QPushButton" name="copyServerIpButton">
+        <property name="maximumSize">
+         <size>
+          <width>75</width>
+          <height>16777215</height>
+         </size>
+        </property>
         <property name="text">
          <string>OBSWebSocket.ConnectInfo.CopyText</string>
         </property>
@@ -62,6 +83,12 @@
     </item>
     <item row="1" column="0">
      <widget class="QLabel" name="serverPortLabel">
+      <property name="maximumSize">
+       <size>
+        <width>200</width>
+        <height>16777215</height>
+       </size>
+      </property>
       <property name="text">
        <string>OBSWebSocket.ConnectInfo.ServerPort</string>
       </property>
@@ -71,6 +98,12 @@
      <layout class="QHBoxLayout" name="horizontalLayout_2">
       <item>
        <widget class="QLineEdit" name="serverPortLineEdit">
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+        </property>
         <property name="readOnly">
          <bool>true</bool>
         </property>
@@ -78,6 +111,12 @@
       </item>
       <item>
        <widget class="QPushButton" name="copyServerPortButton">
+        <property name="maximumSize">
+         <size>
+          <width>75</width>
+          <height>16777215</height>
+         </size>
+        </property>
         <property name="text">
          <string>OBSWebSocket.ConnectInfo.CopyText</string>
         </property>
@@ -87,6 +126,12 @@
     </item>
     <item row="2" column="0">
      <widget class="QLabel" name="serverPasswordLabel">
+      <property name="maximumSize">
+       <size>
+        <width>200</width>
+        <height>16777215</height>
+       </size>
+      </property>
       <property name="text">
        <string>OBSWebSocket.ConnectInfo.ServerPassword</string>
       </property>
@@ -96,9 +141,15 @@
      <layout class="QHBoxLayout" name="horizontalLayout_3">
       <item>
        <widget class="QLineEdit" name="serverPasswordLineEdit">
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
+        </property>
         <property name="text">
          <string>OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText</string>
         </property>
+        <property name="alignment">
+         <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+        </property>
         <property name="readOnly">
          <bool>true</bool>
         </property>
@@ -106,6 +157,12 @@
       </item>
       <item>
        <widget class="QPushButton" name="copyServerPasswordButton">
+        <property name="maximumSize">
+         <size>
+          <width>75</width>
+          <height>16777215</height>
+         </size>
+        </property>
         <property name="text">
          <string>OBSWebSocket.ConnectInfo.CopyText</string>
         </property>
@@ -119,7 +176,7 @@
    <property name="geometry">
     <rect>
      <x>10</x>
-     <y>120</y>
+     <y>140</y>
      <width>431</width>
      <height>281</height>
     </rect>
@@ -131,9 +188,9 @@
     <property name="geometry">
      <rect>
       <x>100</x>
-      <y>40</y>
-      <width>230</width>
-      <height>230</height>
+      <y>30</y>
+      <width>236</width>
+      <height>236</height>
      </rect>
     </property>
     <property name="text">

src/forms/SettingsDialog.h

@@ -23,7 +23,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <QTimer>
 
 #include "ConnectInfo.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 #include "ui_SettingsDialog.h"
 

src/forms/SettingsDialog.ui

@@ -80,7 +80,7 @@
       <item row="3" column="1">
        <layout class="QHBoxLayout" name="horizontalLayout_2">
         <property name="spacing">
-         <number>0</number>
+         <number>2</number>
         </property>
         <item>
          <widget class="QCheckBox" name="enableDebugLoggingCheckBox">
@@ -97,6 +97,12 @@
           <property name="toolTip">
            <string>OBSWebSocket.Settings.DebugEnableHoverText</string>
           </property>
+          <property name="scaledContents">
+           <bool>true</bool>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
          </widget>
         </item>
         <item>

src/requesthandler/RequestHandler.h

@@ -30,7 +30,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include "../websocketserver/rpc/WebSocketSession.h"
 #include "../obs-websocket.h"
 #include "../utils/Obs.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 class RequestHandler;
 typedef RequestResult (RequestHandler::*RequestMethodHandler)(const Request &);

src/requesthandler/RequestHandler_General.cpp

@@ -102,6 +102,20 @@ RequestResult RequestHandler::GetStats(const Request &)
 	return RequestResult::Success(responseData);
 }
 
+/**
+ * Custom event emitted by `BroadcastCustomEvent`.
+ * 
+ * @dataField eventData | Object | Custom event data
+ *
+ * @eventType CustomEvent
+ * @eventSubscription General
+ * @complexity 1
+ * @rpcVersion -1
+ * @initialVersion 5.0.0
+ * @category general
+ * @api events
+ */
+
 /**
  * Broadcasts a `CustomEvent` to all WebSocket clients. Receivers are clients which are identified and subscribed.
  *
@@ -164,7 +178,7 @@ RequestResult RequestHandler::CallVendorRequest(const Request &request)
 
 	OBSDataAutoRelease requestData = obs_data_create();
 	if (request.Contains("requestData")) {
-		if (!request.ValidateOptionalObject("requestData", statusCode, comment))
+		if (!request.ValidateOptionalObject("requestData", statusCode, comment, true))
 			return RequestResult::Error(statusCode, comment);
 
 		requestData = Utils::Json::JsonToObsData(request.RequestData["requestData"]);
@@ -311,8 +325,8 @@ RequestResult RequestHandler::TriggerHotkeyByKeySequence(const Request &request)
 /**
  * Sleeps for a time duration or number of frames. Only available in request batches with types `SERIAL_REALTIME` or `SERIAL_FRAME`.
  *
- * @requestField sleepMillis | Number | Number of milliseconds to sleep for (if `SERIAL_REALTIME` mode) | >= 0, <= 50000
- * @requestField sleepFrames | Number | Number of frames to sleep for (if `SERIAL_FRAME` mode) | >= 0, <= 10000
+ * @requestField ?sleepMillis | Number | Number of milliseconds to sleep for (if `SERIAL_REALTIME` mode) | >= 0, <= 50000
+ * @requestField ?sleepFrames | Number | Number of frames to sleep for (if `SERIAL_FRAME` mode) | >= 0, <= 10000
  *
  * @requestType Sleep
  * @complexity 2

src/requesthandler/RequestHandler_Inputs.cpp

@@ -889,6 +889,10 @@ RequestResult RequestHandler::GetInputPropertiesListPropertyItems(const Request
 /**
  * Presses a button in the properties of an input.
  *
+ * Some known `propertyName` values are:
+ *
+ * - `refreshnocache` - Browser source reload button
+ *
  * Note: Use this in cases where there is a button in the properties of an input that cannot be accessed in any other way. For example, browser sources, where there is a refresh button.
  *
  * @requestField inputName    | String | Name of the input

src/requesthandler/RequestHandler_Outputs.cpp

@@ -279,6 +279,8 @@ RequestResult RequestHandler::GetLastReplayBufferReplay(const Request &)
 /**
  * Gets the list of available outputs.
  * 
+ * @responseField outputs | Array<Object> | Array of outputs
+ *
  * @requestType GetOutputList
  * @complexity 4
  * @rpcVersion -1

src/requesthandler/RequestHandler_Record.cpp

@@ -23,7 +23,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
  * Gets the status of the record output.
  *
  * @responseField outputActive        | Boolean | Whether the output is active
- * @responseField ouputPaused         | Boolean | Whether the output is paused
+ * @responseField outputPaused        | Boolean | Whether the output is paused
  * @responseField outputTimecode      | String  | Current formatted timecode string for the output
  * @responseField outputDuration      | Number  | Current duration in milliseconds for the output
  * @responseField outputBytes         | Number  | Number of bytes sent by the output

src/requesthandler/RequestHandler_SceneItems.cpp

@@ -52,7 +52,7 @@ RequestResult RequestHandler::GetSceneItemList(const Request &request)
 /**
  * Basically GetSceneItemList, but for groups.
  *
- * Using groups at all in OBS is discouraged, as they are very broken under the hood.
+ * Using groups at all in OBS is discouraged, as they are very broken under the hood. Please use nested scenes instead.
  *
  * Groups only
  *

src/requesthandler/types/RequestStatus.h

@@ -103,6 +103,19 @@ namespace RequestStatus {
 		* @api enums
 		*/
 		UnsupportedRequestBatchExecutionType = 206,
+		/**
+		* The server is not ready to handle the request.
+		*
+		* Note: This usually occurs during OBS scene collection change or exit. Requests may be tried again after a delay if this code is given.
+		*
+		* @enumIdentifier NotReady
+		* @enumValue 207
+		* @enumType RequestStatus
+		* @rpcVersion -1
+		* @initialVersion 5.3.0
+		* @api enums
+		*/
+		NotReady = 207,
 
 		/**
 		* A required request field is missing.

src/utils/Crypto.cpp

@@ -22,7 +22,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <QRandomGenerator>
 
 #include "Crypto.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 static const char allowedChars[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
 static const int allowedCharsCount = static_cast<int>(sizeof(allowedChars) - 1);

src/utils/Json.cpp

@@ -19,7 +19,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 #include "Json.h"
 #include "Platform.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 bool Utils::Json::JsonArrayIsValidObsArray(const json &j)
 {

src/utils/Obs.cpp

@@ -18,4 +18,4 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 */
 
 #include "Obs.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"

src/utils/Obs.h

@@ -67,22 +67,105 @@ template<typename T> T *GetCalldataPointer(const calldata_t *data, const char *n
 }
 
 enum ObsOutputState {
+	/**
+	* Unknown state.
+	*
+	* @enumIdentifier OBS_WEBSOCKET_OUTPUT_UNKNOWN
+	* @enumType ObsOutputState
+	* @rpcVersion 1
+	* @initialVersion 5.0.0
+	* @api enums
+	*/
 	OBS_WEBSOCKET_OUTPUT_UNKNOWN,
+	/**
+	* The output is starting.
+	*
+	* @enumIdentifier OBS_WEBSOCKET_OUTPUT_STARTING
+	* @enumType ObsOutputState
+	* @rpcVersion 1
+	* @initialVersion 5.0.0
+	* @api enums
+	*/
 	OBS_WEBSOCKET_OUTPUT_STARTING,
+	/**
+	* The input has started.
+	*
+	* @enumIdentifier OBS_WEBSOCKET_OUTPUT_STARTED
+	* @enumType ObsOutputState
+	* @rpcVersion 1
+	* @initialVersion 5.0.0
+	* @api enums
+	*/
 	OBS_WEBSOCKET_OUTPUT_STARTED,
+	/**
+	* The output is stopping.
+	*
+	* @enumIdentifier OBS_WEBSOCKET_OUTPUT_STOPPING
+	* @enumType ObsOutputState
+	* @rpcVersion 1
+	* @initialVersion 5.0.0
+	* @api enums
+	*/
 	OBS_WEBSOCKET_OUTPUT_STOPPING,
+	/**
+	* The output has stopped.
+	*
+	* @enumIdentifier OBS_WEBSOCKET_OUTPUT_STOPPED
+	* @enumType ObsOutputState
+	* @rpcVersion 1
+	* @initialVersion 5.0.0
+	* @api enums
+	*/
 	OBS_WEBSOCKET_OUTPUT_STOPPED,
+	/**
+	* The output has disconnected and is reconnecting.
+	*
+	* @enumIdentifier OBS_WEBSOCKET_OUTPUT_RECONNECTING
+	* @enumType ObsOutputState
+	* @rpcVersion 1
+	* @initialVersion 5.0.0
+	* @api enums
+	*/
 	OBS_WEBSOCKET_OUTPUT_RECONNECTING,
+	/**
+	* The output has reconnected successfully.
+	*
+	* @enumIdentifier OBS_WEBSOCKET_OUTPUT_RECONNECTED
+	* @enumType ObsOutputState
+	* @rpcVersion 1
+	* @initialVersion 5.1.0
+	* @api enums
+	*/
+	OBS_WEBSOCKET_OUTPUT_RECONNECTED,
+	/**
+	* The output is now paused.
+	*
+	* @enumIdentifier OBS_WEBSOCKET_OUTPUT_PAUSED
+	* @enumType ObsOutputState
+	* @rpcVersion 1
+	* @initialVersion 5.1.0
+	* @api enums
+	*/
 	OBS_WEBSOCKET_OUTPUT_PAUSED,
+	/**
+	* The output has been resumed (unpaused).
+	*
+	* @enumIdentifier OBS_WEBSOCKET_OUTPUT_RESUMED
+	* @enumType ObsOutputState
+	* @rpcVersion 1
+	* @initialVersion 5.0.0
+	* @api enums
+	*/
 	OBS_WEBSOCKET_OUTPUT_RESUMED,
 };
-
 NLOHMANN_JSON_SERIALIZE_ENUM(ObsOutputState, {
 						     {OBS_WEBSOCKET_OUTPUT_UNKNOWN, "OBS_WEBSOCKET_OUTPUT_UNKNOWN"},
 						     {OBS_WEBSOCKET_OUTPUT_STARTING, "OBS_WEBSOCKET_OUTPUT_STARTING"},
 						     {OBS_WEBSOCKET_OUTPUT_STARTED, "OBS_WEBSOCKET_OUTPUT_STARTED"},
 						     {OBS_WEBSOCKET_OUTPUT_STOPPING, "OBS_WEBSOCKET_OUTPUT_STOPPING"},
 						     {OBS_WEBSOCKET_OUTPUT_STOPPED, "OBS_WEBSOCKET_OUTPUT_STOPPED"},
+						     {OBS_WEBSOCKET_OUTPUT_RECONNECTING, "OBS_WEBSOCKET_OUTPUT_RECONNECTING"},
+						     {OBS_WEBSOCKET_OUTPUT_RECONNECTED, "OBS_WEBSOCKET_OUTPUT_RECONNECTED"},
 						     {OBS_WEBSOCKET_OUTPUT_PAUSED, "OBS_WEBSOCKET_OUTPUT_PAUSED"},
 						     {OBS_WEBSOCKET_OUTPUT_RESUMED, "OBS_WEBSOCKET_OUTPUT_RESUMED"},
 					     })
@@ -159,7 +242,6 @@ enum ObsMediaInputAction {
 	*/
 	OBS_WEBSOCKET_MEDIA_INPUT_ACTION_PREVIOUS,
 };
-
 NLOHMANN_JSON_SERIALIZE_ENUM(ObsMediaInputAction,
 			     {
 				     {OBS_WEBSOCKET_MEDIA_INPUT_ACTION_NONE, "OBS_WEBSOCKET_MEDIA_INPUT_ACTION_NONE"},
@@ -181,6 +263,7 @@ namespace Utils {
 			std::string GetCurrentRecordOutputPath();
 			std::string GetLastRecordFileName();
 			std::string GetLastReplayBufferFileName();
+			std::string GetLastScreenshotFileName();
 			std::string DurationToTimecode(uint64_t);
 		}
 

src/utils/Obs_ActionHelper.cpp

@@ -17,7 +17,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 */
 
 #include "Obs.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 struct CreateSceneItemData {
 	obs_source_t *source;                             // In

src/utils/Obs_ArrayHelper.cpp

@@ -20,7 +20,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <algorithm>
 
 #include "Obs.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 static std::vector<std::string> ConvertStringArray(char **array)
 {

src/utils/Obs_NumberHelper.cpp

@@ -21,7 +21,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <util/util_uint64.h>
 
 #include "Obs.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 uint64_t Utils::Obs::NumberHelper::GetOutputDuration(obs_output_t *output)
 {

src/utils/Obs_ObjectHelper.cpp

@@ -21,7 +21,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 #include "Obs.h"
 #include "../obs-websocket.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 json Utils::Obs::ObjectHelper::GetStats()
 {

src/utils/Obs_SearchHelper.cpp

@@ -17,7 +17,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 */
 
 #include "Obs.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 obs_hotkey_t *Utils::Obs::SearchHelper::GetHotkeyByName(std::string name)
 {

src/utils/Obs_StringHelper.cpp

@@ -21,7 +21,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <QString>
 
 #include "Obs.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 #define CASE(x) \
 	case x: \
@@ -94,20 +94,18 @@ std::string Utils::Obs::StringHelper::GetLastRecordFileName()
 
 std::string Utils::Obs::StringHelper::GetLastReplayBufferFileName()
 {
-	OBSOutputAutoRelease output = obs_frontend_get_replay_buffer_output();
-	if (!output)
-		return "";
+	char *replayBufferPath = obs_frontend_get_last_replay();
+	std::string ret = replayBufferPath;
+	bfree(replayBufferPath);
+	return ret;
+}
 
-	calldata_t cd = {0};
-	proc_handler_t *ph = obs_output_get_proc_handler(output);
-	proc_handler_call(ph, "get_last_replay", &cd);
-	const char *savedReplayPath = calldata_string(&cd, "path");
-	calldata_free(&cd);
-
-	if (!savedReplayPath)
-		return "";
-
-	return savedReplayPath;
+std::string Utils::Obs::StringHelper::GetLastScreenshotFileName()
+{
+	char *screenshotPath = obs_frontend_get_last_screenshot();
+	std::string ret = screenshotPath;
+	bfree(screenshotPath);
+	return ret;
 }
 
 std::string Utils::Obs::StringHelper::DurationToTimecode(uint64_t ms)

src/utils/Platform.cpp

@@ -25,7 +25,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <obs-frontend-api.h>
 
 #include "Platform.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 std::string Utils::Platform::GetLocalAddress()
 {

src/websocketserver/WebSocketServer.h

@@ -32,7 +32,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include "types/WebSocketOpCode.h"
 #include "../utils/Json.h"
 #include "../requesthandler/rpc/Request.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 class WebSocketServer : QObject {
 	Q_OBJECT

src/websocketserver/WebSocketServer_Protocol.cpp

@@ -104,6 +104,11 @@ void WebSocketServer::ProcessMessage(SessionPtr session, WebSocketServer::Proces
 					"Your payload's data is missing an `authentication` string, however authentication is required.";
 				return;
 			}
+			if (!payloadData["authentication"].is_string()) {
+				ret.closeCode = WebSocketCloseCode::AuthenticationFailed;
+				ret.closeReason = "Your `authentication` field is not a string.";
+				return;
+			}
 			if (!Utils::Crypto::CheckAuthenticationString(session->Secret(), session->Challenge(),
 								      payloadData["authentication"])) {
 				auto conf = GetConfig();

src/websocketserver/rpc/WebSocketSession.h

@@ -24,7 +24,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <atomic>
 #include <memory>
 
-#include "../../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 class WebSocketSession;
 typedef std::shared_ptr<WebSocketSession> SessionPtr;