Changeset 54428 in vbox

Timestamp:

Feb 24, 2015 10:15:20 AM (10 years ago)

Author:

vboxsync

Message:

PDM/Audio: Updates.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevIchHda.cpp (modified) (4 diffs)
• DrvAudio.cpp (modified) (1 diff)

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

@@ -2672 +2672 @@
         PAUDMIXSINK pSink;
 #endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
-        uint32_t cbWritten;
+        uint32_t cbWritten = 0;
         switch (enmSrc)
         {
@@ -3188 +3188 @@
             rc = SSMR3GetU32(pSSM, &cRegs); AssertRCReturn(rc, rc);
             if (cRegs != RT_ELEMENTS(pThis->au32Regs))
-                LogRel(("cRegs is %d, expected %d\n", cRegs, RT_ELEMENTS(pThis->au32Regs)));
+                LogRel(("HDA: SSM version cRegs is %RU32, expected %RU32\n", cRegs, RT_ELEMENTS(pThis->au32Regs)));
             break;
 
@@ -3221 +3221 @@
 #ifdef VBOX_WITH_HDA_MIC_IN
     bool fEnableMicIn = RT_BOOL(SDCTL(pThis, 2) & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));
+#else
+    bool fEnableMicIn = fEnableIn; /* Mic In == Line In */
 #endif
     bool fEnableOut   = RT_BOOL(SDCTL(pThis, 4) & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));
@@ -3228 +3230 @@
     RTListForEach(&pThis->lstDrv, pDrv, HDADRIVER, Node)
     {
-        rc = pDrv->pConnector->pfnEnableIn(pDrv->pConnector, pDrv->LineIn.pStrmIn,
-                                           fEnableIn);
+        rc = pDrv->pConnector->pfnEnableIn(pDrv->pConnector, pDrv->LineIn.pStrmIn, fEnableIn);
         if (RT_FAILURE(rc))
             break;
-# ifdef VBOX_WITH_HDA_MIC_IN
-        rc = pDrv->pConnector->pfnEnableIn(pDrv->pConnector, pDrv->MicIn.pStrmIn,
-                                           fEnableMicIn);
+        rc = pDrv->pConnector->pfnEnableIn(pDrv->pConnector, pDrv->MicIn.pStrmIn, fEnableMicIn);
         if (RT_FAILURE(rc))
             break;
-# endif
-        rc = pDrv->pConnector->pfnEnableOut(pDrv->pConnector, pDrv->Out.pStrmOut,
-                                            fEnableOut);
+        rc = pDrv->pConnector->pfnEnableOut(pDrv->pConnector, pDrv->Out.pStrmOut, fEnableOut);
         if (RT_FAILURE(rc))
             break;

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

@@ -1401 +1401 @@
 
     if (!pThis->pHostDrvAudio->pfnIsEnabled(pThis->pHostDrvAudio, PDMAUDIODIR_IN))
-        return VERR_NOT_AVAILABLE;
+    {
+        if (pcbRead)
+            *pcbRead = 0;
+        return VINF_SUCCESS;
+    } 
 
     PPDMAUDIOHSTSTRMIN pHstStrmIn = pGstStrmIn->pHstStrmIn;