Changeset 8955 for trunk/src

Timestamp:

Aug 1, 2002, 6:06:43 PM (23 years ago)

Author:

sandervl

Message:

keep filling DART buffers until no room left (::write & ::resume)

File:

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

trunk/src/winmm/waveoutdart.cpp

@@ -1 @@
-/* $Id: waveoutdart.cpp,v 1.11 2002-07-31 13:51:21 sandervl Exp $ */
+/* $Id: waveoutdart.cpp,v 1.12 2002-08-01 16:06:43 sandervl Exp $ */
 
 /*
@@ -301 +301 @@
 
         if(!fUnderrun && State != STATE_STOPPED) {//don't start playback if paused
+            //write new data to the DART buffers (if there's any room left)
+            if(State == STATE_PLAYING) {
+                writeBuffer();  //must be called before (re)starting playback
+            }
             wmutex.leave();
             return(MMSYSERR_NOERROR);
         }
-
         writeBuffer();  //must be called before (re)starting playback
-
         State     = STATE_PLAYING;
         fUnderrun = FALSE;
@@ -372 +374 @@
         State     = STATE_PLAYING;
         fUnderrun = FALSE;
+        curbuf = curPlayBuf;
+        writeBuffer();  //must be called before (re)starting playback
         wmutex.leave();
-        curbuf = curPlayBuf;
 
         // MCI_MIXSETUP_PARMS->pMixWrite does alter FS: selector!
@@ -417 +420 @@
 MMRESULT DartWaveOut::reset()
 {
-     MCI_GENERIC_PARMS Params;
+    MCI_GENERIC_PARMS Params;
     LPWAVEHDR tmpwavehdr;
 
@@ -425 +428 @@
 
     memset(&Params, 0, sizeof(Params));
+
+    wmutex.enter();
+    State     = STATE_STOPPED;
+    wmutex.leave();
 
     // Stop the playback.
@@ -444 +451 @@
     }
     wavehdr   = NULL;
-    State     = STATE_STOPPED;
     fUnderrun = FALSE;