Changeset 68893 in vbox

Timestamp:

Sep 27, 2017 4:25:53 PM (7 years ago)

Author:

vboxsync

Message:

Audio/DrvAudio.cpp: Added attach / detach callbacks.

File:

• trunk/src/VBox/Devices/Audio/DrvAudio.cpp (modified) (8 diffs)

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

@@ -1064 +1064 @@
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
     AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
-    /* pcData is optional. */
 
     PDRVAUDIO pThis = PDMIAUDIOCONNECTOR_2_DRVAUDIO(pInterface);
@@ -1096 +1095 @@
 {
     AssertPtrReturn(pThis, VERR_INVALID_POINTER);
+
+    if (!pThis->pHostDrvAudio)
+        return VINF_SUCCESS;
 
     if (!pStream)
@@ -1482 +1484 @@
     {
         if (!pThis->pHostDrvAudio)
-        {
-            rc = VERR_NOT_AVAILABLE;
-            break;
-        }
+            break;
 
         PPDMAUDIOSTREAM pHstStream = drvAudioGetHostStream(pStream);
@@ -1776 +1775 @@
     do
     {
+        if (!pThis->pHostDrvAudio)
+            break;
+
         PPDMAUDIOSTREAM pHstStream = drvAudioGetHostStream(pStream);
         AssertPtr(pHstStream);
@@ -2253 +2255 @@
     LogFlowFunc(("enmCmd=%s\n", DrvAudioHlpStreamCmdToStr(enmCmd)));
 
+    int rc2 = RTCritSectEnter(&pThis->CritSect);
+    AssertRC(rc2);
+
     if (!pThis->pHostDrvAudio)
         return;
@@ -2259 +2264 @@
     RTListForEach(&pThis->lstHstStreams, pHstStream, PDMAUDIOSTREAM, Node)
         drvAudioStreamControlInternalBackend(pThis, pHstStream, enmCmd);
+
+    rc2 = RTCritSectLeave(&pThis->CritSect);
+    AssertRC(rc2);
 }
 
@@ -3477 +3485 @@
 {
     drvAudioStateHandler(pDrvIns, PDMAUDIOSTREAMCMD_RESUME);
+}
+
+/**
+ * Attach notification.
+ *
+ * @param   pDrvIns     The driver instance data.
+ */
+static DECLCALLBACK(int) drvAudioAttach(PPDMDRVINS pDrvIns, uint32_t fFlags)
+{
+    RT_NOREF(fFlags);
+
+    PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
+    PDRVAUDIO pThis = PDMINS_2_DATA(pDrvIns, PDRVAUDIO);
+
+    int rc2 = RTCritSectEnter(&pThis->CritSect);
+    AssertRC(rc2);
+
+    int rc = VINF_SUCCESS;
+
+    LogFunc(("%s\n", pThis->szName));
+
+    rc2 = RTCritSectLeave(&pThis->CritSect);
+    if (RT_SUCCESS(rc))
+        rc = rc2;
+
+    return rc;
+}
+
+/**
+ * Detach notification.
+ *
+ * @param   pDrvIns     The driver instance data.
+ */
+static DECLCALLBACK(void) drvAudioDetach(PPDMDRVINS pDrvIns, uint32_t fFlags)
+{
+    RT_NOREF(fFlags);
+
+    PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
+    PDRVAUDIO pThis = PDMINS_2_DATA(pDrvIns, PDRVAUDIO);
+
+    int rc2 = RTCritSectEnter(&pThis->CritSect);
+    AssertRC(rc2);
+
+    pThis->pHostDrvAudio = NULL;
+
+    LogFunc(("%s\n", pThis->szName));
+
+    rc2 = RTCritSectLeave(&pThis->CritSect);
+    AssertRC(rc2);
 }
 
@@ -3519 +3576 @@
     drvAudioResume,
     /* pfnAttach */
-    NULL,
+    drvAudioAttach,
     /* pfnDetach */
-    NULL,
+    drvAudioDetach,
     /* pfnPowerOff */
     drvAudioPowerOff,