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
Stéphane Lepin
a53df39e46 requests(transitions): yet another doc fix 2020-11-27 16:15:03 +01:00
Stéphane Lepin
98187e2bd7 requests(transitions): documentation fixes cont. 2020-11-27 16:10:38 +01:00
Stéphane Lepin
3ab7de99f3 requests(transitions): documentation fixes 2020-11-27 16:03:21 +01:00
Stéphane Lepin
6d12af3858 Merge branch '4.x-current' into feature/t-bar 2020-11-27 12:23:47 +01:00
Stéphane Lepin
3d7511ca75
Merge pull request #605 from Palakis/feature/get-set-transition-settings 
Get/Set Transition Settings
 2020-11-27 12:18:50 +01:00
Stéphane Lepin
acd3940a7b
Merge pull request #593 from Palakis/feature/getsceneitemlist-default-scene 
requests(GetSceneItemList): fallback to current scene if sceneName is not specified
 2020-10-25 19:34:11 +01:00
Stéphane Lepin
8ba441da7f requests(transitions): remove TODO 2020-10-25 19:33:42 +01:00
Stéphane Lepin
5d9d5e0746 request(SetSourceSettings): remove redundant obs_data_apply step 2020-10-25 19:25:48 +01:00
Stéphane Lepin
7a31e88ed6 requests: add GetTransitionSettings and SetTransitionSettings 2020-10-25 19:25:26 +01:00
tt2468
0be5564ce7
Docs: Fix typo 2020-09-30 15:57:13 -07:00
tt2468
e7c8c1d6b6
Requests: Update hotkey docs and rename some variables 2020-09-30 15:02:59 -07:00
LorenaGdL
449ad6d13c PR review changes: Modify requests names 
Changes requests names to "TriggerHotkeyByName" and "TriggerHotkeyBySequence"
 2020-09-30 19:15:23 +00:00
Stéphane Lepin
4a4c97aac4 request(GetSceneItemList): provide scene name in response 2020-09-29 23:48:35 +02:00
Stéphane Lepin
4491da0350 requests(GetSceneItemList): fix empty/non-present parameter detection 2020-09-29 23:48:17 +02:00
Stéphane Lepin
32960afc1b requests(GetSceneItemList): update docs 2020-09-29 19:45:07 +02:00
Stéphane Lepin
46f624e3b9 requests(GetSceneItemList): fallback to current scene if sceneName is not specified 2020-09-29 19:37:28 +02:00
LorenaGdL
9daae857de Requests: Add ProcessHotkeyByCombination 
Adds a new request called `ProcessHotkeyByCombination` which calls the
routine associated with a given hotkey. The hotkey is identified by the
combination of keys set by the user to trigger it. Multiple routines
are called if the same combination is bound to different hotkeys.
 2020-09-29 13:43:00 +00:00
LorenaGdL
bac5b1551b Requests: Add ProcessHotkeyByName 
Adds a new request called `ProcessHotkeyByName` which calls the routine
associated with a given hotkey. The hotkey is identified by the unique
name set while registering it. Works with both OBS default hotkeys and
hotkeys added by plugins/scripts.
 2020-09-29 13:38:32 +00: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
a148f7fd7c requests(Profiles + SceneCollections): fix crash on change 2020-09-16 21:45:31 +02:00
Stéphane Lepin
0dd0d01e8f requests(Profiles + SceneCollections): don't use QString where it is not needed 2020-09-15 18:17:45 +02:00
Stéphane Lepin
bcd16d791c
Merge pull request #559 from Palakis/enhancement/ipv4-option 
Settings: Add option to lock binding to IPv4
 2020-09-15 17:19:27 +02:00
Stéphane Lepin
539e636939 requests(SceneCollections): fix typo (profiles instead of scene collections) 2020-09-15 17:14:53 +02:00
Stéphane Lepin
7f1c4a1c4c Utils: simplified string list lookup 2020-09-15 17:12:34 +02:00
Stéphane Lepin
f3ab2100f0
Merge pull request #578 from Palakis/fix/request-versions 
Docs: Fix requests marked as "unreleased"
 2020-09-15 11:35:46 +02:00
tt2468
a51ad1383b Docs: Fix requests marked as "unreleased" 2020-08-12 16:54:03 -07:00
tt2468
1dd96fa714
Docs: Add enabled field to SourceFiltersReordered 
Was noticed in Discord that this was missing from the docs
 2020-07-31 22:08:07 -07:00
Stéphane Lepin
d91b3f8dd9 Utils(GetTrayIcon): refactor with frontend API function 2020-07-28 02:23:31 +02:00
Stéphane Lepin
2e32b7e299
Merge branch '4.x-current' into enhancement/various-todos 2020-07-15 15:02:00 +02:00
Stéphane Lepin
94269c0640
Merge pull request #557 from julijane/feature-screenshot-default 
TakeSourceScreenshot: default to current scene
 2020-07-15 15:00:43 +02:00
tt2468
ac9c6b4a1f Docs: Fix GDIPlus requests documentation 
`bk-color` and `bk-opacity` are actually `bk_color` and `bk_opacity`
respectively. Issue reported in #561
 2020-07-12 02:22:26 -07:00
tt2468
aa8fa00811 Docs: More updates 
Changes the media stuff's `@since 4.9.0` to `@since unreleased`
to reduce potential confusion on the docs. As a part of the final
4.9.0 commits, I will be changing it back to 4.9.0. We also fix the
contributing document since it was all messed up.
 2020-07-11 05:26:49 -07: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
tt2468
eb00294bbb Settings: Add option to lock binding to IPv4 
WebsocketPP defaults to binding to an IPv6 interface. Since IPv6
is broken on so many networks, this adds an option to force WebsocketPP
to use the default IPv4 interface to bind to.
 2020-07-09 22:21:48 -07:00
tt2468
9cdb32d56a Docs: Various docs improvements 
I noticed that some parts of the docs were inconsistent/lacking.
Decided to go through all of them and update them.
 2020-07-09 03:27:44 -07:00
Juliane Holzt
31a505f4a4
Do it when sourceName is omitted 2020-07-09 00:50:29 +02:00
Juliane Holzt
bfa6cd0e19
TakeSourceScreenshot: default to current scene 2020-07-09 00:43:54 +02:00
Stéphane Lepin
c51ecda6b4
Merge pull request #527 from Palakis/feature/component-management 
Requests: Sceneitem manipulation requests
 2020-07-03 18:21:01 +02:00
tt2468
513bd1372b Docs, Requests: Fix GetSceneItemList code revisions 
Replace the `sourceId` term with `sourceKind` to match everything else.
 2020-07-03 07:12:28 -07:00
tt2468
355cee0db9 Merge branch '4.x-current' into feature/component-management 2020-07-03 07:07:52 -07:00
tt2468
38936173d1 Requests/Events: Use sourceKind instead of sourceTypeId 
Left in some old terms accidentally. This fixes it.
 2020-07-03 07:03:25 -07:00
Stéphane Lepin
eea56b4c71
Merge pull request #497 from Palakis/category-mediacontrol 
Requests/Events: Media Source/VLC
 2020-07-03 15:56:21 +02:00
Stéphane Lepin
802cc3a48f
Apply suggestions from code review 2020-07-03 15:48:56 +02:00
Stéphane Lepin
68db13fc24
Merge pull request #549 from Palakis/feature/more-output-statuses 
Requests: Add Replay Buffer and Recording Statuses
 2020-07-03 14:29:25 +02:00
tt2468
2d4dd580b4
Merge pull request #547 from WizardCM/audio-active 
Requests, Events: Add support for Audio Active
 2020-07-03 03:42:36 -07:00
Matt Gajownik
d03e94ada8 events: Add support for audio_active, fix docs version 2020-07-03 03:30:58 -07:00
tt2468
4ead1c3de5 Requests: Add Replay Buffer and Recording Statuses 
Adds `GetReplayBufferStatus` and `GetRecordingStatus`.

v5.0 Will remove the recording status functionality from
`GetStreamingStatus`
 2020-07-03 02:26:38 -07:00
tt2468
fdcba2734d Events, Docs: Refactor media events and improve docs 
Move duplicated functionality to a helper function and added some docs
clarifying the behavior of the events, and fixed a few typos in
the request handlers.
 2020-07-02 13:13:19 -07:00
Stéphane Lepin
981ba7b28f
Merge pull request #529 from Palakis/fix/getvolumedecibel 
Requests: Fix useDecibel response when volume is -infinity
 2020-07-02 21:08:45 +02:00
Matt Gajownik
822a1751a2 requests: Add support for audio_active 2020-07-01 22:23:22 +10:00