Changeset 68683 in vbox

Timestamp:

Sep 6, 2017 3:26:32 PM (8 years ago)

Author:

vboxsync

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

117914

Message:

Audio: More code for audio endpoint (change) detection for Windows hosts.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DrvHostDSound.cpp (modified) (7 diffs)
• VBoxMMNotificationClient.cpp (modified) (3 diffs)
• VBoxMMNotificationClient.h (modified) (3 diffs)

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

@@ -139 +139 @@
 {
     /** Pointer to the driver instance structure. */
-    PPDMDRVINS              pDrvIns;
+    PPDMDRVINS                  pDrvIns;
     /** Our audio host audio interface. */
-    PDMIHOSTAUDIO           IHostAudio;
+    PDMIHOSTAUDIO               IHostAudio;
+    /** Critical section to serialize access. */
+    RTCRITSECT                  CritSect;
     /** List of found host input devices. */
-    RTLISTANCHOR            lstDevInput;
+    RTLISTANCHOR                lstDevInput;
     /** List of found host output devices. */
-    RTLISTANCHOR            lstDevOutput;
+    RTLISTANCHOR                lstDevOutput;
     /** DirectSound configuration options. */
-    DSOUNDHOSTCFG           cfg;
+    DSOUNDHOSTCFG               cfg;
     /** Whether this backend supports any audio input. */
-    bool                    fEnabledIn;
+    bool                        fEnabledIn;
     /** Whether this backend supports any audio output. */
-    bool                    fEnabledOut;
+    bool                        fEnabledOut;
     /** The Direct Sound playback interface. */
-    LPDIRECTSOUND8          pDS;
+    LPDIRECTSOUND8              pDS;
     /** The Direct Sound capturing interface. */
-    LPDIRECTSOUNDCAPTURE8   pDSC;
+    LPDIRECTSOUNDCAPTURE8       pDSC;
 #ifdef VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT
-    VBoxMMNotificationClient *m_pNotificationClient;
+    VBoxMMNotificationClient   *m_pNotificationClient;
+#endif
+#ifdef VBOX_WITH_AUDIO_CALLBACKS
+    /** Callback function to the upper driver.
+     *  Can be NULL if not being used / registered. */
+    PFNPDMHOSTAUDIOCALLBACK     pfnCallback;
 #endif
 #ifdef VBOX_WITH_AUDIO_DEVICE_CALLBACKS
     /** Pointer to the audio connector interface of the driver/device above us. */
-    PPDMIAUDIOCONNECTOR     pUpIAudioConnector;
+    PPDMIAUDIOCONNECTOR         pUpIAudioConnector;
     /** Stopped indicator. */
-    bool                    fStopped;
+    bool                        fStopped;
     /** Shutdown indicator. */
-    bool                    fShutdown;
+    bool                        fShutdown;
     /** Notification thread. */
-    RTTHREAD                Thread;
+    RTTHREAD                    Thread;
     /** Array of events to wait for in notification thread. */
-    HANDLE                  aEvents[VBOX_DSOUND_MAX_EVENTS];
+    HANDLE                      aEvents[VBOX_DSOUND_MAX_EVENTS];
     /** Number of events to wait for in notification thread.
      *  Must not exceed VBOX_DSOUND_MAX_EVENTS. */
-    uint8_t                 cEvents;
+    uint8_t                     cEvents;
     /** Pointer to the input stream. */
-    PDSOUNDSTREAM           pDSStrmIn;
+    PDSOUNDSTREAM               pDSStrmIn;
     /** Pointer to the output stream. */
-    PDSOUNDSTREAM           pDSStrmOut;
+    PDSOUNDSTREAM               pDSStrmOut;
 #endif
 } DRVHOSTDSOUND, *PDRVHOSTDSOUND;
@@ -2168 +2175 @@
 
 
-static void dsoundConfigInit(PDRVHOSTDSOUND pThis, PCFGMNODE pCfg)
+static int dsoundConfigInit(PDRVHOSTDSOUND pThis, PCFGMNODE pCfg)
 {
     unsigned int uBufsizeOut, uBufsizeIn;
@@ -2185 +2192 @@
            &pThis->cfg.uuidPlay,
            &pThis->cfg.uuidCapture));
+
+    return VINF_SUCCESS;
 }
 
@@ -2375 +2384 @@
 }
 
+#ifdef VBOX_WITH_AUDIO_CALLBACKS
+/**
+ * @interface_method_impl{PDMIHOSTAUDIO,pfnSetCallback}
+ */
+static DECLCALLBACK(int) drvHostDSoundSetCallback(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
 
 /*********************************************************************************************************************************
@@ -2420 +2473 @@
     if (pThis->pDrvIns)
         CoUninitialize();
+
+    int rc2 = RTCritSectDelete(&pThis->CritSect);
+    AssertRC(rc2);
 
     LogFlowFuncLeave();
@@ -2454 +2510 @@
     PDMAUDIO_IHOSTAUDIO_CALLBACKS(drvHostDSound);
 
+#ifdef VBOX_WITH_AUDIO_CALLBACKS
+    /* This backend supports host audio callbacks. */
+    pThis->IHostAudio.pfnSetCallback = drvHostDSoundSetCallback;
+    pThis->pfnCallback               = NULL;
+#endif
+
 #ifdef VBOX_WITH_AUDIO_DEVICE_CALLBACKS
     /*
@@ -2500 +2562 @@
 #endif
 
-    /*
-     * Initialize configuration values.
-     */
-    dsoundConfigInit(pThis, pCfg);
+    if (RT_SUCCESS(rc))
+    {
+        /*
+         * Initialize configuration values.
+         */
+        rc = dsoundConfigInit(pThis, pCfg);
+        if (RT_SUCCESS(rc))
+            rc = RTCritSectInit(&pThis->CritSect);
+    }
 
     return rc;

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

@@ -27 +27 @@
 #pragma warning(pop)
 
+#ifdef LOG_GROUP
+# undef LOG_GROUP
+#endif
 #define LOG_GROUP LOG_GROUP_DRV_HOST_AUDIO
 #include <VBox/log.h>
@@ -69 +72 @@
 }
 
+int VBoxMMNotificationClient::RegisterCallback(PPDMDRVINS pDrvIns, PFNPDMHOSTAUDIOCALLBACK pfnCallback)
+{
+    this->m_pDrvIns     = pDrvIns;
+    this->m_pfnCallback = pfnCallback;
+
+    return VINF_SUCCESS;
+}
+
+void VBoxMMNotificationClient::UnregisterCallback(void)
+{
+    this->m_pDrvIns     = NULL;
+    this->m_pfnCallback = NULL;
+}
+
 HRESULT VBoxMMNotificationClient::AttachToDefaultEndpoint(void)
 {
@@ -81 +98 @@
 STDMETHODIMP VBoxMMNotificationClient::OnDeviceStateChanged(LPCWSTR pwstrDeviceId, DWORD dwNewState)
 {
-    char  *pszState = "UNKNOWN";
+    char *pszState = "unknown";
 
     switch (dwNewState)
     {
         case DEVICE_STATE_ACTIVE:
-            pszState = "ACTIVE";
+            pszState = "active";
             break;
         case DEVICE_STATE_DISABLED:
-            pszState = "DISABLED";
+            pszState = "disabled";
             break;
         case DEVICE_STATE_NOTPRESENT:
-            pszState = "NOTPRESENT";
+            pszState = "not present";
             break;
         case DEVICE_STATE_UNPLUGGED:
-            pszState = "UNPLUGGED";
+            pszState = "unplugged";
+            break;
+        default:
             break;
     }
 
-    LogFunc(("%ls: %s\n", pwstrDeviceId, pszState));
+    LogRel2(("Audio: Device '%ls' has changed state to '%s'\n", pwstrDeviceId, pszState));
+
+#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
+
     return S_OK;
 }

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

@@ -25 +25 @@
 #include <Mmdeviceapi.h>
 
+#include "DrvAudio.h"
+
 class VBoxMMNotificationClient : IMMNotificationClient
 {
@@ -33 +35 @@
 
     HRESULT Initialize();
+    int     RegisterCallback(PPDMDRVINS pDrvIns, PFNPDMHOSTAUDIOCALLBACK pfnCallback);
+    void    UnregisterCallback(void);
     void    Dispose();
 
@@ -42 +46 @@
 private:
 
-    bool                 m_fRegisteredClient;
-    IMMDeviceEnumerator *m_pEnum;
-    IMMDevice           *m_pEndpoint;
+    bool                        m_fRegisteredClient;
+    IMMDeviceEnumerator        *m_pEnum;
+    IMMDevice                  *m_pEndpoint;
 
-    long                 m_cRef;
+    long                        m_cRef;
+
+    PPDMDRVINS                  m_pDrvIns;
+    PFNPDMHOSTAUDIOCALLBACK     m_pfnCallback;
 
     HRESULT AttachToDefaultEndpoint();