From 1eb02e77e033494158ab6def78abde9c4804ed65 Mon Sep 17 00:00:00 2001 From: tt2468 Date: Wed, 9 Jun 2021 19:11:02 -0700 Subject: [PATCH 1/2] Docs: Mark unreleased requests with 4.9.1 --- src/WSEvents.cpp | 4 ++-- src/WSRequestHandler_General.cpp | 2 +- src/WSRequestHandler_Sources.cpp | 6 +++--- src/WSRequestHandler_VirtualCam.cpp | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/WSEvents.cpp b/src/WSEvents.cpp index e3ac47bd9..93b307ae9 100644 --- a/src/WSEvents.cpp +++ b/src/WSEvents.cpp @@ -787,7 +787,7 @@ void WSEvents::OnRecordingResumed() { * @api events * @name VirtualCamStarted * @category virtual cam - * @since unreleased + * @since 4.9.1 */ void WSEvents::OnVirtualCamStarted() { broadcastUpdate("VirtualCamStarted"); @@ -799,7 +799,7 @@ void WSEvents::OnVirtualCamStarted() { * @api events * @name VirtualCamStopped * @category virtual cam - * @since unreleased + * @since 4.9.1 */ void WSEvents::OnVirtualCamStopped() { broadcastUpdate("VirtualCamStopped"); diff --git a/src/WSRequestHandler_General.cpp b/src/WSRequestHandler_General.cpp index b08023d06..2dec543fe 100644 --- a/src/WSRequestHandler_General.cpp +++ b/src/WSRequestHandler_General.cpp @@ -483,7 +483,7 @@ RpcResponse WSRequestHandler::ExecuteBatch(const RpcRequest& request) { * @api requests * @name Sleep * @category general - * @since unreleased + * @since 4.9.1 */ RpcResponse WSRequestHandler::Sleep(const RpcRequest& request) { if (!request.hasField("sleepMillis")) { diff --git a/src/WSRequestHandler_Sources.cpp b/src/WSRequestHandler_Sources.cpp index c00858846..c60838f76 100644 --- a/src/WSRequestHandler_Sources.cpp +++ b/src/WSRequestHandler_Sources.cpp @@ -325,7 +325,7 @@ RpcResponse WSRequestHandler::SetVolume(const RpcRequest& request) * @api requests * @name SetTracks * @category sources -* @since unreleased +* @since 4.9.1 */ RpcResponse WSRequestHandler::SetAudioTracks(const RpcRequest& request) { @@ -374,7 +374,7 @@ RpcResponse WSRequestHandler::SetAudioTracks(const RpcRequest& request) * @api requests * @name GetTracks * @category sources -* @since unreleased +* @since 4.9.1 */ RpcResponse WSRequestHandler::GetAudioTracks(const RpcRequest& request) { @@ -514,7 +514,7 @@ RpcResponse WSRequestHandler::ToggleMute(const RpcRequest& request) * @api requests * @name GetSourceActive * @category sources -* @since unreleased +* @since 4.9.1 */ RpcResponse WSRequestHandler::GetSourceActive(const RpcRequest& request) { diff --git a/src/WSRequestHandler_VirtualCam.cpp b/src/WSRequestHandler_VirtualCam.cpp index 625e5e45b..7c7fdccb2 100644 --- a/src/WSRequestHandler_VirtualCam.cpp +++ b/src/WSRequestHandler_VirtualCam.cpp @@ -13,7 +13,7 @@ * @api requests * @name GetVirtualCamStatus * @category virtual cam - * @since unreleased + * @since 4.9.1 */ RpcResponse WSRequestHandler::GetVirtualCamStatus(const RpcRequest& request) { auto events = GetEventsSystem(); @@ -35,7 +35,7 @@ RpcResponse WSRequestHandler::GetVirtualCamStatus(const RpcRequest& request) { * @api requests * @name StartStopVirtualCam * @category virtual cam - * @since unreleased + * @since 4.9.1 */ RpcResponse WSRequestHandler::StartStopVirtualCam(const RpcRequest& request) { (obs_frontend_virtualcam_active() ? obs_frontend_stop_virtualcam() : obs_frontend_start_virtualcam()); @@ -49,7 +49,7 @@ RpcResponse WSRequestHandler::StartStopVirtualCam(const RpcRequest& request) { * @api requests * @name StartVirtualCam * @category virtual cam - * @since unreleased + * @since 4.9.1 */ RpcResponse WSRequestHandler::StartVirtualCam(const RpcRequest& request) { if (obs_frontend_virtualcam_active()) { @@ -67,7 +67,7 @@ RpcResponse WSRequestHandler::StartVirtualCam(const RpcRequest& request) { * @api requests * @name StopVirtualCam * @category virtual cam - * @since unreleased + * @since 4.9.1 */ RpcResponse WSRequestHandler::StopVirtualCam(const RpcRequest& request) { if (!obs_frontend_virtualcam_active()) { From 9a8d283d27e179a7801789f1b459f5389a3a80fd Mon Sep 17 00:00:00 2001 From: tt2468 Date: Wed, 9 Jun 2021 21:03:59 -0700 Subject: [PATCH 2/2] base: Update plugin version to 4.9.1 --- CI/macos/obs-websocket.pkgproj | 2 +- CMakeLists.txt | 2 +- docs/partials/introduction.md | 2 +- installer/installer.iss | 2 +- src/obs-websocket.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CI/macos/obs-websocket.pkgproj b/CI/macos/obs-websocket.pkgproj index 7c5745059..96e022d25 100644 --- a/CI/macos/obs-websocket.pkgproj +++ b/CI/macos/obs-websocket.pkgproj @@ -518,7 +518,7 @@ OVERWRITE_PERMISSIONS VERSION - 4.9.0 + 4.9.1 PROJECT_COMMENTS diff --git a/CMakeLists.txt b/CMakeLists.txt index 56f3605d8..9ed89c27c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.5) -project(obs-websocket VERSION 4.9.0) +project(obs-websocket VERSION 4.9.1) set(CMAKE_PREFIX_PATH "${QTDIR}") set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/docs/partials/introduction.md b/docs/partials/introduction.md index 733360eea..a353b5e6b 100644 --- a/docs/partials/introduction.md +++ b/docs/partials/introduction.md @@ -1,4 +1,4 @@ -# obs-websocket 4.9.0 protocol reference +# obs-websocket 4.9.1 protocol reference # General Introduction Messages are exchanged between the client and the server as JSON objects. diff --git a/installer/installer.iss b/installer/installer.iss index 0109c12d3..391a808c9 100644 --- a/installer/installer.iss +++ b/installer/installer.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "obs-websocket" -#define MyAppVersion "4.9.0" +#define MyAppVersion "4.9.1" #define MyAppPublisher "Stephane Lepin" #define MyAppURL "http://github.com/Palakis/obs-websocket" diff --git a/src/obs-websocket.h b/src/obs-websocket.h index 35eac4610..42d42df92 100644 --- a/src/obs-websocket.h +++ b/src/obs-websocket.h @@ -57,6 +57,6 @@ WSServerPtr GetServer(); WSEventsPtr GetEventsSystem(); void ShowPasswordSetting(); -#define OBS_WEBSOCKET_VERSION "4.9.0" +#define OBS_WEBSOCKET_VERSION "4.9.1" #define blog(level, msg, ...) blog(level, "[obs-websocket] " msg, ##__VA_ARGS__)