Changeset 88360 in vbox for trunk/src/VBox/Devices

Timestamp:

Apr 5, 2021 12:15:13 AM (4 years ago)

Author:

vboxsync

Message:

DrvHostAudioCoreAudio: Converted to use PDMIAUDIONOTIFYFROMHOST. bugref:9890

File:

• trunk/src/VBox/Devices/Audio/DrvHostAudioCoreAudio.cpp (modified) (5 diffs)

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

@@ -108 +108 @@
     PCOREAUDIODEVICEDATA    pDefaultDevOut;
 #ifdef VBOX_WITH_AUDIO_CALLBACKS
-    /** Callback function to the upper driver.
-     *  Can be NULL if not being used / registered. */
-    PFNPDMHOSTAUDIOCALLBACK pfnCallback;
+    /** Upwards notification interface. */
+    PPDMIAUDIONOTIFYFROMHOST pIAudioNotifyFromHost;
 #endif
 } DRVHOSTCOREAUDIO, *PDRVHOSTCOREAUDIO;
@@ -1032 +1031 @@
     }
 
-#ifdef VBOX_WITH_AUDIO_CALLBACKS
-    PFNPDMHOSTAUDIOCALLBACK pfnCallback = pThis->pfnCallback;
-#endif
-
-    /* Make sure to leave the critical section before calling the callback. */
+    /* Make sure to leave the critical section before notify higher drivers/devices. */
     rc2 = RTCritSectLeave(&pThis->CritSect);
     AssertRC(rc2);
 
 #ifdef VBOX_WITH_AUDIO_CALLBACKS
-    if (pfnCallback)
-        pfnCallback(pThis->pDrvIns, PDMAUDIOBACKENDCBTYPE_DEVICES_CHANGED, NULL, 0); /* Ignore rc */
+    /* Notify the driver/device above us about possible changes in devices. */
+    if (pThis->pIAudioNotifyFromHost)
+        pThis->pIAudioNotifyFromHost->pfnNotifyDevicesChanged(pThis->pIAudioNotifyFromHost);
 #endif
 
@@ -2204 +2200 @@
     return rc;
 }
-
-
-#ifdef VBOX_WITH_AUDIO_CALLBACKS
-/**
- * @interface_method_impl{PDMIHOSTAUDIO,pfnSetCallback}
- */
-static DECLCALLBACK(int) drvHostCoreAudioHA_SetCallback(PPDMIHOSTAUDIO pInterface, PFNPDMHOSTAUDIOCALLBACK pfnCallback)
-{
-    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
-    /* pfnCallback will be handled below. */
-
-    PDRVHOSTCOREAUDIO pThis = PDMIHOSTAUDIO_2_DRVHOSTCOREAUDIO(pInterface);
-
-    int rc = RTCritSectEnter(&pThis->CritSect);
-    if (RT_SUCCESS(rc))
-    {
-        LogFunc(("pfnCallback=%p\n", pfnCallback));
-
-        if (pfnCallback) /* Register. */
-        {
-            Assert(pThis->pfnCallback == NULL);
-            pThis->pfnCallback = pfnCallback;
-        }
-        else /* Unregister. */
-        {
-            if (pThis->pfnCallback)
-                pThis->pfnCallback = NULL;
-        }
-
-        int rc2 = RTCritSectLeave(&pThis->CritSect);
-        AssertRC(rc2);
-    }
-
-    return rc;
-}
-#endif
 
 
@@ -2603 +2563 @@
     pThis->IHostAudio.pfnStreamPlay         = drvHostCoreAudioHA_StreamPlay;
     pThis->IHostAudio.pfnStreamCapture      = drvHostCoreAudioHA_StreamCapture;
-#ifdef VBOX_WITH_AUDIO_CALLBACKS
-    pThis->IHostAudio.pfnSetCallback        = drvHostCoreAudioHA_SetCallback;
-    pThis->pfnCallback                      = NULL;
-#else
     pThis->IHostAudio.pfnSetCallback        = NULL;
-#endif
     pThis->IHostAudio.pfnGetDevices         = drvHostCoreAudioHA_GetDevices;
     pThis->IHostAudio.pfnStreamGetPending   = NULL;
@@ -2618 +2573 @@
     int rc = RTCritSectInit(&pThis->CritSect);
     AssertRCReturn(rc, rc);
+
+#ifdef VBOX_WITH_AUDIO_CALLBACKS
+    /*
+     * Query the notification interface from the driver/device above us.
+     */
+    pThis->pIAudioNotifyFromHost = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMIAUDIONOTIFYFROMHOST);
+    Assert(pThis->pIAudioNotifyFromHost);
+#endif
 
 #ifdef VBOX_AUDIO_DEBUG_DUMP_PCM_DATA