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

121 Commits

Author SHA1 Message Date
Palakis
2a2f3441ef requests: don't persist stream settings in StartStreaming 2017-11-06 10:53:05 +01:00
Brendan Hagan
6e21d041fe
docs: correct GetSceneItemProperties name 
Fixes #150
 2017-10-27 12:45:29 -04:00
Palakis
e2b70fd795 docs: realign comments 2017-10-27 15:51:23 +02:00
Palakis
8b3dce3256 requests: add GetSourcesList 2017-10-27 14:29:58 +02:00
Palakis
8cf6a1e72c SetSourceSettings: fix oops 2017-10-27 14:29:41 +02:00
Palakis
5da1e55f8e docs: Fix new requests names 2017-10-27 14:27:00 +02:00
Palakis
db8bc1af2d requests: add GetSourceSettings and SetSourceSettings 2017-10-27 14:18:45 +02:00
Stéphane L
57bc0a2b95 Merge pull request #136 from TStod/tstod/SceneItemGetter 
[Safe For Merge] Unified Setter and Getter for scene specific source properties
 2017-10-27 10:31:50 +02:00
Stéphane L
8efb30c4ee Merge pull request #148 from haganbmj/docs-deprecated 
docs: Add deprecated attribute
 2017-10-27 10:31:16 +02:00
Palakis
db1527ab9b StartStreaming: add missing comment 2017-10-27 10:24:58 +02:00
Palakis
7ab3e38da7 StartStreaming: fix request docs + code clean 2017-10-27 10:19:27 +02:00
Palakis
7b0b836809 requests: continued refactor of Get/Set/Save/Start stream settings 2017-10-27 10:03:22 +02:00
Palakis
c8e7cfcd7b requests: Refactor Get/SetStreamSettings code 2017-10-27 09:10:04 +02:00
Brendan Hagan
c516c89c97 docs: Add deprecated attribute 2017-10-25 11:59:14 -05:00
Palakis
c2937d7857 replay buffer: start without "Save" hotkey set 2017-10-25 18:29:42 +02:00
Teddy Stoddard
e84e5388a5 fixing scale data get in setter 2017-10-24 11:54:21 -04:00
Teddy Stoddard
a3ecb6e0e9 adding missing scale setter in setter 2017-10-24 02:16:39 -04:00
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
Ryan Foster
1d44d3a109 Fix saving replay buffer when no hotkey is set 
This commit makes saving the replay buffer not rely on whether or not a
hotkey is set in OBS.
 2017-10-19 05:34:39 -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
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
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