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

WASAPI: Make sure Easy Setup can still work with FlexRadio virtual devices.

ms-easy-setup-card-names
Mooneer Salem 2025-06-12 19:19:41 -07:00
parent 76371d5798
commit d7c930a96e
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/audio/WASAPIAudioEngine.cpp
View File

@ -179,6 +179,7 @@ std::vector<AudioDeviceSpecification> WASAPIAudioEngine::getAudioDeviceList(Audi
{ {
devSpec.deviceId = index; devSpec.deviceId = index;
result.push_back(devSpec); result.push_back(devSpec);
log_debug("Found device %s (card = %s, port = %s)", (const char*)devSpec.name.ToUTF8(), (const char*)devSpec.cardName.ToUTF8(), (const char*)devSpec.portName.ToUTF8());
} }
device->Release(); device->Release();
} }
@ -432,7 +433,23 @@ AudioDeviceSpecification WASAPIAudioEngine::getDeviceSpecification_(IMMDevice* d
} }
spec.portName = wxString::FromUTF8(getUTF8String_(friendlyName.pwszVal)); spec.portName = wxString::FromUTF8(getUTF8String_(friendlyName.pwszVal));
bool noPortName = spec.portName.Length() == 0 && spec.cardName != spec.name;
bool isFlexRadio = spec.cardName.StartsWith("FlexRadio");
if (noPortName)
{
// If there's no port name, just use the same name for cardName
// as the card's full name.
spec.cardName = spec.name;
}
else if (isFlexRadio)
{
// We also have a carveout for FlexRadio virtual audio devices
// so that Easy Setup can automatically group the RX and TX
// devices together.
spec.cardName = spec.portName;
}
// Activate IAudioClient so we can obtain format info // Activate IAudioClient so we can obtain format info
IAudioClient* audioClient = nullptr; IAudioClient* audioClient = nullptr;
hr = device->Activate(IID_IAudioClient, CLSCTX_ALL, nullptr, (void**)&audioClient); hr = device->Activate(IID_IAudioClient, CLSCTX_ALL, nullptr, (void**)&audioClient);