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

347 Commits

Author SHA1 Message Date
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
Stéphane L
bfb5570b7a scene item requests: defer updates to avoid triggering several transform events at once 2019-05-19 15:50:44 +02:00
Stéphane L
1e19cf7ccc server: don't reuse sockets on windows 
Other, conflicts with Port In Use detection
 2019-05-19 15:43:27 +02:00
Stéphane L
0d8999d64f GetVersion: bring back retrocompat version field 2019-05-19 13:41:23 +02:00
Stéphane Lepin
061ab12b10
Merge pull request #317 from Palakis/group-fixes 
Groups fixes
 2019-05-19 10:06:08 +02:00
Stéphane Lepin
c516e87180 text: rename settings dialog + dedup strings 2019-05-17 12:59:43 +02:00
Stéphane Lepin
de6bfdca0a SceneItems(docs): add comment about coordinates 2019-05-16 14:30:39 +02:00
Stéphane Lepin
788f70d5f3 Utils(GetSceneItemData): remove property isGroup 2019-05-16 13:57:38 +02:00
Stéphane Lepin
b0a35789f6 utils + sceneitem: fix docs again 2019-05-16 13:55:33 +02:00
Stéphane Lepin
eb7fbf011f utils + sceneitems: fix docs 2019-05-16 13:54:06 +02:00
Stéphane Lepin
50bb6e7204 Utils: add parent property to scene item info and transform data + refactor bits 2019-05-16 13:50:24 +02:00
Stéphane Lepin
15610bb296 Utils(GetSceneItemData): add children list 2019-05-16 13:37:04 +02:00
Stéphane Lepin
ae0ffdc4d5 docs: rename typedef Source to SceneItem 2019-05-16 13:12:18 +02:00
Stéphane Lepin
033a6929c3 Utils(GetSceneItemFromId): recurse into groups wip 2019-05-16 11:03:32 +02:00
Stéphane Lepin
7c8292a88d Utils(GetSceneItemFromName): recurse into groups wip 2019-05-16 11:00:29 +02:00
Stéphane Lepin
ab5dad7d91 Utils: oops 2019-05-15 13:11:15 +02:00
Stéphane Lepin
0744d215c6 utils(GetSceneItemData): add isGroup flag + move Source typedef here 2019-05-15 13:11:15 +02:00