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

1206 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stéphane Lepin
8311bd3fd9
Merge pull request #416 from tt2468/4.x-current 
Fix SetStreamSettings when switching type
 2020-03-04 11:37:01 +01:00
Stéphane Lepin
ec1926f7a6 events: fix @since value for SceneItemLockedChanged 2020-03-04 11:26:48 +01:00
Travis CI
e1c92956f8 docs(travis): Update protocol.md - 9233d4f [skip ci] 2020-03-04 09:57:04 +00:00
Stéphane Lepin
9233d4f6dc
Merge pull request #411 from Lange/fix/fixed-duration-transitions 
fix(events): don't advertise a false duration for fixed transitions
 2020-03-04 10:56:14 +01:00
Stéphane Lepin
f2f5661625 cmake: fix redundant c++ standard flag 2020-02-25 15:32:47 +01:00
Stéphane Lepin
4338cf57e6 OBSRemoteProtocol: rely only on event data when encoding an event 2020-02-25 15:24:26 +01:00
Stéphane Lepin
a0dce77a2f RpcEvent: streamTime and recordingTime are optional 2020-02-25 15:23:24 +01:00
tt2468
ca93882870
Remove unnecessary utf8 string conversion 2020-02-15 14:51:59 -08:00
tt2468
22fbb4262c
Return check type instead of type provided in request 2020-02-15 14:47:46 -08:00
tt2468
2845fd07a7
Final fixes before testing 2020-02-15 14:22:35 -08:00
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
Travis CI
c7b49b28c2 docs(travis): Update protocol.md - 40ea7cf [skip ci] 2020-02-15 16:29:59 +00: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
88176f4d2b
Merge pull request #413 from Palakis/bugfix/event-recording-time-fix 
WSEvents: fix recording time field after refactoring
 2020-02-15 14:45:49 +01: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
e1a2f0c0f4
Merge pull request #405 from Palakis/utils-to-namespace 
Utils: turn it into a namespace
 2020-01-29 18:20:55 +01: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
e65958f33e
Merge pull request #390 from Palakis/handler-protocol-refactor 
Request handler refactor
 2020-01-29 14:06:46 +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
d78ed32df5
Merge pull request #404 from Palakis/bugfix/memory-leaks 
Fix memory leaks in GetCurrentProfile, GetCurrentSceneCollection and Heartbeat event
 2020-01-29 12:28:48 +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
Travis CI
94c232d78e docs(travis): Update protocol.md - 4b41c52 [skip ci] 2020-01-28 15:32:31 +00:00
Stéphane Lepin
4b41c52522
Merge pull request #397 from justweb1/patch-1 
Fix SetSourceFilterVisibility filterEnabled type
 2020-01-28 16:31:38 +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
Stéphane Lepin
796cf36a7f
Merge pull request #400 from dmerrick/patch-1 
Update README to include MacOS
 2020-01-28 15:54:26 +01:00
Stéphane Lepin
7706d66754
Merge pull request #401 from dmerrick/patch-2 
Update README to add Golang package
 2020-01-28 15:54:02 +01:00
Dana Merrick
d992536914
Update README.md 2019-12-29 13:05:16 -05:00