opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-24 23:31:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename scene signals

Browse Source 
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.
This commit is contained in:
jp9000
2014-02-23 18:58:01 -07:00
parent 75b66872e4
commit 096cce9a86
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libobs/obs-scene.c
+2 -2
View File
@@ -24,7 +24,7 @@ static inline void signal_item_remove(struct obs_scene_item *item)
calldata_setptr(&params, "scene", item->parent);
calldata_setptr(&params, "item", item);
signal_handler_signal(item->parent->source->signals, "remove",
signal_handler_signal(item->parent->source->signals, "item-remove",
&params);
calldata_free(&params);
}
@@ -335,7 +335,7 @@ obs_sceneitem_t obs_scene_add(obs_scene_t scene, obs_source_t source)
calldata_setptr(&params, "scene", scene);
calldata_setptr(&params, "item", item);
signal_handler_signal(scene->source->signals, "add", &params);
signal_handler_signal(scene->source->signals, "item-add", &params);
calldata_free(&params);
return item;
obs/window-basic-main.cpp
+4 -3
View File
@@ -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)