Mirrored_Repos/obs-websocket
1
0
Fork 0
mirror of https://github.com/Palakis/obs-websocket.git synced 2024-08-30 18:12:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #765 from Palakis/4.9.1-prep

Browse Source 
4.9.1 Prep
This commit is contained in:
Stéphane Lepin
2021-06-10 07:55:38 +02:00
committed by GitHub
parent b271cf9d32 9a8d283d27
commit 535083205a
9 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CI/macos/obs-websocket.pkgproj
View File

@ -518,7 +518,7 @@
<key>OVERWRITE_PERMISSIONS</key> <key>OVERWRITE_PERMISSIONS</key>
<false/> <false/>
<key>VERSION</key> <key>VERSION</key>
<string>4.9.0</string> <string>4.9.1</string>
</dict> </dict>
<key>PROJECT_COMMENTS</key> <key>PROJECT_COMMENTS</key>
<dict> <dict>

2
CMakeLists.txt
View File

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.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_PREFIX_PATH "${QTDIR}")
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)

2
docs/partials/introduction.md
View File

@ -1,4 +1,4 @@
# obs-websocket 4.9.0 protocol reference # obs-websocket 4.9.1 protocol reference
# General Introduction # General Introduction
Messages are exchanged between the client and the server as JSON objects. Messages are exchanged between the client and the server as JSON objects.

2
installer/installer.iss
View File

@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define MyAppName "obs-websocket" #define MyAppName "obs-websocket"
#define MyAppVersion "4.9.0" #define MyAppVersion "4.9.1"
#define MyAppPublisher "Stephane Lepin" #define MyAppPublisher "Stephane Lepin"
#define MyAppURL "http://github.com/Palakis/obs-websocket" #define MyAppURL "http://github.com/Palakis/obs-websocket"

4
src/WSEvents.cpp
View File

@ -790,7 +790,7 @@ void WSEvents::OnRecordingResumed() {
* @api events * @api events
* @name VirtualCamStarted * @name VirtualCamStarted
* @category virtual cam * @category virtual cam
* @since unreleased * @since 4.9.1
*/ */
void WSEvents::OnVirtualCamStarted() { void WSEvents::OnVirtualCamStarted() {
broadcastUpdate("VirtualCamStarted"); broadcastUpdate("VirtualCamStarted");
@ -802,7 +802,7 @@ void WSEvents::OnVirtualCamStarted() {
* @api events * @api events
* @name VirtualCamStopped * @name VirtualCamStopped
* @category virtual cam * @category virtual cam
* @since unreleased * @since 4.9.1
*/ */
void WSEvents::OnVirtualCamStopped() { void WSEvents::OnVirtualCamStopped() {
broadcastUpdate("VirtualCamStopped"); broadcastUpdate("VirtualCamStopped");

2
src/WSRequestHandler_General.cpp
View File

@ -483,7 +483,7 @@ RpcResponse WSRequestHandler::ExecuteBatch(const RpcRequest& request) {
* @api requests * @api requests
* @name Sleep * @name Sleep
* @category general * @category general
* @since unreleased * @since 4.9.1
*/ */
RpcResponse WSRequestHandler::Sleep(const RpcRequest& request) { RpcResponse WSRequestHandler::Sleep(const RpcRequest& request) {
if (!request.hasField("sleepMillis")) { if (!request.hasField("sleepMillis")) {

6
src/WSRequestHandler_Sources.cpp
View File

@ -325,7 +325,7 @@ RpcResponse WSRequestHandler::SetVolume(const RpcRequest& request)
* @api requests * @api requests
* @name SetTracks * @name SetTracks
* @category sources * @category sources
* @since unreleased * @since 4.9.1
*/ */
RpcResponse WSRequestHandler::SetAudioTracks(const RpcRequest& request) RpcResponse WSRequestHandler::SetAudioTracks(const RpcRequest& request)
{ {
@ -374,7 +374,7 @@ RpcResponse WSRequestHandler::SetAudioTracks(const RpcRequest& request)
* @api requests * @api requests
* @name GetTracks * @name GetTracks
* @category sources * @category sources
* @since unreleased * @since 4.9.1
*/ */
RpcResponse WSRequestHandler::GetAudioTracks(const RpcRequest& request) RpcResponse WSRequestHandler::GetAudioTracks(const RpcRequest& request)
{ {
@ -514,7 +514,7 @@ RpcResponse WSRequestHandler::ToggleMute(const RpcRequest& request)
* @api requests * @api requests
* @name GetSourceActive * @name GetSourceActive
* @category sources * @category sources
* @since unreleased * @since 4.9.1
*/ */
RpcResponse WSRequestHandler::GetSourceActive(const RpcRequest& request) RpcResponse WSRequestHandler::GetSourceActive(const RpcRequest& request)
{ {

8
src/WSRequestHandler_VirtualCam.cpp
View File

@ -13,7 +13,7 @@
* @api requests * @api requests
* @name GetVirtualCamStatus * @name GetVirtualCamStatus
* @category virtual cam * @category virtual cam
* @since unreleased * @since 4.9.1
*/ */
RpcResponse WSRequestHandler::GetVirtualCamStatus(const RpcRequest& request) { RpcResponse WSRequestHandler::GetVirtualCamStatus(const RpcRequest& request) {
auto events = GetEventsSystem(); auto events = GetEventsSystem();
@ -35,7 +35,7 @@ RpcResponse WSRequestHandler::GetVirtualCamStatus(const RpcRequest& request) {
* @api requests * @api requests
* @name StartStopVirtualCam * @name StartStopVirtualCam
* @category virtual cam * @category virtual cam
* @since unreleased * @since 4.9.1
*/ */
RpcResponse WSRequestHandler::StartStopVirtualCam(const RpcRequest& request) { RpcResponse WSRequestHandler::StartStopVirtualCam(const RpcRequest& request) {
(obs_frontend_virtualcam_active() ? obs_frontend_stop_virtualcam() : obs_frontend_start_virtualcam()); (obs_frontend_virtualcam_active() ? obs_frontend_stop_virtualcam() : obs_frontend_start_virtualcam());
@ -49,7 +49,7 @@ RpcResponse WSRequestHandler::StartStopVirtualCam(const RpcRequest& request) {
* @api requests * @api requests
* @name StartVirtualCam * @name StartVirtualCam
* @category virtual cam * @category virtual cam
* @since unreleased * @since 4.9.1
*/ */
RpcResponse WSRequestHandler::StartVirtualCam(const RpcRequest& request) { RpcResponse WSRequestHandler::StartVirtualCam(const RpcRequest& request) {
if (obs_frontend_virtualcam_active()) { if (obs_frontend_virtualcam_active()) {
@ -67,7 +67,7 @@ RpcResponse WSRequestHandler::StartVirtualCam(const RpcRequest& request) {
* @api requests * @api requests
* @name StopVirtualCam * @name StopVirtualCam
* @category virtual cam * @category virtual cam
* @since unreleased * @since 4.9.1
*/ */
RpcResponse WSRequestHandler::StopVirtualCam(const RpcRequest& request) { RpcResponse WSRequestHandler::StopVirtualCam(const RpcRequest& request) {
if (!obs_frontend_virtualcam_active()) { if (!obs_frontend_virtualcam_active()) {

2
src/obs-websocket.h
View File

@ -57,6 +57,6 @@ WSServerPtr GetServer();
WSEventsPtr GetEventsSystem(); WSEventsPtr GetEventsSystem();
void ShowPasswordSetting(); 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__) #define blog(level, msg, ...) blog(level, "[obs-websocket] " msg, ##__VA_ARGS__)