Changeset 63749 in vbox for trunk

Timestamp:

Sep 7, 2016 1:54:47 PM (8 years ago)

Author:

vboxsync

Message:

Audio/DrvHostALSAAudio.cpp: Fixed recording.

File:

• trunk/src/VBox/Devices/Audio/DrvHostALSAAudio.cpp (modified) (1 diff)

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

@@ -1686 +1686 @@
                               | PDMAUDIOSTRMSTS_FLAG_ENABLED;
 
+    snd_pcm_t         *phPCM       = NULL;
+    snd_pcm_sframes_t  cSamplesMin;
+
+    /** @todo Get rid of this once we have a unified ALSA stream. */
     if (pStream->enmDir == PDMAUDIODIR_IN)
     {
-
+        PALSAAUDIOSTREAMIN pStreamIn = (PALSAAUDIOSTREAMIN)pStream;
+        phPCM       = pStreamIn->phPCM;
+        cSamplesMin = 0;
+    }
+    else if (pStream->enmDir == PDMAUDIODIR_OUT)
+    {
+        PALSAAUDIOSTREAMOUT pStreamOut = (PALSAAUDIOSTREAMOUT)pStream;
+        phPCM       = pStreamOut->phPCM;
+        cSamplesMin = pStreamOut->cSamplesMin;
     }
     else
-    {
-        PALSAAUDIOSTREAMOUT pStreamOut = (PALSAAUDIOSTREAMOUT)pStream;
-
-        snd_pcm_sframes_t cAvail;
-        int rc2 = alsaStreamGetAvail(pStreamOut->phPCM, &cAvail);
+        AssertFailed();
+
+    if (phPCM)
+    {
+        snd_pcm_sframes_t cSamplesAvail;
+        int rc2 = alsaStreamGetAvail(phPCM, &cSamplesAvail);
         if (RT_SUCCESS(rc2))
         {
-            LogFlowFunc(("cAvail=%ld\n", cAvail));
-            if (cAvail >= (snd_pcm_sframes_t)pStreamOut->cSamplesMin)
-                strmSts |= PDMAUDIOSTRMSTS_FLAG_DATA_WRITABLE;
+            Log3Func(("cAvail=%ld \n", cSamplesAvail));
+            if (cSamplesAvail >= cSamplesMin)
+                strmSts |= pStream->enmDir == PDMAUDIODIR_IN
+                         ? PDMAUDIOSTRMSTS_FLAG_DATA_READABLE
+                         : PDMAUDIOSTRMSTS_FLAG_DATA_WRITABLE;
         }
     }