Changeset 88361 in vbox for trunk/src

Timestamp:

Apr 5, 2021 12:23:47 AM (4 years ago)

Author:

vboxsync

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

143608

Message:

DrvHostAudioDSound: Converted to use PDMIAUDIONOTIFYFROMHOST. bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• DrvHostAudioDSound.cpp (modified) (5 diffs)
• DrvHostAudioDSoundMMNotifClient.cpp (modified) (3 diffs)
• DrvHostAudioDSoundMMNotifClient.h (modified) (3 diffs)

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

@@ -214 +214 @@
     DSOUNDHOSTCFG               Cfg;
     /** List of devices of last enumeration. */
-    PDMAUDIOHOSTENUM          DeviceEnum;
+    PDMAUDIOHOSTENUM            DeviceEnum;
     /** Whether this backend supports any audio input. */
     bool                        fEnabledIn;
@@ -224 +224 @@
     LPDIRECTSOUNDCAPTURE8       pDSC;
 #ifdef VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT
-    DrvHostAudioDSoundMMNotifClient   *m_pNotificationClient;
-#endif
-#ifdef VBOX_WITH_AUDIO_CALLBACKS
-    /** Callback function to the upper driver.
-     *  Can be NULL if not being used / registered. */
-    PFNPDMHOSTAUDIOCALLBACK     pfnCallback;
+    DrvHostAudioDSoundMMNotifClient *m_pNotificationClient;
 #endif
     /** Pointer to the input stream. */
@@ -2539 +2534 @@
     return VINF_SUCCESS;
 }
-
-#ifdef VBOX_WITH_AUDIO_CALLBACKS
-/**
- * @interface_method_impl{PDMIHOSTAUDIO,pfnSetCallback}
- */
-static DECLCALLBACK(int) drvHostDSoundHA_SetCallback(PPDMIHOSTAUDIO pInterface, PFNPDMHOSTAUDIOCALLBACK pfnCallback)
-{
-    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
-    /* pfnCallback will be handled below. */
-
-    PDRVHOSTDSOUND pThis = PDMIHOSTAUDIO_2_DRVHOSTDSOUND(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;
-
-#ifdef VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT
-            if (pThis->m_pNotificationClient)
-                pThis->m_pNotificationClient->RegisterCallback(pThis->pDrvIns, pfnCallback);
-#endif
-        }
-        else /* Unregister. */
-        {
-            if (pThis->pfnCallback)
-                pThis->pfnCallback = NULL;
-
-#ifdef VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT
-            if (pThis->m_pNotificationClient)
-                pThis->m_pNotificationClient->UnregisterCallback();
-#endif
-        }
-
-        int rc2 = RTCritSectLeave(&pThis->CritSect);
-        AssertRC(rc2);
-    }
-
-    return rc;
-}
-#endif
 
 
@@ -2679 +2629 @@
     pThis->IHostAudio.pfnStreamPlay         = drvHostDSoundHA_StreamPlay;
     pThis->IHostAudio.pfnStreamCapture      = drvHostDSoundHA_StreamCapture;
-#ifdef VBOX_WITH_AUDIO_CALLBACKS
-    pThis->IHostAudio.pfnSetCallback        = drvHostDSoundHA_SetCallback;
-    pThis->pfnCallback                      = NULL;
-#else
     pThis->IHostAudio.pfnSetCallback        = NULL;
-#endif
     pThis->IHostAudio.pfnGetDevices         = drvHostDSoundHA_GetDevices;
     pThis->IHostAudio.pfnStreamGetPending   = drvHostDSoundHA_StreamGetPending;
@@ -2716 +2661 @@
     if (fUseNotificationClient)
     {
+        /* Get the notification interface. */
+# ifdef VBOX_WITH_AUDIO_CALLBACKS
+        PPDMIAUDIONOTIFYFROMHOST pIAudioNotifyFromHost = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMIAUDIONOTIFYFROMHOST);
+        Assert(pIAudioNotifyFromHost);
+# else
+        PPDMIAUDIONOTIFYFROMHOST pIAudioNotifyFromHost = NULL;
+# endif
+
         try
         {
-            pThis->m_pNotificationClient = new DrvHostAudioDSoundMMNotifClient();
+            pThis->m_pNotificationClient = new DrvHostAudioDSoundMMNotifClient(pIAudioNotifyFromHost);
 
             hr = pThis->m_pNotificationClient->Initialize();

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

@@ -30 +30 @@
 
 
-DrvHostAudioDSoundMMNotifClient::DrvHostAudioDSoundMMNotifClient(void)
+DrvHostAudioDSoundMMNotifClient::DrvHostAudioDSoundMMNotifClient(PPDMIAUDIONOTIFYFROMHOST pInterface)
     : m_fRegisteredClient(false)
     , m_cRef(1)
+    , m_pIAudioNotifyFromHost(pInterface)
 {
 }
@@ -86 +87 @@
 
 /**
- * Registration callback implementation for storing our (required) contexts.
- *
- * @return  IPRT status code.
- * @param   pDrvIns             Driver instance to register the notification client to.
- * @param   pfnCallback         Audio callback to call by the notification client in case of new events.
- */
-int DrvHostAudioDSoundMMNotifClient::RegisterCallback(PPDMDRVINS pDrvIns, PFNPDMHOSTAUDIOCALLBACK pfnCallback)
-{
-    this->m_pDrvIns     = pDrvIns;
-    this->m_pfnCallback = pfnCallback;
-
-    return VINF_SUCCESS;
-}
-
-/**
- * Unregistration callback implementation for cleaning up our mess when we're done handling
- * with notifications.
- */
-void DrvHostAudioDSoundMMNotifClient::UnregisterCallback(void)
-{
-    this->m_pDrvIns     = NULL;
-    this->m_pfnCallback = NULL;
-}
-
-/**
  * Stub being called when attaching to the default audio endpoint.
  * Does nothing at the moment.
@@ -133 +109 @@
 void DrvHostAudioDSoundMMNotifClient::doCallback(void)
 {
-#ifdef VBOX_WITH_AUDIO_CALLBACKS
-    AssertPtr(this->m_pDrvIns);
-    AssertPtr(this->m_pfnCallback);
-
-    if (this->m_pfnCallback)
-        /* Ignore rc */ this->m_pfnCallback(this->m_pDrvIns, PDMAUDIOBACKENDCBTYPE_DEVICES_CHANGED, NULL, 0);
-#endif
+    if (m_pIAudioNotifyFromHost)
+        m_pIAudioNotifyFromHost->pfnNotifyDevicesChanged(m_pIAudioNotifyFromHost);
 }
 

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

@@ -43 +43 @@
 public:
 
-    DrvHostAudioDSoundMMNotifClient();
+    DrvHostAudioDSoundMMNotifClient(PPDMIAUDIONOTIFYFROMHOST pInterface);
     virtual ~DrvHostAudioDSoundMMNotifClient();
 
@@ -50 +50 @@
     HRESULT Register(void);
     void    Unregister(void);
-
-    int     RegisterCallback(PPDMDRVINS pDrvIns, PFNPDMHOSTAUDIOCALLBACK pfnCallback);
-    void    UnregisterCallback(void);
 
     /** @name IUnknown interface
@@ -67 +64 @@
     long                        m_cRef;
 
-    PPDMDRVINS                  m_pDrvIns;
-    PFNPDMHOSTAUDIOCALLBACK     m_pfnCallback;
+    PPDMIAUDIONOTIFYFROMHOST    m_pIAudioNotifyFromHost;
 
     HRESULT AttachToDefaultEndpoint();