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

101 Commits

Author SHA1 Message Date
Teddy Stoddard
1d30f13fd8 adding error response object method 2017-10-23 12:04:43 -04:00
Teddy Stoddard
b9ae28483c adding error messages 2017-10-23 11:34:29 -04:00
Teddy Stoddard
7570fbf7a4 strings to ENUM strings 2017-10-17 19:07:40 -04:00
Teddy Stoddard
67f7e28867 fixing bounds type setter 2017-10-16 12:29:49 -04:00
Teddy Stoddard
9b2d30b4d5 switch string to ifelseif 2017-10-16 12:17:29 -04:00
Teddy Stoddard
399815525f wrapping up setter and getter 2017-10-16 12:01:41 -04:00
Teddy Stoddard
fe724db12d removing copy paste error 2017-10-15 17:28:07 -04:00
Teddy Stoddard
096a8ec6ba wip on setter and getter 2017-10-15 14:21:45 -04:00
Teddy Stoddard
cc5f9c9aa7 refining bounds and adding scale to setter 2017-10-15 11:57:21 -04:00
Teddy Stoddard
90aebecc5b small fixes 2017-10-14 14:36:23 -04:00
Teddy Stoddard
b0170ef671 more WIP on setter 2017-10-14 13:10:40 -04:00
Teddy Stoddard
d418b4e624 fixing methods for getting inner object keys 2017-10-11 12:07:33 -04:00
Teddy Stoddard
47505547af fixing some types 2017-10-11 11:51:05 -04:00
Teddy Stoddard
de2e73c9d4 WIP setter and fixing small typo 2017-10-10 21:14:27 -04:00
Teddy Stoddard
ab1a43163b early return on bad param 2017-10-04 13:26:15 -04:00
Teddy Stoddard
2556dd320f fixing bounds alignemnt getter 2017-10-04 13:05:01 -04:00
Teddy Stoddard
2120381c0e correnting method name 2017-10-04 12:48:40 -04:00
Teddy Stoddard
d6caa872b8 WIP some small fixes 2017-10-04 02:06:38 -04:00
Teddy Stoddard
2e9829ddd1 WIP questions to be answered 2017-10-04 00:51:16 -04:00
Teddy Stoddard
9621ea90f7 more WIP 2017-10-03 20:30:51 -04:00
Teddy Stoddard
f58da1254b wip 2017-10-03 20:23:55 -04: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