From 096cce9a860660a82251c468beda89444cedbe25 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Sun, 23 Feb 2014 18:58:01 -0700 Subject: [PATCH] Rename scene signals the signals for scenes could have potentially conflicted with default source signals. "remove" should be used for source removal, for example. Changed the scene signals to "item-add" and "item-remove" for its items. --- libobs/obs-scene.c | 4 ++-- obs/window-basic-main.cpp | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libobs/obs-scene.c b/libobs/obs-scene.c index f2fe56831..88cc5f61e 100644 --- a/libobs/obs-scene.c +++ b/libobs/obs-scene.c @@ -24,7 +24,7 @@ static inline void signal_item_remove(struct obs_scene_item *item) calldata_setptr(¶ms, "scene", item->parent); calldata_setptr(¶ms, "item", item); - signal_handler_signal(item->parent->source->signals, "remove", + signal_handler_signal(item->parent->source->signals, "item-remove", ¶ms); calldata_free(¶ms); } @@ -335,7 +335,7 @@ obs_sceneitem_t obs_scene_add(obs_scene_t scene, obs_source_t source) calldata_setptr(¶ms, "scene", scene); calldata_setptr(¶ms, "item", item); - signal_handler_signal(scene->source->signals, "add", ¶ms); + signal_handler_signal(scene->source->signals, "item-add", ¶ms); calldata_free(¶ms); return item; diff --git a/obs/window-basic-main.cpp b/obs/window-basic-main.cpp index 5245d9e6b..7946dec4c 100644 --- a/obs/window-basic-main.cpp +++ b/obs/window-basic-main.cpp @@ -119,9 +119,10 @@ void OBSBasic::AddScene(OBSSource source) ui->scenes->addItem(item); signal_handler_t handler = obs_source_signalhandler(source); - signal_handler_connect(handler, "add", OBSBasic::SceneItemAdded, this); - signal_handler_connect(handler, "remove", OBSBasic::SceneItemRemoved, - this); + signal_handler_connect(handler, "item-add", + OBSBasic::SceneItemAdded, this); + signal_handler_connect(handler, "item-remove", + OBSBasic::SceneItemRemoved, this); } void OBSBasic::RemoveScene(OBSSource source)