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
1,385 Commits 6 Branches 45 Tags
Commit Graph

518 Commits

Author SHA1 Message Date
Stéphane Lepin
0c95e509dc events(Heartbeat + StreamStatus): add property "recording-paused" 2019-09-03 02:34:24 +02:00
Stéphane Lepin
46a006ed54 requests(pause recording): only compile recording pause function bodies when supported 2019-09-03 02:34:24 +02:00
Stéphane Lepin
0cc9378d05 requests: add PauseRecording and ResumeRecording 2019-09-03 02:34:24 +02:00
Stéphane Lepin
f3edb2ee68 events: refactor the massive if else chain in the frontend event callback 2019-09-03 02:34:11 +02:00
Stéphane Lepin
d7f5c042bf WSServer: handle error codes when sending a message 2019-09-01 00:16:09 +02:00
Stéphane Lepin
1ee5857139 WSEvents(nsToTimestamp): use unsigned long long constants 2019-08-31 21:35:58 +02:00
Stéphane Lepin
2f9c2b0d65 WSEvents(nsToTimestamp): fix sprintf format warning 2019-08-31 18:34:49 +02:00
Stéphane Lepin
d492d74a64 module: start server after OBS finishes loading 2019-08-31 16:03:32 +02:00
Stéphane Lepin
b0c03d4f47 events(GetStats): fix recording path detection 2019-08-31 04:31:40 +02:00
Stéphane Lepin
a034fbba83 utils(GetSceneItemFromItem): fix memory leaks with obs_data_item_t uses 2019-08-31 03:10:49 +02:00
Stéphane Lepin
73b5261c49 requests(ReorderSceneItems): atomic reorder + bring back GetSceneItemFromId 2019-08-31 03:03:32 +02:00
Stéphane Lepin
cee0cbebc2 Utils: use obs_scene_t* directly for scene-related helpers 2019-08-31 03:03:32 +02:00
Stéphane Lepin
9723147429 Utils: refactor GetSceneItemFromItem and get rid of GetSceneItemFromId 2019-08-31 03:03:32 +02:00
Stéphane Lepin
dca385ae87 requests(ReorderSceneItems): refactor 2019-08-31 03:03:32 +02:00
Stéphane Lepin
71f792944c request handler: fix obs_data_item_t memory leak 2019-08-31 02:52:08 +02:00
Stéphane Lepin
6041c4acd2
Merge pull request #364 from Palakis/bugfix/transitionbegin-cut-duration 
event(TransitionBegin): set duration to 0 if it's a Cut transition
 2019-08-30 14:10:46 +02:00
Stéphane Lepin
4bbaa75f41
Merge pull request #358 from Palakis/request-helpers 
Extend WSRequestHandler::hasField() to support field type checking
 2019-08-30 13:50:25 +02:00
Stéphane Lepin
5fe9314b74 WSEvents: remove unused transitionIsCut helper 2019-08-30 13:41:50 +02:00
Stéphane Lepin
bfd26493ab Utils(GetTransitionDuration): return 0 if transition is a cut transition 2019-08-30 13:41:08 +02:00
Stéphane Lepin
5d74d5d03e WSEvents(OnTransitionBegin): refactor event code 2019-08-30 13:36:45 +02:00
Stéphane Lepin
b25d8d8201 requests(sources): fix linux browser source id 2019-08-26 21:01:05 +02:00
ZyanKLee
9e4fc9eb73
allow for "linuxbrowser_source" to be controlled 
based on the request at https://github.com/bazukas/obs-linuxbrowser/issues/46 I did a quick search for the string "browser_source" and these seem to be the only two occurrences. Enhancing the conditional with the identifier of the obs-linuxbrowser plugin, this should solve the problem.

As I'm currently not at home, I can't verify this does what it should, but I will test it later tonight.

@mjc666 if you are still interested please give it a test run to verify if these two plugins work together now.
 2019-08-22 19:44:12 +02:00
Stéphane Lepin
fb0d13a171 WSRequestHandler: add int and double type check methods 2019-08-02 21:52:50 +02:00
Stéphane Lepin
f097b36c2e WSRequestHandler: add type checks for field test methods 2019-08-02 21:40:42 +02:00
Stéphane Lepin
57ce3cf80b
Merge pull request #320 from Palakis/feature/remove-hacks 
utils: remove transition hacks
 2019-07-31 17:38:40 +02:00
Juliane Holzt
9c1871494e
Fix spec of HandleBroadcastCustomMessage 2019-07-26 14:40:54 +02:00
Stéphane Lepin
fb0a57003c BroadcastCustomMessage: fix command and event spec 2019-07-26 09:30:30 +02:00
Juliane Holzt
4af46ac2b9
use obs_data_t* in Event function 2019-07-25 17:20:31 +02:00
Juliane Holzt
8d39752bda
Move event emitting code 2019-07-25 17:00:32 +02:00
Juliane Holzt
e3ff9c013e
change function name, language 2019-07-25 14:47:47 +02:00
Juliane Holzt
635870ba4b
more comment fixes 2019-07-24 05:36:47 +02:00
Juliane Holzt
a827afb05b
Comment fix 2019-07-24 01:56:53 +02:00
Juliane Holzt
0195e13bdc
Implement proposed changes to Broadcast 2019-07-23 21:47:55 +02:00
Juliane Holzt
76d8b688fd
Add Code for BroadcastWebSocketMessage 2019-07-22 01:05:21 +02:00
Stéphane Lepin
ac2ae90e8a
Merge pull request #343 from Palakis/feature/outputs-api 
Outputs API
 2019-07-16 18:22:40 +02:00
Stéphane Lepin
0b5cb76b5d outputs: remove TODOs 2019-07-16 18:22:07 +02:00
Stéphane Lepin
65a1f8b746
GetSourceTypesList: fix docs 
Fixes #348
 2019-06-18 18:38:52 +02:00
Stéphane Lepin
2225dec2a9 docs(SourceAudioMixersChanged): fix remaining discrepancy 2019-06-16 16:19:22 +02:00
Stéphane Lepin
e32fff3f61 docs(SourceAudioMixersChanged): fix discrepancy 2019-06-16 16:14:26 +02:00
Stéphane Lepin
0b42e3d0f3 outputs: add more info fields 2019-06-11 19:32:52 +02:00
Stéphane Lepin
6fed6f9f7d StartOutput: provide output error message when start fails 2019-06-11 19:32:52 +02:00
Stéphane Lepin
480945073a outputs: start or stop only when possible 2019-06-11 19:32:52 +02:00
Stéphane Lepin
ef6df94838 outputs: todos 2019-06-11 19:32:52 +02:00
Stéphane Lepin
fb05848426 requests: outputs API WIP 2019-06-11 19:32:52 +02:00
Stéphane L
e5be6b96fb general: version bump to 4.7 2019-06-11 19:32:32 +02:00
Stéphane Lepin
585f8450e1
Merge pull request #330 from Palakis/transitionbegin-hotfix 
Fix TransitionBegin event
 2019-05-21 00:05:24 +02:00
Stéphane L
d3401db5fe general: version bump to 4.6.1 2019-05-21 00:02:48 +02:00
Stéphane L
45dc6447bf events: fix how and when TransitionBegin is hooked 2019-05-20 23:54:13 +02:00
Stéphane L
409c270ba2 events: fix TransitionBegin event not triggering 2019-05-20 23:48:49 +02:00
Stéphane L
07ebbe56e6 docs: fix typos 
Fixes #328
Fixes #329
 2019-05-20 21:14:14 +02:00