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

output/wasapi: GetDevice() returns IMMDevice

Browse Source
This commit is contained in:
Max Kellermann 2021-03-05 19:07:18 +01:00
parent 17d4873b60
commit 2ff6a9ad2b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -260,7 +260,7 @@ private:
void FindExclusiveFormatSupported(AudioFormat &audio_format); void FindExclusiveFormatSupported(AudioFormat &audio_format);
void FindSharedFormatSupported(AudioFormat &audio_format); void FindSharedFormatSupported(AudioFormat &audio_format);
void EnumerateDevices(); void EnumerateDevices();
void GetDevice(unsigned int index); ComPtr<IMMDevice> GetDevice(unsigned int index);
unsigned int SearchDevice(std::string_view name); unsigned int SearchDevice(std::string_view name);
}; };
@ -622,7 +622,7 @@ void WasapiOutput::OpenDevice() {
device_config.c_str()); device_config.c_str());
} }
GetDevice(id); device = GetDevice(id);
} else { } else {
device = GetDefaultAudioEndpoint(*enumerator); device = GetDefaultAudioEndpoint(*enumerator);
} }
@ -828,9 +828,11 @@ void WasapiOutput::EnumerateDevices() {
} }
/// run inside COMWorkerThread /// run inside COMWorkerThread
void WasapiOutput::GetDevice(unsigned int index) { ComPtr<IMMDevice>
WasapiOutput::GetDevice(unsigned int index)
{
const auto device_collection = EnumAudioEndpoints(*enumerator); const auto device_collection = EnumAudioEndpoints(*enumerator);
device = Item(*device_collection, index); return Item(*device_collection, index);
} }
/// run inside COMWorkerThread /// run inside COMWorkerThread