Changeset 83238 in vbox

Timestamp:

Mar 10, 2020 9:57:28 AM (5 years ago)

Author:

vboxsync

Message:

Audio/Win: Also re-enumerate if the default device has been changed. More logging for the IMMNotificationClient interface.

Location:

trunk/src/VBox/Devices/Audio

Files:

• VBoxMMNotificationClient.cpp (modified) (5 diffs)
• VBoxMMNotificationClient.h (modified) (1 diff)

trunk/src/VBox/Devices/Audio/VBoxMMNotificationClient.cpp

@@ -126 +126 @@
 
 /**
- * Handler implementation which is called when an audio device state
- * has been changed.
- *
- * @return  HRESULT
- * @param   pwstrDeviceId       Device ID the state is announced for.
- * @param   dwNewState          New state the device is now in.
- */
-STDMETHODIMP VBoxMMNotificationClient::OnDeviceStateChanged(LPCWSTR pwstrDeviceId, DWORD dwNewState)
-{
-    char *pszState = "unknown";
-
-    switch (dwNewState)
-    {
-        case DEVICE_STATE_ACTIVE:
-            pszState = "active";
-            break;
-        case DEVICE_STATE_DISABLED:
-            pszState = "disabled";
-            break;
-        case DEVICE_STATE_NOTPRESENT:
-            pszState = "not present";
-            break;
-        case DEVICE_STATE_UNPLUGGED:
-            pszState = "unplugged";
-            break;
-        default:
-            break;
-    }
-
-    LogRel2(("Audio: Device '%ls' has changed state to '%s'\n", pwstrDeviceId, pszState));
-
+ * Helper function for invoking the audio connector callback (if any).
+ */
+void VBoxMMNotificationClient::doCallback(void)
+{
 #ifdef VBOX_WITH_AUDIO_CALLBACKS
     AssertPtr(this->m_pDrvIns);
@@ -164 +137 @@
         /* Ignore rc */ this->m_pfnCallback(this->m_pDrvIns, PDMAUDIOBACKENDCBTYPE_DEVICES_CHANGED, NULL, 0);
 #endif
+}
+
+/**
+ * Handler implementation which is called when an audio device state
+ * has been changed.
+ *
+ * @return  HRESULT
+ * @param   pwstrDeviceId       Device ID the state is announced for.
+ * @param   dwNewState          New state the device is now in.
+ */
+STDMETHODIMP VBoxMMNotificationClient::OnDeviceStateChanged(LPCWSTR pwstrDeviceId, DWORD dwNewState)
+{
+    char *pszState = "unknown";
+
+    switch (dwNewState)
+    {
+        case DEVICE_STATE_ACTIVE:
+            pszState = "active";
+            break;
+        case DEVICE_STATE_DISABLED:
+            pszState = "disabled";
+            break;
+        case DEVICE_STATE_NOTPRESENT:
+            pszState = "not present";
+            break;
+        case DEVICE_STATE_UNPLUGGED:
+            pszState = "unplugged";
+            break;
+        default:
+            break;
+    }
+
+    LogRel(("Audio: Device '%ls' has changed state to '%s'\n", pwstrDeviceId, pszState));
+
+    doCallback();
 
     return S_OK;
@@ -176 +184 @@
 STDMETHODIMP VBoxMMNotificationClient::OnDeviceAdded(LPCWSTR pwstrDeviceId)
 {
-    RT_NOREF(pwstrDeviceId);
-    LogFunc(("%ls\n", pwstrDeviceId));
+    LogRel(("Audio: Device '%ls' has been added\n", pwstrDeviceId));
+
     return S_OK;
 }
@@ -189 +197 @@
 STDMETHODIMP VBoxMMNotificationClient::OnDeviceRemoved(LPCWSTR pwstrDeviceId)
 {
-    RT_NOREF(pwstrDeviceId);
-    LogFunc(("%ls\n", pwstrDeviceId));
+    LogRel(("Audio: Device '%ls' has been removed\n", pwstrDeviceId));
+
     return S_OK;
 }
@@ -205 +213 @@
 STDMETHODIMP VBoxMMNotificationClient::OnDefaultDeviceChanged(EDataFlow eFlow, ERole eRole, LPCWSTR pwstrDefaultDeviceId)
 {
-    RT_NOREF(eFlow, eRole, pwstrDefaultDeviceId);
+    RT_NOREF(eRole);
+
+    char *pszRole = "unknown";
 
     if (eFlow == eRender)
-    {
-
-    }
+        pszRole = "output";
+    else if (eFlow == eCapture)
+        pszRole = "input";
+
+    LogRel(("Audio: Default %s device has been changed to '%ls'\n", pszRole, pwstrDefaultDeviceId));
+
+    doCallback();
 
     return S_OK;

trunk/src/VBox/Devices/Audio/VBoxMMNotificationClient.h

@@ -70 +70 @@
     void    DetachFromEndpoint();
 
+    void    doCallback(void);
+
     /** @name IMMNotificationClient interface
      * @{ */