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

509 Commits

Author SHA1 Message Date
tt2468
c02f40beb6
Update WSRequestHandler_Streaming.cpp 2020-02-15 14:18:25 -08:00
tt2468
79a7b444a2
Update WSRequestHandler_Streaming.cpp 2020-02-15 11:00:24 -08:00
tt2468
9c11bbc7a1
Update WSRequestHandler_Streaming.cpp 2020-02-15 10:58:10 -08: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
tt2468
30db1a8a63
Update WSRequestHandler_Streaming.cpp 2020-02-15 08:50:09 -08:00
Stéphane Lepin
40ea7cfe15
Merge pull request #409 from Lange/feat/transition-type 
feat(events): add "type" field to TransitionBegin
 2020-02-15 17:29:08 +01:00
tt2468
b3b2ae267a
Update WSRequestHandler_Streaming.cpp 2020-02-15 07:39:01 -08:00
Stéphane Lepin
6917ac48a3 WSEvents: fix recording time field 2020-02-15 13:00:58 +01:00
Alex Van Camp
c326d65ad3 feat(events): add "type" field to TransitionBegin 
This field reports the type of the transition (`obs_stinger_transition`, `fade_to_color_transition`, etc), which can be useful for code which needs to react differently depending on what type of transition is being played.

Of note is that OBS calls this an `id`, but I think that's kind of a misleading name. `type` seems like a more semantic name for this information to me, but I'm open to changing it if we want to stay consistent with the nomenclature that OBS itself uses.
 2020-02-06 18:04:08 -06:00
Stéphane Lepin
6953bc6105 Utils: turn it into a namespace 2020-01-29 17:24:45 +01:00
Stéphane Lepin
209555d36d Merge branch '4.x-current' into open-projector 2020-01-29 14:23:47 +01:00
Stéphane Lepin
02fea8938a OBSRemoteProtocol(processMessage): fix field order 2020-01-29 13:16:47 +01:00
Stéphane Lepin
f5277e4931 Merge branch '4.x-current' into handler-protocol-refactor 2020-01-29 12:30:24 +01:00
Stéphane Lepin
8447395482 requests(GetCurrentSceneCollection): fix memory leak 2020-01-29 12:20:23 +01:00
Stéphane Lepin
915a7b6e15 requests(GetCurrentProfile): fix memory leak 2020-01-29 12:18:11 +01:00
Stéphane Lepin
b70c39789e events(Heartbeat): fix memory leak 2020-01-29 12:17:15 +01:00
Stéphane Lepin
865cb4857b RpcEvent: refactor fields to additionalFields 2020-01-29 11:13:42 +01:00
Stéphane Lepin
774abd66fa RpcEvent + RpcRequest: move accessors into declaration 2020-01-28 18:59:35 +01: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
06c29b7810
Merge branch '4.x-current' into handler-protocol-refactor 2020-01-28 17:05:15 +01:00
Stéphane Lepin
631452567d OBSRemoteProtocol: correctly handling null message IDs 2020-01-28 17:02:25 +01:00
Stéphane Lepin
6c34f00cfe OBSRemoteProtocol(errorResponse): add missing additionalFields 2020-01-28 16:52:11 +01:00
Stéphane Lepin
208c7f18b2 OBSRemoteProtocol: refactor class + pass handler when calling processMessage 2020-01-28 16:49:35 +01:00
Stéphane Lepin
5e393ed3c4 OBSRemoteProtocol(buildResponse): fix release of obs_data_t 2020-01-28 16:41:42 +01:00
Stéphane Lepin
8b16abd370 OBSRemoteProtocol: fix mixed indents 2020-01-28 16:38:57 +01:00
Stéphane Lepin
6bfe533a20 chore: fix quality warnings 2020-01-28 16:16:19 +01:00
Stéphane Lepin
f0b8aad4b1 docs(SetSourceFilterVisibility): fix filterEnabled type 2020-01-28 16:07:19 +01:00
Erik Guzman
0f6cbb0c5c Switch from using caption_text1 to caption_text2 
- caption_text1 has a built in delay of 2 seconds for all captions that causes every increasing delays for captions
 2019-11-28 12:59:36 -08:00
Chris Angelico
78584b3194 Fix version number in message 2019-11-26 00:59:57 +11:00
Chris Angelico
c0eb4d652b Mention the OBS version requirement in the docos 2019-11-26 00:58:28 +11:00
Chris Angelico
edbb28038f Guard open_projector() with a version check. 
I can't find a way to probe for an actual feature here.
 2019-11-25 22:36:17 +11:00
Chris Angelico
3b7e9b4eba Create a command for opening a projector. 
Depends on obs-studio#1910 for back end functionality.
 2019-11-25 16:21:28 +11:00
Chris Angelico
6d0d07abfe Fire an event whenever an item is locked/unlocked 2019-11-25 16:21:17 +11:00
Stéphane Lepin
e9f90b4990 OBSRemoteProtocol: fix params 2019-11-15 23:39:31 +01:00
Stéphane Lepin
d25b65c124 RpcResponse: fixes 2019-11-15 22:59:36 +01:00
Stéphane Lepin
5864864123 WSServer: reimplement protocol 2019-11-15 21:07:58 +01:00
Stéphane Lepin
2f244ae37e WSRequestHandler(SceneItems): fix error message 2019-11-15 20:54:06 +01:00
Stéphane Lepin
f83317f7c8 WSRequestHandler(SceneItems): fix DuplicateSceneItem 2019-11-15 20:39:39 +01:00
Stéphane Lepin
973b4b9f70 RpcRequest: fix forward declarations 2019-11-15 20:33:26 +01:00
Stéphane Lepin
9389ceaf4f WSRequestHandler(SceneItems): fixes 2019-11-15 20:33:13 +01:00
Stéphane Lepin
928dc30810 WSRequestHandler(Sources): fixes 2019-11-15 20:30:44 +01:00
Stéphane Lepin
c9d6d10995 WSRequesthandler(Scenes): fixes 2019-11-15 20:29:22 +01:00
Stéphane Lepin
9323e1cf59 WSRequestHandler(Streaming): fixes 2019-11-15 20:28:42 +01:00
Stéphane Lepin
93a456ca82 WSRequestHandler(StudioMode): fixes 2019-11-15 20:27:27 +01:00
Stéphane Lepin
f6693d5587 WSRequestHandler(Transitions): fixes 2019-11-15 20:26:44 +01:00
Stéphane Lepin
fd09a0ce54 WSRequestHandler(SceneCollections): fixes 2019-11-15 20:26:00 +01:00
Stéphane Lepin
50d3a2600e WSRequestHandler(ReplayBuffer): fixes 2019-11-15 20:25:28 +01:00