mirror/obs-studio
1
0 Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-10-20 05:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

libobs: Don't allow duplicating scene sources

Browse Source
This commit is contained in:
Exeldro committed 2020-04-17 12:40:25 +02:00
1 parent 6dce4662cf
commit 74b9ae07f3
2 files changed
+10 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

libobs/obs-scene.c
+1 -1
View File
@@ -1166,7 +1166,7 @@ const struct obs_source_info scene_info = {
.id = "scene",
.type = OBS_SOURCE_TYPE_SCENE,
.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW |
OBS_SOURCE_COMPOSITE,
OBS_SOURCE_COMPOSITE | OBS_SOURCE_DO_NOT_DUPLICATE,
.get_name = scene_getname,
.create = scene_create,
.destroy = scene_destroy,
libobs/obs-source.c
+9 -5
View File
@@ -501,13 +501,12 @@ obs_source_t *obs_source_duplicate(obs_source_t *source, const char *new_name,
if (!obs_source_valid(source, "obs_source_duplicate"))
return NULL;
if ((source->info.output_flags & OBS_SOURCE_DO_NOT_DUPLICATE) != 0) {
obs_source_addref(source);
return source;
}
if (source->info.type == OBS_SOURCE_TYPE_SCENE) {
obs_scene_t *scene = obs_scene_from_source(source);
if (scene && !create_private) {
obs_source_addref(source);
return source;
}
if (!scene)
scene = obs_group_from_source(source);
if (!scene)
@@ -521,6 +520,11 @@ obs_source_t *obs_source_duplicate(obs_source_t *source, const char *new_name,
return new_source;
}
if ((source->info.output_flags & OBS_SOURCE_DO_NOT_DUPLICATE) != 0) {
obs_source_addref(source);
return source;
}
settings = obs_data_create();
obs_data_apply(settings, source->context.settings);