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

Events: Prepare to add a few new OBS events

Browse Source 
Pending PR merge and version release
This commit is contained in:
tt2468 2021-10-06 00:44:42 -07:00
parent 1b25e98dc2
commit 42c78f1831
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/eventhandler/EventHandler.cpp
View File

@ -237,12 +237,18 @@ void EventHandler::OnFrontendEvent(enum obs_frontend_event event, void *private_
break; break;
// Config // Config
//case OBS_FRONTEND_EVENT_SCENE_COLLECTION_CHANGING:
// eventHandler->HandleCurrentSceneCollectionChanging();
// break;
case OBS_FRONTEND_EVENT_SCENE_COLLECTION_CHANGED: case OBS_FRONTEND_EVENT_SCENE_COLLECTION_CHANGED:
eventHandler->HandleCurrentSceneCollectionChanged(); eventHandler->HandleCurrentSceneCollectionChanged();
break; break;
case OBS_FRONTEND_EVENT_SCENE_COLLECTION_LIST_CHANGED: case OBS_FRONTEND_EVENT_SCENE_COLLECTION_LIST_CHANGED:
eventHandler->HandleSceneCollectionListChanged(); eventHandler->HandleSceneCollectionListChanged();
break; break;
//case OBS_FRONTEND_EVENT_PROFILE_CHANGING:
// eventHandler->HandleCurrentProfileChanging();
// break;
case OBS_FRONTEND_EVENT_PROFILE_CHANGED: case OBS_FRONTEND_EVENT_PROFILE_CHANGED:
eventHandler->HandleCurrentProfileChanged(); eventHandler->HandleCurrentProfileChanged();
break; break;

2
src/eventhandler/EventHandler.h
View File

@ -69,8 +69,10 @@ class EventHandler
void HandleStudioModeStateChanged(bool enabled); void HandleStudioModeStateChanged(bool enabled);
// Config // Config
void HandleCurrentSceneCollectionChanging();
void HandleCurrentSceneCollectionChanged(); void HandleCurrentSceneCollectionChanged();
void HandleSceneCollectionListChanged(); void HandleSceneCollectionListChanged();
void HandleCurrentProfileChanging();
void HandleCurrentProfileChanged(); void HandleCurrentProfileChanged();
void HandleProfileListChanged(); void HandleProfileListChanged();

14
src/eventhandler/EventHandler_Config.cpp
View File

@ -1,5 +1,12 @@
#include "EventHandler.h" #include "EventHandler.h"
void EventHandler::HandleCurrentSceneCollectionChanging()
{
json eventData;
eventData["sceneCollectionName"] = Utils::Obs::StringHelper::GetCurrentSceneCollection();
BroadcastEvent(EventSubscription::Config, "CurrentSceneCollectionChanging", eventData);
}
void EventHandler::HandleCurrentSceneCollectionChanged() void EventHandler::HandleCurrentSceneCollectionChanged()
{ {
json eventData; json eventData;
@ -14,6 +21,13 @@ void EventHandler::HandleSceneCollectionListChanged()
BroadcastEvent(EventSubscription::Config, "SceneCollectionListChanged", eventData); BroadcastEvent(EventSubscription::Config, "SceneCollectionListChanged", eventData);
} }
void EventHandler::HandleCurrentProfileChanging()
{
json eventData;
eventData["profileName"] = Utils::Obs::StringHelper::GetCurrentProfile();
BroadcastEvent(EventSubscription::Config, "CurrentProfileChanging", eventData);
}
void EventHandler::HandleCurrentProfileChanged() void EventHandler::HandleCurrentProfileChanged()
{ {
json eventData; json eventData;