jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Fix duplicated source names in audio settings

Browse Source 
When you add an audio capture source and use the "use existing" feature
in the source selection dialog, and then recreate the same audio source
again in audio settings, it will result in two sources using identical
names, which although relatively harmless can cause issues when doing
things such as trying to find sources by their name.

Fixes obsproject/obs-studio#5621
Closes obsproject/obs-studio#5947
This commit is contained in:
jp9000 2022-03-08 01:02:44 -08:00
parent 3e9a3d995b
commit 6dd65c8d13
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
UI/window-basic-main.cpp
View File

@ -4412,6 +4412,25 @@ bool OBSBasic::ResetAudio()
return obs_reset_audio(&ai);
}
extern std::string strprintf(const char *format, ...);
static std::string GetDupName(const char *name)
{
std::string newName = name;
int inc = 1;
for (;;) {
OBSSourceAutoRelease existing_source =
obs_get_source_by_name(newName.c_str());
if (!existing_source)
break;
newName = strprintf("%s (%d)", name, ++inc);
}
return newName;
}
void OBSBasic::ResetAudioDevice(const char *sourceId, const char *deviceId,
const char *deviceDesc, int channel)
{
@ -4435,9 +4454,11 @@ void OBSBasic::ResetAudioDevice(const char *sourceId, const char *deviceId,
}
} else if (!disable) {
std::string name = GetDupName(deviceDesc);
settings = obs_data_create();
obs_data_set_string(settings, "device_id", deviceId);
source = obs_source_create(sourceId, deviceDesc, settings,
source = obs_source_create(sourceId, name.c_str(), settings,
nullptr);
obs_set_output_source(channel, source);