Changeset 62967 in vbox for trunk

Timestamp:

Aug 4, 2016 10:18:22 AM (8 years ago)

Author:

vboxsync

Message:

Audio: 'cs' is not a prefix that anyone immediately understands to be count-of-samples, if anything they think critical section. So, please stop using it.

File:

• trunk/src/VBox/Devices/Audio/DrvHostNullAudio.cpp (modified) (4 diffs)

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

@@ -64 +64 @@
     PDMAUDIOSTREAM      Stream;
     uint64_t            u64TicksLast;
-    uint64_t            csPlayBuffer;
-    uint8_t            *pu8PlayBuffer;
+    uint64_t            cMaxSamplesInPlayBuffer;
+    uint8_t            *pbPlayBuffer;
 } NULLAUDIOSTREAMOUT;
 typedef NULLAUDIOSTREAMOUT *PNULLAUDIOSTREAMOUT;
@@ -152 +152 @@
         cSamplesPlayed = cLive;
 
-    cSamplesPlayed = RT_MIN(cSamplesPlayed, pNullStream->csPlayBuffer);
-
-    uint32_t csRead = 0;
-    AudioMixBufReadCirc(&pStream->MixBuf, pNullStream->pu8PlayBuffer, AUDIOMIXBUF_S2B(&pStream->MixBuf, cSamplesPlayed), &csRead);
-    AudioMixBufFinish(&pStream->MixBuf, csRead);
+    cSamplesPlayed = RT_MIN(cSamplesPlayed, pNullStream->cMaxSamplesInPlayBuffer);
+
+    uint32_t cSamplesToRead = 0;
+    AudioMixBufReadCirc(&pStream->MixBuf, pNullStream->pbPlayBuffer,
+                        AUDIOMIXBUF_S2B(&pStream->MixBuf, cSamplesPlayed), &cSamplesToReadRead);
+    AudioMixBufFinish(&pStream->MixBuf, cSamplesToRead);
 
     if (pcSamplesPlayed)
-        *pcSamplesPlayed = csRead;
+        *pcSamplesPlayed = cSamplesToRead;
 
     return VINF_SUCCESS;
@@ -216 +217 @@
         PNULLAUDIOSTREAMOUT pNullStream = RT_FROM_MEMBER(pStream, NULLAUDIOSTREAMOUT, Stream);
         pNullStream->u64TicksLast  = 0;
-        pNullStream->csPlayBuffer  = _1K;
-        pNullStream->pu8PlayBuffer = (uint8_t *)RTMemAlloc(_1K << pStream->Props.cShift);
-        if (pNullStream->pu8PlayBuffer)
+        pNullStream->cMaxSamplesInPlayBuffer = _1K;
+        pNullStream->pbPlayBuffer = (uint8_t *)RTMemAlloc(_1K << pStream->Props.cShift);
+        if (pNullStream->pbPlayBuffer)
         {
             if (pcSamples)
-                *pcSamples = pNullStream->csPlayBuffer;
+                *pcSamples = pNullStream->cMaxSamplesInPlayBuffer;
         }
         else
@@ -264 +265 @@
     PNULLAUDIOSTREAMOUT pNullStream = RT_FROM_MEMBER(pStream, NULLAUDIOSTREAMOUT, Stream);
     if (   pNullStream
-        && pNullStream->pu8PlayBuffer)
+        && pNullStream->pbPlayBuffer)
     {
-        RTMemFree(pNullStream->pu8PlayBuffer);
-        pNullStream->pu8PlayBuffer = NULL;
+        RTMemFree(pNullStream->pbPlayBuffer);
+        pNullStream->pbPlayBuffer = NULL;
     }