1 files changed, 31 insertions, 12 deletions
diff --git a/src/plugins/Output/wasapi/outputwasapi.cpp b/src/plugins/Output/wasapi/outputwasapi.cpp
index cc8f9b0ee..5faeb0c04 100644
--- a/src/plugins/Output/wasapi/outputwasapi.cpp
+++ b/src/plugins/Output/wasapi/outputwasapi.cpp
@@ -23,17 +23,16 @@
 #include <string.h>
 #include <iostream>
 #include <unistd.h>
-#include <qmmp/buffer.h>
+#include <initguid.h>
+#include <audioclient.h>
+#include <endpointvolume.h>
+#include <mmdeviceapi.h>
+#include <mmreg.h>
+#include <functiondiscoverykeys_devpkey.h>
 #include <math.h>
+#include <qmmp/buffer.h>
 #include "outputwasapi.h"
 
-const CLSID CLSID_MMDeviceEnumerator = __uuidof(MMDeviceEnumerator);
-const IID IID_IMMDeviceEnumerator = __uuidof(IMMDeviceEnumerator);
-const IID IID_IAudioClient = __uuidof(IAudioClient);
-const IID IID_IAudioRenderClient = __uuidof(IAudioRenderClient);
-const IID IID_IChannelAudioVolume = __uuidof(IChannelAudioVolume);
-const IID IID_ISimpleAudioVolume = __uuidof(ISimpleAudioVolume);
-
 #define WASAPI_BUFSIZE 10000000LL //1s
 
 #ifndef AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM
@@ -63,6 +62,8 @@ OutputWASAPI::OutputWASAPI() : Output()
     m_pRenderClient = 0;
     m_pSimpleAudioVolume = 0;
     instance = this;
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
+    m_id = settings.value("WASAPI/device", "default").toString();
 }
 
 OutputWASAPI::~OutputWASAPI()
@@ -81,11 +82,29 @@ bool OutputWASAPI::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat fo
         return false;
     }
 
-    if((result = m_pEnumerator->GetDefaultAudioEndpoint(eRender, eConsole, &m_pDevice)) != S_OK)
+    if(m_id != "default" && !m_id.isEmpty())
     {
-        qWarning("OutputWASAPI: IMMDeviceEnumerator::GetDefaultAudioEndpoint failed, error code = 0x%lx", result);
-        m_pDevice = 0;
-        return false;
+        WCHAR id[m_id.length() + 1];
+        m_id.toWCharArray(id);
+        id[m_id.length()] = 0;
+
+        if((result = m_pEnumerator->GetDevice(id, &m_pDevice)) != S_OK)
+        {
+            qWarning("OutputWASAPI: IMMDeviceEnumerator::GetDevice failed, error code = 0x%lx", result);
+            m_pDevice = 0;
+        }
+        else
+            qDebug("OutputWASAPI: using device id: %s", qPrintable(m_id));
+    }
+
+    if(!m_pDevice)
+    {
+        if((result = m_pEnumerator->GetDefaultAudioEndpoint(eRender, eConsole, &m_pDevice)) != S_OK)
+        {
+            qWarning("OutputWASAPI: IMMDeviceEnumerator::GetDefaultAudioEndpoint failed, error code = 0x%lx", result);
+            m_pDevice = 0;
+            return false;
+        }
     }
 
     if((result = m_pDevice->Activate(IID_IAudioClient, CLSCTX_ALL, NULL, (void**)&m_pAudioClient)) != S_OK)