Changeset 88359 in vbox

Timestamp:

Apr 4, 2021 11:51:06 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

143606

Message:

Audio: Added notification interface that host drivers can use. Will replace the PDMIHOSTAUDIO::pfnSetCallback fun. bugref:9890

Location:

trunk

Files:

• include/VBox/vmm/pdmaudioifs.h (modified) (1 diff)
• src/VBox/Devices/Audio/DrvAudio.cpp (modified) (7 diffs)

trunk/include/VBox/vmm/pdmaudioifs.h

@@ -1451 +1451 @@
 #define PDMIHOSTAUDIO_IID                           "be34182b-d579-41e8-96e0-abb94900460f"
 
+
+/** Pointer to a audio notify from host interface. */
+typedef struct PDMIAUDIONOTIFYFROMHOST *PPDMIAUDIONOTIFYFROMHOST;
+
+/**
+ * PDM audio notification interface, for use by host audio.
+ *
+ * @todo better name?
+ */
+typedef struct PDMIAUDIONOTIFYFROMHOST
+{
+    /**
+     * One or more audio devices have changed in some way.
+     *
+     * The upstream driver/device should re-evaluate the devices they're using.
+     *
+     * @param   pInterface          Pointer to this interface.
+     */
+    DECLR3CALLBACKMEMBER(void, pfnNotifyDevicesChanged,(PPDMIAUDIONOTIFYFROMHOST pInterface));
+} PDMIAUDIONOTIFYFROMHOST;
+
+/** PDMIAUDIONOTIFYFROMHOST interface ID. */
+#define PDMIAUDIONOTIFYFROMHOST_IID                 "ec10f36b-ec2d-4b97-9044-2a59fba837ad"
+
 /** @} */
 

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

@@ -278 +278 @@
     /** Our audio connector interface. */
     PDMIAUDIOCONNECTOR      IAudioConnector;
+#ifdef VBOX_WITH_AUDIO_CALLBACKS
+    /** Interface used by the host backend. */
+    PDMIAUDIONOTIFYFROMHOST IAudioNotifyFromHost;
+#endif
     /** Pointer to the driver instance. */
     PPDMDRVINS              pDrvIns;
@@ -836 +840 @@
  * The actual re-initialization will happen at some later point in time.
  *
- * @returns VBox status code.
  * @param   pThis               Pointer to driver instance.
  */
-static int drvAudioScheduleReInitInternal(PDRVAUDIO pThis)
-{
-    AssertPtrReturn(pThis, VERR_INVALID_POINTER);
-
+static void drvAudioScheduleReInitInternal(PDRVAUDIO pThis)
+{
     LogFunc(("\n"));
 
@@ -858 +859 @@
     pThis->fEnumerateDevices = true;
 # endif
-
-    return VINF_SUCCESS;
 }
 #endif /* VBOX_WITH_AUDIO_CALLBACKS */
@@ -1938 +1937 @@
         case PDMAUDIOBACKENDCBTYPE_DEVICES_CHANGED:
             LogRel(("Audio: Device configuration of driver '%s' has changed\n", pThis->szName));
-            rc = drvAudioScheduleReInitInternal(pThis);
+            drvAudioScheduleReInitInternal(pThis);
             break;
 
@@ -3406 +3405 @@
 
 
+#ifdef VBOX_WITH_AUDIO_CALLBACKS
+/*********************************************************************************************************************************
+*   PDMIAUDIONOTIFYFROMHOST interface implementation.                                                                            *
+*********************************************************************************************************************************/
+
+/**
+ * @interface_method_impl{PDMIAUDIONOTIFYFROMHOST,pfnNotifyDevicesChanged}
+ */
+static DECLCALLBACK(void) drvAudioNotifyFromHost_NotifyDevicesChanged(PPDMIAUDIONOTIFYFROMHOST pInterface)
+{
+    PDRVAUDIO pThis = RT_FROM_MEMBER(pInterface, DRVAUDIO, IAudioNotifyFromHost);
+
+    LogRel(("Audio: Device configuration of driver '%s' has changed\n", pThis->szName));
+    drvAudioScheduleReInitInternal(pThis);
+}
+
+#endif /* VBOX_WITH_AUDIO_CALLBACKS */
+
+
 /*********************************************************************************************************************************
 *   PDMIBASE interface implementation.                                                                                           *
@@ -3422 +3440 @@
     PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASE, &pDrvIns->IBase);
     PDMIBASE_RETURN_INTERFACE(pszIID, PDMIAUDIOCONNECTOR, &pThis->IAudioConnector);
+#ifdef VBOX_WITH_AUDIO_CALLBACKS
+    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIAUDIONOTIFYFROMHOST, &pThis->IAudioNotifyFromHost);
+#endif
 
     return NULL;
@@ -3848 +3869 @@
     pThis->IAudioConnector.pfnStreamPlay        = drvAudioStreamPlay;
     pThis->IAudioConnector.pfnStreamCapture     = drvAudioStreamCapture;
+#ifdef VBOX_WITH_AUDIO_CALLBACKS
+    /* IAudioNotifyFromHost */
+    pThis->IAudioNotifyFromHost.pfnNotifyDevicesChanged = drvAudioNotifyFromHost_NotifyDevicesChanged;
+#endif
 
     /*