diff options
| author | Max Kellermann <max@musicpd.org> | 2021-03-10 17:29:03 +0100 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2021-03-10 17:34:10 +0100 |
| commit | 3e484637f90588707f928fc0a83f5c0836feeaca (patch) | |
| tree | e12559737ba92cc62171be201450574b9be730d1 /src | |
| parent | 3e93c392d77938b1b5e4a0345aad45ea01366551 (diff) | |
output/wasapi: rename OpenDevice() to ChooseDevice()
OpenDevice was a confusing name because it does not actually open a
device.
Diffstat (limited to 'src')
| -rw-r--r-- | src/output/plugins/wasapi/WasapiOutputPlugin.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/output/plugins/wasapi/WasapiOutputPlugin.cxx b/src/output/plugins/wasapi/WasapiOutputPlugin.cxx index 5d1e546b9..f08b2fad4 100644 --- a/src/output/plugins/wasapi/WasapiOutputPlugin.cxx +++ b/src/output/plugins/wasapi/WasapiOutputPlugin.cxx @@ -253,7 +253,7 @@ public: com_worker = std::make_shared<COMWorker>(); try { - com_worker->Async([&]() { OpenDevice(); }).get(); + com_worker->Async([&]() { ChooseDevice(); }).get(); } catch (...) { com_worker.reset(); throw; @@ -288,7 +288,7 @@ private: void DoDisable() noexcept; void DoOpen(AudioFormat &audio_format); - void OpenDevice(); + void ChooseDevice(); bool TryFormatExclusive(const AudioFormat &audio_format); void FindExclusiveFormatSupported(AudioFormat &audio_format); void FindSharedFormatSupported(AudioFormat &audio_format); @@ -445,7 +445,7 @@ WasapiOutput::DoOpen(AudioFormat &audio_format) if (GetState(*device) != DEVICE_STATE_ACTIVE) { device.reset(); - OpenDevice(); + ChooseDevice(); } client = Activate<IAudioClient>(*device); @@ -693,7 +693,7 @@ WasapiOutput::Cancel() noexcept /// run inside COMWorkerThread void -WasapiOutput::OpenDevice() +WasapiOutput::ChooseDevice() { ComPtr<IMMDeviceEnumerator> enumerator; enumerator.CoCreateInstance(__uuidof(MMDeviceEnumerator), nullptr, |