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
465 Commits 6 Branches 45 Tags
Commit Graph

82 Commits

Author SHA1 Message Date
Palakis
fcf1fa8aff studio mode: Remove parts of Qt UI hacks 2017-10-16 15:28:54 +02:00
Palakis
70a8533f5e docs(requests): fix SetStreamSettings 2017-10-16 13:12:49 +02:00
Brendan Hagan
c0512d5b5f docs: HandleSetHeartbeat -> SetHeartbeat 2017-09-25 11:32:34 -05:00
Palakis
3981abc5ca General: code and docs cleanup 2017-09-25 16:48:46 +02:00
RainbowEK
9b7752896a Adding Heartbeat to obs-websocket. (#112) 
* Added a Heartbeat in WSEvents (.cpp and .h updated)
Lines where the coded is added are marked with "//mod-0x =============" (x denotes a number).

* Updated the Heartbeat:
- Default it is off, and via JSON request can be switched on.
- The Heartbeat has configurable elements. Each individual element can be requested via a JSON request to be added to the Heartbeat.
- Maximum elements are in this example JSON update:
{
    "current-profile": "#2-PGH",
    "current-scene": "#2-HG",
    "pulse": true,
    "recording": false,
    "streaming": false,
    "total-record-time": 0,
    "total-stream-time": 0,
    "update-type": "Heartbeat"
}

* Cleaning

* Process all Palakis his comment/advice, and added 3 key/value pairs.

* Processed cleaning up comments as proposed by Stephane.

* Still found tabs in the comment header, and replaced by spaces.

* FUNCTIONAL MODIFICATION:
- Removed selective content of Heartbeat, and show all key/value parameters.
- Only request left is "on" or "off" selection of heartbeat.
FIX:
- Show streaming/recording related data only when streaming/recording is active, due to OBS showing wrong values when not active.

* Changed request type to start the Heartbeat to a boolean parameter.

* Delete ZERO_CHECK.log

* Delete obs-websocket_autogen.log

* Delete obs-websocket.log
 2017-09-24 22:54:29 +02:00
Stéphane L
87b47689eb Docs: more specific version number + tag unreleased methods/events 2017-09-08 21:42:13 +02:00
Brendan Hagan
4e642d97fc docs: Add @since 2017-08-26 16:25:17 -04:00
Logan S
9ce2b1983a Protocol: add Replay Buffer Events and Requests (#104) 2017-08-19 15:05:42 +02:00
Stéphane L
2e2e9b1332 Code: small style fixes 2017-08-19 11:40:42 +02:00
Brendan Hagan
a263d8a364 Docs: Initial generation of docs from code comments (#106) 2017-08-13 17:41:42 +02:00
Marwin M
712bd6e8f3 Fix if statement 
Add missing closing bracket and use !source_name instead of source_name == NULL
 2017-08-07 15:34:43 +02:00
Marwin M
e91c9e7bf4 Fixed spacing 2017-08-07 02:34:20 +02:00
dragonbane
2562272775 Added new request types: SetSyncOffset and GetSyncOffset 2017-08-07 02:19:09 +02:00
Stéphane L
cc3097b09a GetVersion: add claryfying comment 2017-08-06 05:12:30 +02:00
Stéphane L
c00681b52d Protocol: remove useless API version field 2017-08-06 05:10:14 +02:00
Stéphane L
61931c179f Protocol: update GetVersion with list of available request types 2017-08-06 00:09:44 +02:00
Guillaume "Elektordi" Genty
6ac3a3de57 Protocol: add ResetSceneItem for resetting source items (#108) 
Use case: Reset media sources for recovery of timed-out input streams.
 2017-08-05 19:11:01 +02:00
Stéphane L
4b89464349 General: refactor continued again 2017-08-05 18:26:14 +02:00
Stéphane L
dba599c127 General: refactor continued 2017-08-05 03:21:28 +02:00
yinzara
e3ad148c15 Request types: get/set/save streaming settings (PR #100) 
* Adding support for changing streaming server settings

* Updates after initial code review for customized rtmp settings

* Updating PROTOCOL.MD documentment for streaming service settings

* Changes based on code review
 2017-07-06 13:07:06 +02:00
Stéphane L
acffacd67d Request/Response: refactor logging code 2017-07-04 21:20:34 +02:00
Brendan Hagan
7675a1ee58 General: Toggle to log outgoing response and events 2017-07-04 14:17:51 -04:00
Brendan Hagan
b57982b6cb General: Toggle to log incoming requests 2017-06-29 22:11:51 -05:00
Peter Antonvich
4132356141 Protocol: Add Get and Set Browser Source Properties (#95) 
* Protocol: Add Get and Set Browser Source Properties

* address white space - I don't see the indentation issue at my end for protocol.md but I'll try
 2017-06-22 18:51:19 +02:00
Peter Antonvich
65f4ff6a30 Protocol: add request types to get/set Text GDI Plus sources (#94) 
* Protocol: add request types to get/set Text GDI Plus sources

* address comments
 2017-06-20 16:07:47 +02:00
Palakis
f001d18eea Protocol: add request types to get/set current recording folder 2017-06-06 09:50:02 +02:00
Palakis
f49980350a General: code style refresh 2017-06-06 09:30:07 +02:00
Palakis
a3cbbf3ea9 General: refactor to limit linesize to 80 columns 2017-04-26 10:02:02 +02:00
Palakis
e647debcfb Handler: fix possible duplicate data release 2017-04-25 08:53:24 +02:00
Palakis
03c8c6385c Bugfix: wrong behaviour in TransitionToProgram with a specif. transition 2017-04-23 23:28:06 +02:00
Palakis
d014a7ab25 Requests: Start/Stop Streaming/Recording request now have errors 2017-04-23 15:22:10 +02:00
Palakis
9ddfad99ea Bugfix: calling SetPreviewScene with an unknown source doesn't errors 2017-04-23 12:09:58 +02:00
Palakis
5d290165a2 Add request type GetSpecialSources 2017-04-21 13:39:28 +02:00
Palakis
cebe325e81 New request type GetMute + request handler refactor 2017-04-21 11:14:47 +02:00
Palakis
ed4526751e Better param checks for Studio Mode request types 2017-04-20 10:06:43 +02:00
Palakis
a6677edbf5 Add ability to specify a transition when calling TransitionToProgram 2017-04-19 18:53:09 +02:00
Palakis
5748e163f8 Added GetPreviewScene and modified GetStudioModeStatus 2017-04-19 15:21:21 +02:00
Palakis
f0bb941c47 New request type : TransitionToProgram 2017-04-19 14:36:53 +02:00
Palakis
b7df1e8596 Add SetPreviewScene request type and PreviewSceneChanged event 2017-04-19 13:43:58 +02:00
Palakis
8c4bd91c78 New request types to get and set the status of Studio Mode 2017-04-19 11:34:37 +02:00
Palakis
dedbbf12bb Implement #63 2017-04-14 15:36:05 +02:00
Palakis
2d5749a78c New request type : GetTransitionDuration 2017-03-19 23:57:01 +01:00
Palakis
f078a10028 New request types for streaming and recording control 
`StartStreaming`, `StopStreaming`, `StartRecording` and `StopRecording`
 2017-03-19 23:50:23 +01:00
Palakis
701f88e532 Added "SetSceneItemCrop" request type 2017-03-19 23:38:26 +01:00
Palakis
42a80c6185 Ability to get and set transition duration 2017-02-27 11:53:44 +01:00
Mikhail Swift
a527f343cd Moved some repeated code to utils, added source_name to other commands 2017-02-26 18:01:09 -05:00
Mikhail Swift
da6e55f09f Used same error message elsewhere, fixed null check 2017-02-26 17:13:50 -05:00
Mikhail Swift
d277e2788a Fixed missed changes from currentScene -> scene 2017-02-26 16:40:29 -05:00
Mikhail Swift
b9862acd1d Add scene-name optional parmeter to set source render command 2017-02-26 16:35:08 -05:00
Palakis
d1c19382a1 Fixes #34 2017-02-26 19:46:09 +01:00