Skip to content

Commit

Permalink
Merge pull request #765 from Palakis/4.9.1-prep
Browse files Browse the repository at this point in the history
4.9.1 Prep
  • Loading branch information
Palakis authored Jun 10, 2021
2 parents b271cf9 + 9a8d283 commit 5350832
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion CI/macos/obs-websocket.pkgproj
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@
<key>OVERWRITE_PERMISSIONS</key>
<false/>
<key>VERSION</key>
<string>4.9.0</string>
<string>4.9.1</string>
</dict>
<key>PROJECT_COMMENTS</key>
<dict>
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion docs/partials/introduction.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion installer/installer.iss
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions src/WSEvents.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -790,7 +790,7 @@ void WSEvents::OnRecordingResumed() {
* @api events
* @name VirtualCamStarted
* @category virtual cam
* @since unreleased
* @since 4.9.1
*/
void WSEvents::OnVirtualCamStarted() {
broadcastUpdate("VirtualCamStarted");
Expand All @@ -802,7 +802,7 @@ void WSEvents::OnVirtualCamStarted() {
* @api events
* @name VirtualCamStopped
* @category virtual cam
* @since unreleased
* @since 4.9.1
*/
void WSEvents::OnVirtualCamStopped() {
broadcastUpdate("VirtualCamStopped");
Expand Down
2 changes: 1 addition & 1 deletion src/WSRequestHandler_General.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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")) {
Expand Down
6 changes: 3 additions & 3 deletions src/WSRequestHandler_Sources.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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)
{
Expand Down Expand Up @@ -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)
{
Expand Down
8 changes: 4 additions & 4 deletions src/WSRequestHandler_VirtualCam.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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());
Expand All @@ -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()) {
Expand All @@ -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()) {
Expand Down
2 changes: 1 addition & 1 deletion src/obs-websocket.h
Original file line number Diff line number Diff line change
Expand Up @@ -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__)

0 comments on commit 5350832

Please sign in to comment.