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

EventHandler: More scene item events

Browse Source
This commit is contained in:
tt2468 2021-06-13 02:10:18 -07:00
parent 10afbdfca0
commit 129ee12542
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/eventhandler/EventHandler.cpp
View File

@ -132,6 +132,8 @@ void EventHandler::OnFrontendEvent(enum obs_frontend_event event, void *private_
{ {
auto eventHandler = reinterpret_cast<EventHandler*>(private_data); auto eventHandler = reinterpret_cast<EventHandler*>(private_data);
blog(LOG_INFO, "Frontend event");
if (!eventHandler->_obsLoaded.load()) { if (!eventHandler->_obsLoaded.load()) {
if (event == OBS_FRONTEND_EVENT_FINISHED_LOADING) { if (event == OBS_FRONTEND_EVENT_FINISHED_LOADING) {
blog(LOG_INFO, "[EventHandler::OnFrontendEvent] OBS has finished loading. Connecting final handlers and enabling events..."); blog(LOG_INFO, "[EventHandler::OnFrontendEvent] OBS has finished loading. Connecting final handlers and enabling events...");
@ -215,6 +217,7 @@ void EventHandler::OnFrontendEvent(enum obs_frontend_event event, void *private_
eventHandler->HandleCurrentPreviewSceneChanged(); eventHandler->HandleCurrentPreviewSceneChanged();
break; break;
case OBS_FRONTEND_EVENT_SCENE_LIST_CHANGED: case OBS_FRONTEND_EVENT_SCENE_LIST_CHANGED:
blog(LOG_INFO, "scene list changed");
eventHandler->HandleSceneListReindexed(); eventHandler->HandleSceneListReindexed();
break; break;

17
src/eventhandler/EventHandler_SceneItems.cpp
View File

@ -25,7 +25,18 @@ void EventHandler::HandleSceneItemRemoved(void *param, calldata_t *data)
{ {
auto eventHandler = reinterpret_cast<EventHandler*>(param); auto eventHandler = reinterpret_cast<EventHandler*>(param);
obs_scene_t *scene = GetCalldataPointer<obs_scene_t>(data, "scene");
if (!scene)
return;
obs_sceneitem_t *sceneItem = GetCalldataPointer<obs_sceneitem_t>(data, "item");
if (!sceneItem)
return;
json eventData; json eventData;
eventData["sceneName"] = obs_source_get_name(obs_scene_get_source(scene));
eventData["inputName"] = obs_source_get_name(obs_sceneitem_get_source(sceneItem));
eventData["sceneItemId"] = obs_sceneitem_get_id(sceneItem);
eventHandler->_webSocketServer->BroadcastEvent(EventSubscription::SceneItems, "SceneItemRemoved", eventData); eventHandler->_webSocketServer->BroadcastEvent(EventSubscription::SceneItems, "SceneItemRemoved", eventData);
} }
@ -33,7 +44,13 @@ void EventHandler::HandleSceneItemListReindexed(void *param, calldata_t *data)
{ {
auto eventHandler = reinterpret_cast<EventHandler*>(param); auto eventHandler = reinterpret_cast<EventHandler*>(param);
obs_scene_t *scene = GetCalldataPointer<obs_scene_t>(data, "scene");
if (!scene)
return;
json eventData; json eventData;
eventData["sceneName"] = obs_source_get_name(obs_scene_get_source(scene));
eventData["sceneItems"] = Utils::Obs::ListHelper::GetSceneItemList(scene, false);
eventHandler->_webSocketServer->BroadcastEvent(EventSubscription::SceneItems, "SceneItemReindexed", eventData); eventHandler->_webSocketServer->BroadcastEvent(EventSubscription::SceneItems, "SceneItemReindexed", eventData);
} }