Changeset 58600 in vbox for trunk/src/VBox/Devices/Audio/DevIchHda.cpp

Timestamp:

Nov 6, 2015 12:26:32 PM (9 years ago)

Author:

vboxsync

Message:

Audio: Introduced reference counting for guest audio streams; this should prevent that the audio connector interface is destroying streams which still are being used by other parties, e.g. the audio mixer (bugref:8054).

File:

• trunk/src/VBox/Devices/Audio/DevIchHda.cpp (modified) (7 diffs)

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

@@ -2303 +2303 @@
 }
 
-static DECLCALLBACK(void) hdaCloseIn(PHDASTATE pThis, PDMAUDIORECSOURCE enmRecSource)
+static DECLCALLBACK(void) hdaDestroyIn(PHDASTATE pThis, PDMAUDIORECSOURCE enmRecSource)
 {
     NOREF(pThis);
@@ -2310 +2310 @@
 }
 
-static DECLCALLBACK(void) hdaCloseOut(PHDASTATE pThis)
+static DECLCALLBACK(void) hdaDestroyOut(PHDASTATE pThis)
 {
     NOREF(pThis);
@@ -2316 +2316 @@
 }
 
-static DECLCALLBACK(int) hdaOpenIn(PHDASTATE pThis,
-                                   const char *pszName, PDMAUDIORECSOURCE enmRecSource,
-                                   PPDMAUDIOSTREAMCFG pCfg)
+static DECLCALLBACK(int) hdaCreateIn(PHDASTATE pThis,
+                                     const char *pszName, PDMAUDIORECSOURCE enmRecSource,
+                                     PPDMAUDIOSTREAMCFG pCfg)
 {
     PAUDMIXSINK pSink;
@@ -2349 +2349 @@
         }
 
-        rc = pDrv->pConnector->pfnOpenIn(pDrv->pConnector, pszDesc, enmRecSource, pCfg, &pDrv->LineIn.pStrmIn);
-        LogFlowFunc(("LUN#%RU8: Opened input \"%s\", with rc=%Rrc\n", pDrv->uLUN, pszDesc, rc));
+        rc = pDrv->pConnector->pfnCreateIn(pDrv->pConnector, pszDesc, enmRecSource, pCfg, &pDrv->LineIn.pStrmIn);
+        LogFlowFunc(("LUN#%RU8: Created input \"%s\", with rc=%Rrc\n", pDrv->uLUN, pszDesc, rc));
         if (rc == VINF_SUCCESS) /* Note: Could return VWRN_ALREADY_EXISTS. */
         {
@@ -2366 +2366 @@
 }
 
-static DECLCALLBACK(int) hdaOpenOut(PHDASTATE pThis,
-                                    const char *pszName, PPDMAUDIOSTREAMCFG pCfg)
+static DECLCALLBACK(int) hdaCreateOut(PHDASTATE pThis,
+                                      const char *pszName, PPDMAUDIOSTREAMCFG pCfg)
 {
     int rc = VINF_SUCCESS;
@@ -2381 +2381 @@
         }
 
-        rc = pDrv->pConnector->pfnOpenOut(pDrv->pConnector, pszDesc, pCfg, &pDrv->Out.pStrmOut);
-        LogFlowFunc(("LUN#%RU8: Opened output \"%s\", with rc=%Rrc\n", pDrv->uLUN, pszDesc, rc));
+        rc = pDrv->pConnector->pfnCreateOut(pDrv->pConnector, pszDesc, pCfg, &pDrv->Out.pStrmOut);
+        LogFlowFunc(("LUN#%RU8: Created output \"%s\", with rc=%Rrc\n", pDrv->uLUN, pszDesc, rc));
         if (rc == VINF_SUCCESS) /* Note: Could return VWRN_ALREADY_EXISTS. */
         {
@@ -3761 +3761 @@
 
         /* Audio driver callbacks for multiplexing. */
-        pThis->pCodec->pfnCloseIn   = hdaCloseIn;
-        pThis->pCodec->pfnCloseOut  = hdaCloseOut;
-        pThis->pCodec->pfnOpenIn    = hdaOpenIn;
-        pThis->pCodec->pfnOpenOut   = hdaOpenOut;
-        pThis->pCodec->pfnReset     = hdaCodecReset;
-        pThis->pCodec->pfnSetVolume = hdaSetVolume;
+        pThis->pCodec->pfnDestroyIn  = hdaDestroyIn;
+        pThis->pCodec->pfnDestroyOut = hdaDestroyOut;
+        pThis->pCodec->pfnCreateIn   = hdaCreateIn;
+        pThis->pCodec->pfnCreateOut  = hdaCreateOut;
+        pThis->pCodec->pfnReset      = hdaCodecReset;
+        pThis->pCodec->pfnSetVolume  = hdaSetVolume;
 
         pThis->pCodec->pHDAState = pThis; /* Assign HDA controller state to codec. */