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

1626 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
a539f23194
Update README.md 2019-09-02 17:53:18 +02:00
Stéphane Lepin
6b6dec79c5
Merge pull request #369 from Palakis/bugfix/connection-onclose-broadcast-crash 
WSServer: handle error codes to avoid throwing exceptions when sending a message
 2019-09-02 12:52:58 +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
2fe9812b26 gitignore: .idea folder 2019-09-01 00:04:31 +02:00
Stéphane Lepin
1c15c3c7a3
Merge pull request #368 from Palakis/bugfix/timecode-sprintf-warning 
WSEvents(nsToTimestamp): fix sprintf format warning
 2019-08-31 21:50:46 +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
6e5161f43b
Merge pull request #367 from Palakis/bugfix/start-server-after-loading-finished 
Start server after OBS finishes loading
 2019-08-31 17:39:08 +02:00
Stéphane Lepin
d492d74a64 module: start server after OBS finishes loading 2019-08-31 16:03:32 +02:00
Stéphane Lepin
26506731c5
Merge pull request #366 from Palakis/bugfix/incorrect-recording-free-space 
events(GetStats): fix recording path detection
 2019-08-31 04:50:40 +02:00
Stéphane Lepin
b0c03d4f47 events(GetStats): fix recording path detection 2019-08-31 04:31:40 +02:00
Stéphane Lepin
3bc8348c32
Merge pull request #365 from Palakis/bugfix/reordersceneitems-crash 
ReorderSceneItems: fix crash + refactor Utils
 2019-08-31 03:29:21 +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
Travis CI
0c7529705e docs(travis): Update protocol.md - 63f1ea1 [skip ci] 2019-08-30 11:54:21 +00:00
Stéphane Lepin
63f1ea1cec docs: bump docs version to 4.7.0 2019-08-30 13:53:11 +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
3142e097a5
Merge pull request #360 from ZyanKLee/patch-1 
allow for "linuxbrowser_source" to be controlled
 2019-08-26 21:02:00 +02:00
Stéphane Lepin
b25d8d8201 requests(sources): fix linux browser source id 2019-08-26 21:01:05 +02:00
Stéphane Lepin
7e68cd016a ci(windows): exclude RCs when fetching the latest version of OBS 2019-08-24 12:39:46 +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
Travis CI
c1da62391f docs(travis): Update protocol.md - d8882ce [skip ci] 2019-07-31 15:37:41 +00:00
Stéphane Lepin
d8882ce979
Merge pull request #357 from julijane/fix-001 
Fix spec of HandleBroadcastCustomMessage
 2019-07-31 17:36:39 +02:00
Juliane Holzt
9c1871494e
Fix spec of HandleBroadcastCustomMessage 2019-07-26 14:40:54 +02:00
Travis CI
ac26c9114a docs(travis): Update protocol.md - fb0a570 [skip ci] 2019-07-26 07:31:42 +00:00
Stéphane Lepin
fb0a57003c BroadcastCustomMessage: fix command and event spec 2019-07-26 09:30:30 +02:00
Travis CI
cda22233a6 docs(travis): Update protocol.md - add3075 [skip ci] 2019-07-26 03:52:35 +00:00
Stéphane Lepin
add307577d
Merge pull request #354 from julijane/4.x-current 
Make it possible to broadcast messages (data) to other websocket clients
 2019-07-26 05:51:42 +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
Travis CI
b4857e2c79 docs(travis): Update protocol.md - ac2ae90 [skip ci] 2019-07-16 16:23:36 +00:00
Stéphane Lepin
ac2ae90e8a
Merge pull request #343 from Palakis/feature/outputs-api 
Outputs API
 2019-07-16 18:22:40 +02:00