New upstream version 25.0.3+dfsg1
This commit is contained in:
parent
04fe0efc67
commit
8b2e5f2130
569 changed files with 62491 additions and 5875 deletions
|
|
@ -581,7 +581,7 @@ void obs_register_source_s(const struct obs_source_info *info, size_t size)
|
|||
goto error;
|
||||
}
|
||||
|
||||
if (get_source_info(info->id)) {
|
||||
if (get_source_info2(info->id, info->version)) {
|
||||
source_warn("Source '%s' already exists! "
|
||||
"Duplicate library?",
|
||||
info->id);
|
||||
|
|
@ -650,6 +650,17 @@ void obs_register_source_s(const struct obs_source_info *info, size_t size)
|
|||
goto error;
|
||||
}
|
||||
|
||||
/* version-related stuff */
|
||||
data.unversioned_id = data.id;
|
||||
if (data.version) {
|
||||
struct dstr versioned_id = {0};
|
||||
dstr_printf(&versioned_id, "%s_v%d", data.id,
|
||||
(int)data.version);
|
||||
data.id = versioned_id.array;
|
||||
} else {
|
||||
data.id = bstrdup(data.id);
|
||||
}
|
||||
|
||||
if (array)
|
||||
darray_push_back(sizeof(struct obs_source_info), array, &data);
|
||||
da_push_back(obs->source_types, &data);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue