oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/wasapi: reimplement SearchDevice() without EnumerateDevices()

Browse Source
This commit is contained in:
Max Kellermann 2021-03-05 19:20:32 +01:00
parent 2f2b3f1cdc
commit a4257e51d5
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/output/plugins/wasapi/WasapiOutputPlugin.cxx
View File

@ -804,8 +804,6 @@ void WasapiOutput::EnumerateDevices() {
return; return;
} }
HRESULT result;
const auto device_collection = EnumAudioEndpoints(*enumerator); const auto device_collection = EnumAudioEndpoints(*enumerator);
const UINT count = GetCount(*device_collection); const UINT count = GetCount(*device_collection);
@ -838,20 +836,19 @@ WasapiOutput::GetDevice(unsigned int index)
ComPtr<IMMDevice> ComPtr<IMMDevice>
WasapiOutput::SearchDevice(std::string_view name) WasapiOutput::SearchDevice(std::string_view name)
{ {
if (!SafeTry([this]() { EnumerateDevices(); })) { const auto device_collection = EnumAudioEndpoints(*enumerator);
return nullptr;
const UINT count = GetCount(*device_collection);
for (UINT i = 0; i < count; ++i) {
auto d = Item(*device_collection, i);
const auto property_store = OpenPropertyStore(*d);
auto n = GetString(*property_store, PKEY_Device_FriendlyName);
if (n != nullptr && name.compare(n) == 0)
return d;
} }
auto iter =
std::find_if(device_desc.cbegin(), device_desc.cend(), return nullptr;
[&name](const auto &desc) { return desc.second == name; });
if (iter == device_desc.cend()) {
FormatError(wasapi_output_domain, "Device %.*s not founded.",
int(name.size()), name.data());
return nullptr;
}
FormatInfo(wasapi_output_domain, "Select device \"%u\" \"%s\"", iter->first,
iter->second.c_str());
return GetDevice(iter->first);
} }
static bool wasapi_output_test_default_device() { return true; } static bool wasapi_output_test_default_device() { return true; }