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

output/wasapi: make enumerator a local variable

Browse Source
This commit is contained in:
Max Kellermann 2021-03-10 17:21:26 +01:00
parent 0a97e68aa9
commit 3e93c392d7
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -233,7 +233,6 @@ class WasapiOutput final : public AudioOutput {
#endif #endif
std::string device_config; std::string device_config;
std::shared_ptr<COMWorker> com_worker; std::shared_ptr<COMWorker> com_worker;
ComPtr<IMMDeviceEnumerator> enumerator;
ComPtr<IMMDevice> device; ComPtr<IMMDevice> device;
ComPtr<IAudioClient> client; ComPtr<IAudioClient> client;
WAVEFORMATEXTENSIBLE device_format; WAVEFORMATEXTENSIBLE device_format;
@ -293,9 +292,11 @@ private:
bool TryFormatExclusive(const AudioFormat &audio_format); bool TryFormatExclusive(const AudioFormat &audio_format);
void FindExclusiveFormatSupported(AudioFormat &audio_format); void FindExclusiveFormatSupported(AudioFormat &audio_format);
void FindSharedFormatSupported(AudioFormat &audio_format); void FindSharedFormatSupported(AudioFormat &audio_format);
void EnumerateDevices(); static void EnumerateDevices(IMMDeviceEnumerator &enumerator);
ComPtr<IMMDevice> GetDevice(unsigned int index); static ComPtr<IMMDevice> GetDevice(IMMDeviceEnumerator &enumerator,
ComPtr<IMMDevice> SearchDevice(std::string_view name); unsigned index);
static ComPtr<IMMDevice> SearchDevice(IMMDeviceEnumerator &enumerator,
std::string_view name);
}; };
WasapiOutput & WasapiOutput &
@ -434,7 +435,6 @@ WasapiOutput::DoDisable() noexcept
assert(!thread); assert(!thread);
device.reset(); device.reset();
enumerator.reset();
} }
/// run inside COMWorkerThread /// run inside COMWorkerThread
@ -695,12 +695,13 @@ WasapiOutput::Cancel() noexcept
void void
WasapiOutput::OpenDevice() WasapiOutput::OpenDevice()
{ {
ComPtr<IMMDeviceEnumerator> enumerator;
enumerator.CoCreateInstance(__uuidof(MMDeviceEnumerator), nullptr, enumerator.CoCreateInstance(__uuidof(MMDeviceEnumerator), nullptr,
CLSCTX_INPROC_SERVER); CLSCTX_INPROC_SERVER);
if (enumerate_devices) { if (enumerate_devices) {
try { try {
EnumerateDevices(); EnumerateDevices(*enumerator);
} catch (...) { } catch (...) {
LogError(std::current_exception()); LogError(std::current_exception());
} }
@ -709,12 +710,12 @@ WasapiOutput::OpenDevice()
if (!device_config.empty()) { if (!device_config.empty()) {
unsigned int id; unsigned int id;
if (!SafeSilenceTry([this, &id]() { id = std::stoul(device_config); })) { if (!SafeSilenceTry([this, &id]() { id = std::stoul(device_config); })) {
device = SearchDevice(device_config); device = SearchDevice(*enumerator, device_config);
if (!device) if (!device)
throw FormatRuntimeError("Device '%s' not found", throw FormatRuntimeError("Device '%s' not found",
device_config.c_str()); device_config.c_str());
} else } else
device = GetDevice(id); device = GetDevice(*enumerator, id);
} else { } else {
device = GetDefaultAudioEndpoint(*enumerator); device = GetDefaultAudioEndpoint(*enumerator);
} }
@ -915,9 +916,9 @@ WasapiOutput::FindSharedFormatSupported(AudioFormat &audio_format)
/// run inside COMWorkerThread /// run inside COMWorkerThread
void void
WasapiOutput::EnumerateDevices() WasapiOutput::EnumerateDevices(IMMDeviceEnumerator &enumerator)
{ {
const auto device_collection = EnumAudioEndpoints(*enumerator); const auto device_collection = EnumAudioEndpoints(enumerator);
const UINT count = GetCount(*device_collection); const UINT count = GetCount(*device_collection);
for (UINT i = 0; i < count; ++i) { for (UINT i = 0; i < count; ++i) {
@ -938,17 +939,18 @@ WasapiOutput::EnumerateDevices()
/// run inside COMWorkerThread /// run inside COMWorkerThread
ComPtr<IMMDevice> ComPtr<IMMDevice>
WasapiOutput::GetDevice(unsigned int index) WasapiOutput::GetDevice(IMMDeviceEnumerator &enumerator, unsigned index)
{ {
const auto device_collection = EnumAudioEndpoints(*enumerator); const auto device_collection = EnumAudioEndpoints(enumerator);
return Item(*device_collection, index); return Item(*device_collection, index);
} }
/// run inside COMWorkerThread /// run inside COMWorkerThread
ComPtr<IMMDevice> ComPtr<IMMDevice>
WasapiOutput::SearchDevice(std::string_view name) WasapiOutput::SearchDevice(IMMDeviceEnumerator &enumerator,
std::string_view name)
{ {
const auto device_collection = EnumAudioEndpoints(*enumerator); const auto device_collection = EnumAudioEndpoints(enumerator);
const UINT count = GetCount(*device_collection); const UINT count = GetCount(*device_collection);
for (UINT i = 0; i < count; ++i) { for (UINT i = 0; i < count; ++i) {