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

UI: Use get_new_source_name instead of strprintf

Browse Source 
Remove a bit of duplicated code, and fix non-Windows compilation. This
is a bit of a workaround to not have to modify cmake, but might as well
reuse a function that already exists anyway rather than duplicate the
code.
This commit is contained in:
jp9000
2022-03-08 01:27:20 -08:00
parent 6dd65c8d13
commit 61cbfb3b9a
2 changed files with 7 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
UI/window-basic-source-select.cpp
View File

@@ -130,7 +130,7 @@ static void AddSource(void *_data, obs_scene_t *scene)
obs_sceneitem_set_visible(sceneitem, data->visible);
}
static char *get_new_source_name(const char *name)
char *get_new_source_name(const char *name, const char *format)
{
struct dstr new_name = {0};
int inc = 0;
@@ -143,7 +143,7 @@ static char *get_new_source_name(const char *name)
if (!existing_source)
break;
dstr_printf(&new_name, "%s %d", name, ++inc + 1);
dstr_printf(&new_name, format, name, ++inc + 1);
}
return new_name.array;
@@ -160,8 +160,8 @@ static void AddExisting(OBSSource source, bool visible, bool duplicate,
if (duplicate) {
OBSSource from = source;
char *new_name =
get_new_source_name(obs_source_get_name(source));
char *new_name = get_new_source_name(
obs_source_get_name(source), "%s %d");
source = obs_source_duplicate(from, new_name, false);
obs_source_release(source);
bfree(new_name);