FreeDV
/
freedv-gui
mirror of https://github.com/drowe67/freedv-gui.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Initial logic to use card names instead of device names in Easy Setup dialog.

ms-easy-setup-card-names
Mooneer Salem 2025-06-12 13:22:01 -07:00
parent 7295eb885c
commit 76371d5798
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/dialogs/dlg_easy_setup.cpp
View File

@ -1151,14 +1151,14 @@ void EasySetupDialog::updateAudioDevices_()
for (auto& dev : inputDevices) for (auto& dev : inputDevices)
{ {
if (dev.name.Find(_("Microsoft Sound Mapper")) != -1 || if (dev.cardName.Find(_("Microsoft Sound Mapper")) != -1 ||
dev.name.Find(_(" [Loopback]")) != -1) dev.cardName.Find(_(" [Loopback]")) != -1)
{ {
// Sound mapper and loopback devices should be skipped. // Sound mapper and loopback devices should be skipped.
continue; continue;
} }
wxString cleanedDeviceName = dev.name; wxString cleanedDeviceName = dev.cardName;
SoundDeviceData* soundData = new SoundDeviceData(); SoundDeviceData* soundData = new SoundDeviceData();
assert(soundData != nullptr); assert(soundData != nullptr);
@ -1187,13 +1187,15 @@ void EasySetupDialog::updateAudioDevices_()
for (auto& dev : outputDevices) for (auto& dev : outputDevices)
{ {
if (dev.name.Find(_("Microsoft Sound Mapper")) != -1 || if (dev.cardName.Find(_("Microsoft Sound Mapper")) != -1 ||
dev.name.Find(_(" [Loopback]")) != -1) dev.cardName.Find(_(" [Loopback]")) != -1)
{ {
// Sound mapper and loopback devices should be skipped. // Sound mapper and loopback devices should be skipped.
continue; continue;
} }
wxString cleanedDeviceName = dev.cardName;
#if 0
// For Windows, some devices have a designator at the beginning // For Windows, some devices have a designator at the beginning
// (e.g. "Microphone (USB Audio CODEC)" and "Speakers (USB Audio CODEC)". // (e.g. "Microphone (USB Audio CODEC)" and "Speakers (USB Audio CODEC)".
// We need to be able to strip the designator without affecting // We need to be able to strip the designator without affecting
@ -1202,8 +1204,7 @@ void EasySetupDialog::updateAudioDevices_()
// device in the current list with the same suffix. If we do find // device in the current list with the same suffix. If we do find
// such a device, then we use this suffix as the device name to show // such a device, then we use this suffix as the device name to show
// in the list instead. // in the list instead.
wxString cleanedDeviceName = dev.name; if (finalRadioDeviceList.find(dev.cardName) == finalRadioDeviceList.end())
if (finalRadioDeviceList.find(dev.name) == finalRadioDeviceList.end())
{ {
SoundDeviceData* foundItem = nullptr; SoundDeviceData* foundItem = nullptr;
wxString oldDeviceName; wxString oldDeviceName;
@ -1255,6 +1256,7 @@ void EasySetupDialog::updateAudioDevices_()
finalRadioDeviceList[cleanedDeviceName] = foundItem; finalRadioDeviceList[cleanedDeviceName] = foundItem;
} }
} }
#endif // 0
SoundDeviceData* soundData = finalRadioDeviceList[cleanedDeviceName]; SoundDeviceData* soundData = finalRadioDeviceList[cleanedDeviceName];
if (soundData == nullptr) if (soundData == nullptr)