Ticket #5093: PushGameSound.patch

src/kits/game/PushGameSound.cpp

@@ -16 +16 @@
 
 
 BPushGameSound::BPushGameSound(size_t inBufferFrameCount, const gs_audio_format *format,
-            size_t inBufferCount, BGameSoundDevice *device)
-    :   BStreamingGameSound(inBufferFrameCount, format, inBufferCount, device)
+        size_t inBufferCount, BGameSoundDevice *device)
+    :
+    BStreamingGameSound(inBufferFrameCount, format, inBufferCount, device),
+    fLockPos(0),
+    fPlayPos(0)
 {
     fPageLocked = new BList;
 
@@ -153 +156 @@
         return;
     
     if (fPlayPos + bytes > fBufferSize) {
-        size_t remainder = fPlayPos + bytes - fBufferSize;
+        size_t remainder = fBufferSize - fPlayPos;
         char * buffer = (char*)inBuffer;
         
         // fill the buffer with the samples left at the end of our buffer
-        memcpy(buffer, &fBuffer[fPlayPos], remainder);
+        if (remainder)
+            memcpy(buffer, &fBuffer[fPlayPos], remainder);
         fPlayPos = 0;
         
         // fill the remainder of the buffer by looping to the start
@@ -170 +174 @@
     } else {
         memcpy(inBuffer, &fBuffer[fPlayPos], bytes);
         fPlayPos += bytes;
+        fPlayPos %= fBufferSize;
     }
     
     BStreamingGameSound::FillBuffer(inBuffer, inByteCount);