OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-15 07:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

libobs: Refactor creation of scenes

Browse source 
Allows using a different source type (I.E. "group" instead of "scene").
This commit is contained in:
jp9000 2018-07-15 18:39:08 -07:00
parent 35704c4c04
commit 8f786db5f2
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
libobs/obs-scene.c
View file

@ -1125,20 +1125,30 @@ const struct obs_source_info scene_info =
.enum_all_sources = scene_enum_all_sources
};
obs_scene_t *obs_scene_create(const char *name)
static inline obs_scene_t *create_id(const char *id, const char *name)
{
struct obs_source *source = obs_source_create("scene", name, NULL,
struct obs_source *source = obs_source_create(id, name, NULL,
NULL);
return source->context.data;
}
obs_scene_t *obs_scene_create_private(const char *name)
static inline obs_scene_t *create_private_id(const char *id, const char *name)
{
struct obs_source *source = obs_source_create_private("scene", name,
struct obs_source *source = obs_source_create_private(id, name,
NULL);
return source->context.data;
}
obs_scene_t *obs_scene_create(const char *name)
{
return create_id("scene", name);
}
obs_scene_t *obs_scene_create_private(const char *name)
{
return create_private_id("scene", name);
}
static obs_source_t *get_child_at_idx(obs_scene_t *scene, size_t idx)
{
struct obs_scene_item *item = scene->first_item;
@ -1209,8 +1219,9 @@ obs_scene_t *obs_scene_duplicate(obs_scene_t *scene, const char *name,
/* --------------------------------- */
new_scene = make_private ?
obs_scene_create_private(name) : obs_scene_create(name);
new_scene = make_private
? create_private_id(scene->source->info.id, name)
: create_id(scene->source->info.id, name);
obs_source_copy_filters(new_scene->source, scene->source);
@ -2396,7 +2407,7 @@ obs_sceneitem_t *obs_scene_insert_group(obs_scene_t *scene,
return NULL;
}
obs_scene_t *sub_scene = obs_scene_create_private(name);
obs_scene_t *sub_scene = create_private_id("scene", name);
obs_sceneitem_t *last_item = items ? items[count - 1] : NULL;
obs_sceneitem_t *item = obs_scene_add_internal(