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

81 Commits

Author SHA1 Message Date
VodBox
18468c17f2 Requests: Add scale.filter to Scene Item Properties 2021-03-03 20:02:01 +13:00
Stéphane Lepin
9bbfb73622 chore: safety-checks before accessing the result of GetConfig() 2021-02-24 19:06:08 +01:00
Stéphane Lepin
332876495d Utils: remove unused struct 2021-01-28 23:04:02 +01:00
tt2468
9859c7b25f Utils: Use obs_data_item_get_name in OBSDataGetDefaults 2021-01-20 04:21:43 -08:00
tt2468
488a57e2de Requests: Fix GetSourceDefaultSettings indentation and docs 2021-01-19 18:23:54 -08:00
tt2468
ffb34c3fd4 Requests: Add GetSourceDefaultSettings 
Adds a request, mainly for development purposes, which returns an
object of default settings for a given sourceKind (eg. `vlc_source`)
 2020-12-21 00:06:50 -08:00
Stéphane Lepin
96bd4141fd events: add recordingFilename property to RecordingStarted, RecordingStopping and RecordingStopped 2020-11-29 12:22:26 +01:00
Stéphane Lepin
e30dce8b21 Merge branch '4.x-current' into feature/createsource 2020-11-27 12:24:13 +01:00
Stéphane Lepin
56a17a9131
Merge pull request #560 from Palakis/enhancement/various-todos 
Requests: Scene collection and profile name checking
 2020-09-16 21:51:08 +02:00
Stéphane Lepin
7f1c4a1c4c Utils: simplified string list lookup 2020-09-15 17:12:34 +02:00
tt2468
6b254e0ad5 Requests: Add CreateSource and clean up code 2020-09-15 02:51:03 -07:00
Stéphane Lepin
d91b3f8dd9 Utils(GetTrayIcon): refactor with frontend API function 2020-07-28 02:23:31 +02:00
tt2468
9c4bd7a487 Requests: Scene collection and profile name checking 
For `SetCurrentProfile` and `SetCurrentSceneCollection`, check if it
exists before attempting to switch to it, and return an error if it
does not exist.
 2020-07-11 05:00:10 -07:00
Lars Bärtschi
948f6ccd95 Also change all other occurrences and documentation where int was used for transform position 2020-06-04 15:42:27 +02:00
Stéphane Lepin
8b731f3ba4 fixes 2020-03-29 23:55:45 +02:00
Stéphane Lepin
51ec3ede1f utils: add GetSceneItemFromRequestField 2020-03-29 21:42:10 +02:00
Stéphane Lepin
4e2302936f refactor bits 2020-03-29 21:41:38 +02:00
Stéphane Lepin
247ca71bf9 utils: remove dynloaded function for projector open 2020-03-17 23:46:24 +01:00
Stéphane Lepin
88d39ab47a utils: remove dynamic loaded functions for recording pause 2020-03-17 23:45:57 +01:00
Stéphane Lepin
6bed39e4fa
Merge pull request #410 from Lange/feat/transition-end-events 
feat(events): add "TransitionEnd" and "TransitionVideoEnd" events
 2020-03-15 23:21:53 +01:00
Stéphane Lepin
2a7aa432a9 events(TransitionEnd): remove from-scene because it's not available in transition_stop 2020-03-15 23:20:56 +01:00
Stéphane Lepin
061f5d5099 requests(OpenProjector): get function pointer from lib dynamically 2020-03-12 17:44:56 +01:00
Chris Angelico
be10227829 Utils,GetSceneItemProperties: Document both muted and alignment 2020-03-11 23:02:23 +11:00
Chris Angelico
ef47c172c5 Utils: Add a 'muted' flag to GetSceneItems 2020-03-11 22:52:33 +11:00
Stéphane Lepin
101b795c0a
Merge pull request #324 from Rosuav/show-gravity 
Show alignment (gravity) of scene elements when querying/switching scenes
 2020-03-04 13:49:58 +01:00
Alex Van Camp
e1cb57563a fix(events): don't advertise a false duration for fixed transitions 
Some transitions, such as Stingers, have a fixed duration. There is currently no way to retrieve this value from the API, and `obs-websocket` will currently return an incorrect value when one of these transitions begins.

For now, I think it is better to explicitly return -1, which is a better indicator that we have no idea what the real duration is, instead of a misleading number which users might think looks correct at first glance.
 2020-02-15 11:16:49 -06:00
Alex Van Camp
1057d765f7 feat(events): add "TransitionEnd" and "TransitionVideoEnd" events 
Adds events for `TransitionEnd` and `TransitionVideoEnd`.

`TransitionVideoEnd` is specific to Stinger transitions. It is fired when their video has actually completed playback. This is important, because `TransitionEnd` is fired at the cut point of the Stinger, which is nice to have but isn't always what the user might want.

This builds on #409, and should be merged after it.
 2020-02-15 11:15:46 -06:00
Stéphane Lepin
e52d86e6f9 Merge branch '4.x-current' into handler-protocol-refactor 2020-01-28 18:49:49 +01:00
Stéphane Lepin
3c0b5b0b43 Utils: fix memory leak in StartReplayBuffer 2020-01-28 18:49:37 +01:00
Stéphane Lepin
46068573c5 events: decouple events encoding from event emit 2020-01-28 18:37:25 +01:00
Stéphane Lepin
a8e5171b40 utils(GetSourceFilterInfo): fix settings memory leak 2019-11-11 14:27:40 +01:00
Stéphane Lepin
b8fcf0355c requests(GetSourceFilters): add "enabled" status field 2019-11-11 12:44:13 +01:00
Stéphane Lepin
af40aa59ab events + requests: fix dynamic runtime support for recording pauses 2019-09-03 13:50:44 +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
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
57ce3cf80b
Merge pull request #320 from Palakis/feature/remove-hacks 
utils: remove transition hacks
 2019-07-31 17:38:40 +02:00
Chris Angelico
c4b07b1a7b Merge remote-tracking branch 'origin/4.x-current' into show-gravity 2019-05-20 00:37:22 +10: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