Commit Graph

200 Commits

Author SHA1 Message Date
tt2468
aac06b101e RequestHandler: Add GetInputList 2021-06-16 00:49:07 -07:00
tt2468
9af7216891 RequestHandler: Don't error out on null optional parameters 2021-06-16 00:43:46 -07:00
tt2468
efdea72987 RequestHandler: Add RemoveScene 2021-06-15 23:57:48 -07:00
tt2468
9088cb4db8 EventHandler: Add note to SceneItemRemoved 2021-06-15 23:48:16 -07:00
tt2468
b95a2e648f RequestHandler: Add more scene requests 2021-06-15 00:21:57 -07:00
tt2468
c5af073780 RequestHandler: Add more scene requests 2021-06-14 23:42:18 -07:00
tt2468
cb5ee53956 RequestHandler: Add GetSceneList 2021-06-14 22:52:23 -07:00
tt2468
f26cf8f95f RequestHandler: Add screenshot requests 2021-06-14 22:33:01 -07:00
tt2468
52204a9eec WebSocketServer: Log connects and disconnects 2021-06-14 20:50:50 -07:00
tt2468
80b9732f94 RequestHandler: Some source stuff 2021-06-13 07:14:40 -07:00
tt2468
17cbde0e48 Utils: Queue notifications in the UI thread
Soooooooooo apparently doing notifications natively shouldn't even
work. This is probably what was crashing OBS in 4.x. Fixed now I
guess...
2021-06-13 07:12:19 -07:00
tt2468
aaadf4d2ff EventHandler: Remove unnecessary calldata helper 2021-06-13 04:50:04 -07:00
tt2468
ebbb1391fe EventHandler: Add more scene item events 2021-06-13 04:49:49 -07:00
tt2468
fb699b0414 Base: Fix missing arguments for tray notifications 2021-06-13 04:16:22 -07:00
tt2468
33ba2d2415 EventHandler: Remove old logging
oops
2021-06-13 04:02:17 -07:00
tt2468
abfc6f0b28 SettingsDialog: Add todo
Maybe someday I'll actually do this todo.
2021-06-13 04:01:21 -07:00
tt2468
c9619ce215 Base: Add system tray notifications
Final "UI" part of the plugin to be completed. I'm annoyed at how
many includes are required in order to implement this feature. It
breaks quite a bit of the modularity of the plugin because suddenly
everything has to include obs libraries (for translations)
2021-06-13 03:58:15 -07:00
tt2468
bbc504ce72 WebSocketServer: Remove unnecessary signals 2021-06-13 03:24:22 -07:00
tt2468
0de3f304f0 Utils: Add platform util to send tray notification 2021-06-13 03:17:11 -07:00
tt2468
57794a2bf5 SettingsDialog: Show confirmation when a custom password is used 2021-06-13 03:04:08 -07:00
tt2468
945816ce92 EventHandler: Add sceneItemIndex to certain events 2021-06-13 02:43:00 -07:00
tt2468
1f791825ef EventHandler: Return basic list for SceneItemListReindexed
Events can be tricky when it comes to the size of payloads. Many
embedded devices can have troubles receiving large payloads, so
we should be mindful of that. It is much harder to avoid large
payload sizes as a client for events than it is for requests.
Clients that need the data not included here should either cache
it from other sources or grab it fresh.
2021-06-13 02:18:02 -07:00
tt2468
971dd6713b Utils: Flip index of GetSceneList()
OBS likes to start indexes with 0 at the bottom (eg. scene items),
so it's good to match that
2021-06-13 02:15:43 -07:00
tt2468
38c47bc76f EventHandler: Rename SceneListReindexed to SceneListChanged 2021-06-13 02:11:14 -07:00
tt2468
129ee12542 EventHandler: More scene item events 2021-06-13 02:10:18 -07:00
tt2468
10afbdfca0 Utils: Add scene item list helper 2021-06-13 02:10:04 -07:00
tt2468
1d4d77cc93 EventHandler: Put high volume events into high volume category 2021-06-13 00:51:38 -07:00
tt2468
7716b30c27 EventHandler: Minor refactor and some event additions 2021-06-13 00:46:42 -07:00
tt2468
20a04a131b EventHandler: Remove unnecessary refcount stuff
Pointers in calldata are theoretically already incremented,
so incrementing their refcount then decrementing them is
unnecessary in the context of the event system.
2021-06-13 00:43:11 -07:00
tt2468
f81a5be43b EventHandler: Fix current profile/scene collection memory leaks 2021-06-13 00:39:52 -07:00
tt2468
f608423045 EventHandler: Remove unnecessary CPU usage info 2021-06-12 22:59:47 -07:00
tt2468
413b76d9a6 Utils: Minor nitpick 2021-06-12 22:17:55 -07:00
tt2468
ca26f679c8 EventHandler: Add ReplayBufferSaved 2021-06-12 20:34:24 -07:00
tt2468
4503b6ed05 Utils: Add string helper to get last replay 2021-06-12 20:34:08 -07:00
tt2468
4a00d169e1 RequestHandler: Add some config requests 2021-06-07 01:14:32 -07:00
tt2468
62d2b3e4cd RequestStatus: Add KeyNotFound 2021-06-07 01:12:32 -07:00
tt2468
e15acf9065 Utils: Add helpers to get some current data 2021-06-07 01:12:01 -07:00
tt2468
136a270473 Request: Fix missing requestData check 2021-06-07 01:11:20 -07:00
tt2468
2c018ca174 RequestHandler: Add some requests from the General category 2021-06-06 05:06:17 -07:00
tt2468
5e49ee2569 SettingsDialog: A few improvements 2021-06-06 00:47:52 -07:00
tt2468
3852a387b5 SettingsDialog: Attempt at fixing tooltip icon on Windows 2021-06-06 00:33:53 -07:00
tt2468
ed79da92e0 Utils::Platform: Fix minor ip recognition bug 2021-06-06 00:02:59 -07:00
tt2468
d3c7f4b3fd WebSocketProtocol: Remove availableRequests from Hello 2021-06-05 23:54:11 -07:00
tt2468
d375bbc98b Utils::Platform: Refactor GetLocalAddress()
It was pointed out that the existing functionality was not effective
at filtering out invalid interfaces, so we add a priority system
to try harder at finding a valid address.
2021-06-05 23:39:06 -07:00
tt2468
1ecf1e5dfd SettingsDialog: Log when restart is required 2021-06-05 23:09:02 -07:00
tt2468
e709d3fad5 SettingsDialog: Fix build (oops) 2021-06-05 23:07:47 -07:00
tt2468
a7c4f98ffa SettingsDialog: Add tooltip icon to debug checkbox 2021-06-05 23:06:36 -07:00
tt2468
3d0ba91ff2 SettingsDialog: Restart websocket server if debug mode changed
The functionality of not reloading the server when debug mode is
changed I determined was too confusing to use considering the
benefit that it provides by not reloading the websocket server.

It is technically possible to set debug mode to the server while
it is running, however the implementation would somewhat dirty the
UI code, so I do not feel comfortable doing it at this point.
2021-06-05 22:23:57 -07:00
tt2468
f0c3bb2c14 Config: Don't persist debug mode to config
A request from the OBS developers. Debug mode tends to be enabled,
then not remembered to be disabled, leading to logs that are both
long and difficult to read. In some cases, the OBS logviewer may
noticeably lock up the UI just trying to parse the long log file.
2021-06-05 22:19:39 -07:00
tt2468
81636dcbfa SettingsDialog: Show confirmation when video is active
Show a confirmation dialog when the Show Connect Info button is
clicked and video is active, to prevent users from
unintentionally showing sensitive information while live.
2021-06-05 21:38:16 -07:00
tt2468
3cc612cb1c SettingsDialog: Redesign settings sections 2021-06-05 21:20:11 -07:00
tt2468
19375921d3 EventHandler: Add media input events 2021-05-31 21:44:03 -07:00
tt2468
6c03b86514 EventHandler: Add Outputs events and other files 2021-05-31 18:51:56 -07:00
tt2468
9077ac911d EventHandler: Add some transition stuff
Transitions in OBS are implemented badly.
Not sure what will reasonably be possible with them.
I'll probably save implementing them for last
2021-05-14 03:59:00 -07:00
tt2468
becf604fc3 EventHandler: Add missing input event fields 2021-05-14 01:39:06 -07:00
tt2468
e4fbebb3b4 Utils: Always return a JSON object 2021-05-14 01:38:51 -07:00
tt2468
45d62e5ce0 EventHandler: General, Config, Scenes, Inputs 2021-05-14 01:13:27 -07:00
tt2468
c8eac893f2 Utils: Add more OBS utils 2021-05-14 01:13:09 -07:00
tt2468
ab12d5f39f EventHandler: Add some events 2021-05-13 19:11:19 -07:00
tt2468
f0d68f3eec WebSocketProtocol: Remove availableEvents from Hello
Not reasonably possible with the current structure of the `EventHandler`
2021-05-13 17:48:10 -07:00
tt2468
680b5c470e RequestHander: Add GetRequestList() 2021-05-13 17:46:05 -07:00
tt2468
11d28d17f1 EventHandler: Add EventSubscriptions enum 2021-05-13 17:34:57 -07:00
tt2468
4d6901c075 WebSocketServer: Add RPC version support to events 2021-05-10 22:55:48 -07:00
tt2468
921bc81a7b EventHandler: More stuff 2021-05-10 22:46:53 -07:00
tt2468
8b30d2e77e EventHandler: Add some calldata helpers 2021-05-10 18:34:27 -07:00
tt2468
902c9dfdc5 WebSocketServer: Don't try to send events if the server is not listening 2021-05-10 18:26:28 -07:00
tt2468
23b6ce607c Utils: Add some Obs helpers 2021-05-10 18:25:15 -07:00
tt2468
89046ccb1a EventHandler: Add handling of all frontent events we care about 2021-05-10 17:34:40 -07:00
tt2468
5157134b02 EventHandler: Add more code 2021-05-10 16:54:48 -07:00
tt2468
c0accd9cde base: Add EventHandler files 2021-05-10 15:48:41 -07:00
tt2468
ee751edf54 SettingsDialog: Mild refactor and add Connect Info dialog
Among lots of stuff:

- Generate a random password on first load

- Add `ConnectInfo` dialog including QR code display

- Add `Generate Password` button to generate a new random
password

- Delete `Copy Password to Clipboard` button

- Delete `GetConnectString` or whatever from WebSocketServer
(reimplemented the functionality directly into ConnectInfo)

- Added `GeneratePassword()` to Utils

Todo: Show warning when users specify their own passwords
2021-05-08 04:29:03 -07:00
tt2468
600505b60a Utils: Add Obs utils namespace 2021-05-08 00:54:35 -07:00
tt2468
8a18d3603c RequestStatus: Add a few items 2021-05-04 15:50:38 -07:00
tt2468
160ef4d771 RequestHandler: Add RequestBatch logic 2021-05-03 18:44:13 -07:00
tt2468
2aba810ce1 RequestHandler: Finish checks system and first request 2021-05-03 16:55:30 -07:00
tt2468
c2b717cabf RequestStatus: Put into namespace
Apparently this is supposed to help?
2021-05-03 13:43:59 -07:00
tt2468
807a1501b7 base: Refactor request stuff and finish more logic 2021-05-03 13:31:22 -07:00
tt2468
687f53bc6d plugin-macros: Include base.h directly (to avoid missing blog()) 2021-05-03 10:34:36 -07:00
tt2468
36af7f6f58 base: Lots of stuff, including RequestHandler progress 2021-05-02 19:48:44 -07:00
tt2468
04f7b33755 SettingsDialog: Add Identified column to session table 2021-04-30 11:24:09 -07:00
tt2468
997dc40d6c WebSocketProtocol: Fix compare (oops) 2021-04-30 10:46:53 -07:00
tt2468
7f503d846b WebSocketProtocol: Fix vector initialization 2021-04-30 10:42:53 -07:00
tt2468
51e7fdae9e SettingsDialog: Add debug setting hover text
Debug mode requires a restart of the websocket server by design.
However, to avoid interrupting connections, the websocket server is
not automatically restarted when the setting is changed
2021-04-30 10:27:41 -07:00
tt2468
df8ef87dc5 WebSocketServer: Add parts for availableRequests/availableEvents 2021-04-30 10:13:42 -07:00
tt2468
45367a7355 WebSocketProtocol: Session parameter stuff 2021-04-30 10:03:38 -07:00
tt2468
ffaac93ba6 WebSocketSession: Add mutex for operations which change session parameters 2021-04-30 08:56:08 -07:00
tt2468
4be9b995fb base: Use shared_ptr instead of explicit ref counts
Took a night of sleep but I realized how I could solve the
concurrency issues in a good way. Uses shared_ptr, where the map
always accounts for one reference to a session.
2021-04-30 08:45:34 -07:00
tt2468
32758198ab WebSocketSession: Add refcount
Working towards fixing concurrency issues. Todo:

- Wait for refcount to be 0 before deleting object
- Use .at() instead of operator[] to prevent recreating deleted
sessions
- There was a third thing. Dont remember what it was
2021-04-29 22:11:24 -07:00
tt2468
e151a9a8db base: Use Unix EOL 2021-04-29 21:13:34 -07:00
tt2468
904e866a07 WebSocketProtocol: Delete left over log message 2021-04-29 21:10:19 -07:00
tt2468
09bfea0628 WebSocketProtocol: Add Identify logic (not tested well) 2021-04-29 20:37:28 -07:00
tt2468
f57d03e4bb WebSocketProtocol: Rename Process to ProcessMessage 2021-04-29 19:14:23 -07:00
tt2468
e0183d2f85 WebSocketServer: This *should* complete the functionality of WebSocketServer. 2021-04-29 19:03:32 -07:00
tt2468
ad8b13606f Base: Add WebSocketProtocol
Will be used to handle incoming websocket messages. Initially I was
going to handle messages within WebSocketServer, but the file is
starting to get very large and so it's only fair to split it up.
2021-04-29 10:52:29 -07:00
tt2468
44c5683ec4 WebSocketServer: Fix some bugs 2021-04-29 10:11:19 -07:00
tt2468
7c80a5d050 WebSocketServer: Add incoming and outgoing message logging and incrementing 2021-04-29 09:56:21 -07:00
tt2468
190d42fdf2 WebSocketServer: Initial onMessage handling 2021-04-29 09:42:22 -07:00
tt2468
724a63f1c8 WebSocketServer: Catch and ignore errors in Hello sending. 2021-04-29 09:14:35 -07:00
tt2468
561ba907d4 WebSocketServer: Ignore send errors 2021-04-29 09:09:20 -07:00
tt2468
ba710efe09 WebSocketServer: Include password in changed GetConnectString()
New format is `obswebsocket|ip:port|password`
2021-04-29 09:06:12 -07:00