Changeset 73558 in vbox

Timestamp:

Aug 8, 2018 11:41:25 AM (6 years ago)

Author:

vboxsync

Message:

Audio/DrvAudio: Renaming.

File:

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

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

@@ -2337 +2337 @@
          * should have the audio data in the format the guest needs.
          */
-        uint32_t cReadTotal = 0;
+        uint32_t cfReadTotal = 0;
 
         uint32_t cfToRead = RT_MIN(AUDIOMIXBUF_B2F(&pStream->Guest.MixBuf, cbBuf), AudioMixBufUsed(&pStream->Guest.MixBuf));
         while (cfToRead)
         {
-            uint32_t cRead;
+            uint32_t cfRead;
             rc = AudioMixBufAcquireReadBlock(&pStream->Guest.MixBuf,
-                                             (uint8_t *)pvBuf + AUDIOMIXBUF_F2B(&pStream->Guest.MixBuf, cReadTotal),
-                                             AUDIOMIXBUF_F2B(&pStream->Guest.MixBuf, cfToRead), &cRead);
+                                             (uint8_t *)pvBuf + AUDIOMIXBUF_F2B(&pStream->Guest.MixBuf, cfReadTotal),
+                                             AUDIOMIXBUF_F2B(&pStream->Guest.MixBuf, cfToRead), &cfRead);
             if (RT_FAILURE(rc))
                 break;
 
 #ifdef VBOX_WITH_STATISTICS
-            const uint32_t cbRead = AUDIOMIXBUF_F2B(&pStream->Guest.MixBuf, cRead);
+            const uint32_t cbRead = AUDIOMIXBUF_F2B(&pStream->Guest.MixBuf, cfRead);
 
             STAM_COUNTER_ADD(&pThis->Stats.TotalBytesRead,      cbRead);
             STAM_COUNTER_ADD(&pStream->In.Stats.BytesTotalRead, cbRead);
 #endif
-            Assert(cfToRead >= cRead);
-            cfToRead -= cRead;
-
-            cReadTotal += cRead;
-
-            AudioMixBufReleaseReadBlock(&pStream->Guest.MixBuf, cRead);
-        }
-
-        if (cReadTotal)
+            Assert(cfToRead >= cfRead);
+            cfToRead -= cfRead;
+
+            cfReadTotal += cfRead;
+
+            AudioMixBufReleaseReadBlock(&pStream->Guest.MixBuf, cfRead);
+        }
+
+        if (cfReadTotal)
         {
             if (pThis->In.Cfg.Dbg.fEnabled)
                 DrvAudioHlpFileWrite(pStream->In.Dbg.pFileStreamRead,
-                                     pvBuf, AUDIOMIXBUF_F2B(&pStream->Guest.MixBuf, cReadTotal), 0 /* fFlags */);
-
-            AudioMixBufFinish(&pStream->Guest.MixBuf, cReadTotal);
-
-            cbReadTotal = AUDIOMIXBUF_F2B(&pStream->Guest.MixBuf, cReadTotal);
+                                     pvBuf, AUDIOMIXBUF_F2B(&pStream->Guest.MixBuf, cfReadTotal), 0 /* fFlags */);
+
+            AudioMixBufFinish(&pStream->Guest.MixBuf, cfReadTotal);
+
+            cbReadTotal = AUDIOMIXBUF_F2B(&pStream->Guest.MixBuf, cfReadTotal);
         }