Changeset 9982 for trunk/src/winmm/waveoutdart.cpp

Timestamp:

Apr 3, 2003, 4:04:50 PM (22 years ago)

Author:

sandervl

Message:

Waveout (DART): handle underrun properly (next buffer write and position after continueing)

File:

• trunk/src/winmm/waveoutdart.cpp (modified) (9 diffs)

trunk/src/winmm/waveoutdart.cpp

@@ -1 @@
-/* $Id: waveoutdart.cpp,v 1.21 2003-04-03 13:07:03 sandervl Exp $ */
+/* $Id: waveoutdart.cpp,v 1.22 2003-04-03 14:04:50 sandervl Exp $ */
 
 /*
@@ -93 +93 @@
     fMixerSetup   = FALSE;
     fUnderrun     = FALSE;
+    ulUnderrunBase= 0;
 
     ulBufSize     = DART_BUFSIZE;
@@ -464 +465 @@
 
     wmutex.enter();
-    State     = STATE_STOPPED;
+    State = STATE_STOPPED;
     wmutex.leave();
 
@@ -484 +485 @@
         wmutex.enter();
     }
-    wavehdr   = NULL;
-    fUnderrun = FALSE;
-
-    curPlayBuf = curFillBuf = curFillPos = curPlayPos = 0;
-    bytesPlayed = bytesCopied = bytesReturned = 0;
-    queuedbuffers = 0;
+    wavehdr        = NULL;
+    fUnderrun      = FALSE;
+    ulUnderrunBase = 0;
+
+    curPlayBuf     = curFillBuf = curFillPos = curPlayPos = 0;
+    bytesPlayed    = bytesCopied = bytesReturned = 0;
+    queuedbuffers  = 0;
 
     wmutex.leave();
@@ -503 +505 @@
     if(State == STATE_STOPPED) {
         dprintf(("Not playing; return 0 position"));
-        return 0;
+        return ulUnderrunBase;
     }
 
@@ -510 +512 @@
     if((rc & 0xFFFF) == MCIERR_SUCCESS) {
         nrbytes = (ULONG)(((double)mciStatus.ulReturn * (double)getAvgBytesPerSecond())/1000.0);
-        return nrbytes;;
+        return ulUnderrunBase+nrbytes;
     }
     mciError(rc);
@@ -594 +596 @@
             if(State == STATE_PLAYING) {
                 fUnderrun = TRUE;
+                //save current position for when we continue later
+                ulUnderrunBase = bytesPlayed;
                 stop();    //out of buffers, so stop playback
             }
@@ -654 +658 @@
         //last buffer played -> no new ones -> return now
         dprintf(("WINMM: WaveOut handler LAST BUFFER PLAYED! state %s (play %d (%d), cop %d, ret %d)", (State == STATE_PLAYING) ? "playing" : "stopped", bytesPlayed, getPosition(), bytesCopied, bytesReturned));
+        if(getPosition() > bytesPlayed) {
+            dprintf(("WINMM: WaveOut handler UNDERRUN! state %s", (State == STATE_PLAYING) ? "playing" : "stopped"));
+            //save current position for when we continue later
+            ulUnderrunBase = bytesPlayed;
+            fUnderrun = TRUE;
+            stop();    //out of buffers, so stop playback
+        }
         wmutex.leave();
         return;
@@ -677 +688 @@
     ULONG buflength;
 
-    if(!fUnderrun && State == STATE_PLAYING && curFillBuf == curPlayBuf) {
+    if(!fUnderrun && State == STATE_PLAYING && wavehdr == NULL && curFillBuf == curPlayBuf) {
         dprintf2(("writeBuffer: no more room for more audio data"));
         return; //no room left