Changeset 3348 for trunk/src/winmm/dwaveout.cpp

Timestamp:

Apr 8, 2000, 11:16:54 AM (25 years ago)

Author:

sandervl

Message:

restart, pause & underrun fixes

File:

• trunk/src/winmm/dwaveout.cpp (modified) (12 diffs)

trunk/src/winmm/dwaveout.cpp

@@ -1 @@
-/* $Id: dwaveout.cpp,v 1.22 2000-04-07 10:01:59 sandervl Exp $ */
+/* $Id: dwaveout.cpp,v 1.23 2000-04-08 09:16:53 sandervl Exp $ */
 
 /*
@@ -57 +57 @@
    Init(pwfx);
 
-   mthdCallback         = (LPDRVCALLBACK)nCallback; // callback function
-   selCallback          = usSel;                    // callback win32 tib selector
+   mthdCallback     = (LPDRVCALLBACK)nCallback; // callback function
+   selCallback      = usSel;                    // callback win32 tib selector
    this->dwInstance = dwInstance;
+   fUnderrun        = FALSE;
 
    if(!ulError)
@@ -381 +382 @@
         curhdr      = pwh;
         pwh->lpNext = NULL;
+
+        if(State != STATE_STOPPED) {//don't start playback if paused
+                wmutex->leave();
+                return(MMSYSERR_NOERROR);
+        }
 
         while(TRUE) {
@@ -410 +416 @@
         }
         dprintf(("MixSetupParms = %X\n", MixSetupParms));
-        State = STATE_PLAYING;
+        State     = STATE_PLAYING;
+        fUnderrun = FALSE;
         wmutex->leave();
 
@@ -431 +438 @@
         else    wavehdr = pwh;
         wmutex->leave();
-        if(State != STATE_PLAYING) {//continue playback
+        if(State == STATE_STOPPED) {//continue playback
             restart();
         }
@@ -444 +451 @@
  MCI_GENERIC_PARMS Params;
 
-  if(State != STATE_PLAYING)
+  wmutex->enter(VMUTEX_WAIT_FOREVER);
+  if(State != STATE_PLAYING) {
+        State = STATE_PAUSED;
+        wmutex->leave();
         return(MMSYSERR_NOERROR);
-
-  wmutex->enter(VMUTEX_WAIT_FOREVER);
+  }
+
   State = STATE_PAUSED;
   wmutex->leave();
@@ -490 +500 @@
         wavehdr = wavehdr->lpNext;
   }
-  wavehdr = NULL;
-  State = STATE_STOPPED;
+  wavehdr   = NULL;
+  State     = STATE_STOPPED;
+  fUnderrun = FALSE;
 
   wmutex->leave();
@@ -507 +518 @@
     }
     wmutex->enter(VMUTEX_WAIT_FOREVER);
-    State = STATE_PLAYING;
+    State     = STATE_PLAYING;
+    fUnderrun = FALSE;
     wmutex->leave();
     curbuf = curPlayBuf;
@@ -625 +637 @@
 {
  ULONG    buflength;
- WAVEHDR *whdr = wavehdr, *prevhdr = NULL;
+ WAVEHDR *whdr, *prevhdr = NULL;
 
 #ifdef DEBUG1
@@ -633 +645 @@
     if(ulStatus == ERROR_DEVICE_UNDERRUN) {
         dprintf(("WINMM: WaveOut handler UNDERRUN!\n"));
+        fUnderrun = TRUE;
         pause();    //out of buffers, so pause playback
         return;
@@ -641 +654 @@
   wmutex->enter(VMUTEX_WAIT_FOREVER);
 
+  whdr = wavehdr;
+  if(whdr == NULL) {
+        wmutex->leave();
+        //last buffer played -> no new ones -> underrun; pause playback
+        dprintf(("WINMM: WaveOut handler UNDERRUN!\n"));
+        fUnderrun = TRUE;
+        pause();    //out of buffers, so pause playback
+        return;
+  }
   while(whdr) {
     if(whdr->dwFlags & WHDR_DONE) {
@@ -649 +671 @@
 
         if(prevhdr == NULL)
-            wavehdr = whdr->lpNext;
+                wavehdr = whdr->lpNext;
         else    prevhdr->lpNext = whdr->lpNext;