Changeset 53831 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Jan 15, 2015 4:15:21 PM (10 years ago)

Author:

vboxsync

Message:

PDM/Audio: Build fix; forgot some files.

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleImpl2.cpp (modified) (2 diffs)
• DrvAudioVRDE.cpp (modified) (8 diffs)

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -2688 +2688 @@
                 case AudioDriverType_WinMM:
                 {
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+#  ifdef VBOX_WITH_PDM_AUDIO_DRIVER
                     #error "Port WinMM audio backend!" /** @todo Still needed? */
-#else
+#  else
                     InsertConfigString(pCfg, "AudioDriver", "winmm");
-#endif
+#  endif
                     break;
                 }
@@ -2709 +2709 @@
                 case AudioDriverType_SolAudio:
                 {
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-                    #error "Port Solaris audio backend!" /** @todo Port Solaris driver. */
-#else
+# ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+                    /** @todo Hack alert: Find a better solution. */
+                    LogRel(("Audio: WARNING: Solaris Audio is deprecated, please switch to OSS!\n"));
+                    LogRel(("Audio: Automatically setting host audio backend to OSS\n"));
+                    /* Manually set backend to OSS for now. */
+                    InsertConfigString(pLunL1, "Driver", "OSSAudio"); 
+# else
                     InsertConfigString(pCfg, "AudioDriver", "solaudio");
-#endif
+# endif
                     break;
                 }

trunk/src/VBox/Main/src-client/DrvAudioVRDE.cpp

@@ -204 +204 @@
                                                  pHstStrmOut->Props.fSigned);
 
-    LogFlowFunc(("hz=%d, chan=%d, cBits=%d, fSigned=%RTbool, format=%ld\n",
+    pVRDEStrmOut->old_ticks = now;
+
+    int cSamplesToSend = live;
+
+/*  if (!cSamplesToSend)
+    {
+        if (pcSamplesPlayed)
+            pcSamplesPlayed = 0;
+
+        return 0;
+    }*/
+
+    LogFlowFunc(("uFreq=%RU32, cChan=%RU8, cBits=%RU8, fSigned=%RTbool, enmFormat=%ld, cSamplesToSend=%RU32\n",
                  pHstStrmOut->Props.uHz, pHstStrmOut->Props.cChannels,
                  pHstStrmOut->Props.cBits, pHstStrmOut->Props.fSigned,
-                 format));
-
-    pVRDEStrmOut->old_ticks = now;
-    int cSamplesToSend = RT_MIN(live, cSamplesPlayed);
+                 format, cSamplesToSend));
 
     uint32_t cReadTotal = 0;
@@ -218 +227 @@
     int rc = audioMixBufAcquire(&pHstStrmOut->MixBuf, cSamplesToSend,
                                 &pSamples, &cRead);
-    if (RT_SUCCESS(rc))
+    if (   RT_SUCCESS(rc)
+        && cRead)
     {
         cReadTotal = cRead;
@@ -228 +238 @@
                                     &pSamples, &cRead);
             if (RT_SUCCESS(rc))
-            {
-                cReadTotal += cRead;
                 pDrv->pConsoleVRDPServer->SendAudioSamples(pSamples, cRead, format);
-            }
+
+            cReadTotal += cRead;
         }
     }
 
-    audioMixBufFinish(&pHstStrmOut->MixBuf, cReadTotal);
-
+    audioMixBufFinish(&pHstStrmOut->MixBuf, cSamplesToSend);
+
+    /*
+     * Always report back all samples acquired, regardless of whether the
+     * VRDP server actually did process those.
+     */
     if (pcSamplesPlayed)
         *pcSamplesPlayed = cReadTotal;
 
-    LogFlowFunc(("cSamplesToSend=%RU32, rc=%Rrc\n", cSamplesToSend, rc));
+    LogFlowFunc(("cReadTotal=%RU32, rc=%Rrc\n", cReadTotal, rc));
     return rc;
 }
@@ -269 +282 @@
     AssertPtrReturn(pDrv, VERR_INVALID_POINTER);
 
+    PVRDESTREAMIN pVRDEStrmOut = (PVRDESTREAMIN)pHstStrmOut;
+    AssertPtrReturn(pVRDEStrmOut, VERR_INVALID_POINTER);
+
     LogFlowFunc(("enmStreamCmd=%ld\n", enmStreamCmd));
 
-    return VINF_SUCCESS;
-}
-
-static DECLCALLBACK(int) drvAudioVRDEControlIn(PPDMIHOSTAUDIO pInterface, PPDMAUDIOHSTSTRMIN pHstStrmIn2, /** @todo Fix param types! */
+    audioMixBufReset(&pHstStrmOut->MixBuf);
+
+    return VINF_SUCCESS;
+}
+
+static DECLCALLBACK(int) drvAudioVRDEControlIn(PPDMIHOSTAUDIO pInterface, PPDMAUDIOHSTSTRMIN pHstStrmIn,
                                                PDMAUDIOSTREAMCMD enmStreamCmd)
 {
@@ -280 +298 @@
     AssertPtrReturn(pDrv, VERR_INVALID_POINTER);
 
-    PVRDESTREAMIN pVRDEStrmIn = (PVRDESTREAMIN)pHstStrmIn2;
+    PVRDESTREAMIN pVRDEStrmIn = (PVRDESTREAMIN)pHstStrmIn;
     AssertPtrReturn(pVRDEStrmIn, VERR_INVALID_POINTER);
 
-    PPDMAUDIOHSTSTRMIN pHstStrmIn = &pVRDEStrmIn->HstStrmIn;
+    PPDMAUDIOHSTSTRMIN pThisStrmIn = &pVRDEStrmIn->HstStrmIn;
 
     LogFlowFunc(("enmStreamCmd=%ld\n", enmStreamCmd));
+
+    if (!pDrv->pConsoleVRDPServer)
+        return VINF_SUCCESS;
+
+    audioMixBufReset(&pThisStrmIn->MixBuf);
 
     /* Initialize only if not already done. */
     if (enmStreamCmd == PDMAUDIOSTREAMCMD_ENABLE)
     {
-        int rc2 = pDrv->pConsoleVRDPServer->SendAudioInputBegin(NULL, pVRDEStrmIn, audioMixBufSize(&pHstStrmIn->MixBuf),
-                                                                pHstStrmIn->Props.uHz,
-                                                                pHstStrmIn->Props.cChannels, pHstStrmIn->Props.cBits);
+        int rc2 = pDrv->pConsoleVRDPServer->SendAudioInputBegin(NULL, pVRDEStrmIn, audioMixBufSize(&pThisStrmIn->MixBuf),
+                                                                pThisStrmIn->Props.uHz,
+                                                                pThisStrmIn->Props.cChannels, pThisStrmIn->Props.cBits);
 #ifdef DEBUG
         if (rc2 == VERR_NOT_SUPPORTED)
@@ -299 +322 @@
     }
     else if (enmStreamCmd == PDMAUDIOSTREAMCMD_DISABLE)
+    {
         pDrv->pConsoleVRDPServer->SendAudioInputEnd(NULL /* pvUserCtx */);
+    }
 
     return VINF_SUCCESS;
@@ -345 +370 @@
 {
     LogFlowThisFunc(("fIntercept=%RTbool\n", fIntercept));
+
     return VINF_SUCCESS; /* Never veto. */
 }
@@ -430 +456 @@
     /* IBase */
     pDrvIns->IBase.pfnQueryInterface  = drvAudioVRDEQueryInterface;
+    /* IHostAudioR3 */
     pThis->IHostAudioR3.pfnInitIn     = drvAudioVRDEInitIn;
     pThis->IHostAudioR3.pfnInitOut    = drvAudioVRDEInitOut;