jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(API Change) libobs: Rename funcs relating to active child sources

Browse Source 
Renames:
----------------------------------------
obs_source_add_child
obs_source_remove_child
obs_source_enum_sources
obs_source_enum_tree
obs_source_info::enum_sources

To:
----------------------------------------
obs_source_add_active_child
obs_source_remove_active_child
obs_source_enum_active_sources
obs_source_enum_active_tree
obs_source_info::enum_active_sources

These functions/callbacks had misleading names: they originally implied
any child sources, when they actually meant active child sources that
are being used to render video or audio.  It's important that the
function names represent their actual purpose.
This commit is contained in:
jp9000
2015-12-22 04:59:02 -08:00
parent 684b43ccfa
commit c8f4fbe42b
4 changed files with 49 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libobs/obs-scene.c
View File

@@ -467,7 +467,7 @@ const struct obs_source_info scene_info =
.get_height = scene_getheight,
.load = scene_load,
.save = scene_save,
.enum_sources = scene_enum_sources
.enum_active_sources = scene_enum_sources
};
obs_scene_t *obs_scene_create(const char *name)
@@ -681,7 +681,7 @@ obs_sceneitem_t *obs_scene_add(obs_scene_t *scene, obs_source_t *source)
return NULL;
}
if (!obs_source_add_child(scene->source, source)) {
if (!obs_source_add_active_child(scene->source, source)) {
blog(LOG_WARNING, "Failed to add source to scene due to "
"infinite source recursion");
return NULL;
@@ -772,7 +772,7 @@ void obs_sceneitem_remove(obs_sceneitem_t *item)
assert(scene != NULL);
assert(scene->source != NULL);
obs_source_remove_child(scene->source, item->source);
obs_source_remove_active_child(scene->source, item->source);
signal_item_remove(item);
detach_sceneitem(item);