Skip to content

libobs: Fix canvas private duplicated scenes #12824

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
exeldro wants to merge 1 commit into
base: master
Choose a base branch
from
Open

libobs: Fix canvas private duplicated scenes #12824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions libobs/obs-internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1022,6 +1022,8 @@ extern void audio_monitor_destroy(struct audio_monitor *monitor);

extern obs_source_t *obs_source_create_canvas(obs_canvas_t *canvas, const char *id, const char *name,
obs_data_t *settings, obs_data_t *hotkey_data);
extern obs_source_t *obs_source_create_canvas_private(obs_canvas_t *canvas, const char *id, const char *name,
obs_data_t *settings);
extern obs_source_t *obs_source_create_set_last_ver(obs_canvas_t *canvas, const char *id, const char *name,
const char *uuid, obs_data_t *settings, obs_data_t *hotkey_data,
uint32_t last_obs_ver, bool is_private);
Expand Down
8 changes: 4 additions & 4 deletions libobs/obs-scene.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1785,9 +1785,9 @@ static inline obs_scene_t *create_id(obs_canvas_t *canvas, const char *id, const
return source->context.data;
}

static inline obs_scene_t *create_private_id(const char *id, const char *name)
static inline obs_scene_t *create_private_id(obs_canvas_t *canvas, const char *id, const char *name)
{
struct obs_source *source = obs_source_create_private(id, name, NULL);
struct obs_source *source = obs_source_create_canvas_private(canvas, id, name, NULL);
return source->context.data;
}

Expand All @@ -1798,7 +1798,7 @@ obs_scene_t *obs_scene_create(const char *name)

obs_scene_t *obs_scene_create_private(const char *name)
{
return create_private_id("scene", name);
return create_private_id(obs->data.main_canvas, "scene", name);
}

static obs_source_t *get_child_at_idx(obs_scene_t *scene, size_t idx)
Expand Down Expand Up @@ -1939,7 +1939,7 @@ obs_scene_t *obs_scene_duplicate(obs_scene_t *scene, const char *name, enum obs_
/* --------------------------------- */

obs_canvas_t *canvas = obs_weak_canvas_get_canvas(scene->source->canvas);
new_scene = make_private ? create_private_id(scene->source->info.id, name)
new_scene = make_private ? create_private_id(canvas, scene->source->info.id, name)
: create_id(canvas, scene->source->info.id, name);
obs_canvas_release(canvas);

Expand Down
8 changes: 8 additions & 0 deletions libobs/obs-source.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,8 @@ static void obs_source_init_finalize(struct obs_source *source, obs_canvas_t *ca
obs_context_data_insert_name(&source->context, &obs->data.sources_mutex,
&obs->data.public_sources);
}
} else if (requires_canvas(source)) {
source->canvas = obs_canvas_get_weak_canvas(canvas);
}
obs_context_data_insert_uuid(&source->context, &obs->data.sources_mutex, &obs->data.sources);
}
Expand Down Expand Up @@ -468,6 +470,12 @@ obs_source_t *obs_source_create_canvas(obs_canvas_t *canvas, const char *id, con
return obs_source_create_internal(id, name, NULL, settings, hotkey_data, false, LIBOBS_API_VER, canvas);
}

obs_source_t *obs_source_create_canvas_private(obs_canvas_t *canvas, const char *id, const char *name,
obs_data_t *settings)
{
return obs_source_create_internal(id, name, NULL, settings, NULL, true, LIBOBS_API_VER, canvas);
}

obs_source_t *obs_source_create_set_last_ver(obs_canvas_t *canvas, const char *id, const char *name, const char *uuid,
obs_data_t *settings, obs_data_t *hotkey_data, uint32_t last_obs_ver,
bool is_private)
Expand Down
Loading