Changeset 3655 for trunk/src

Timestamp:

Jun 3, 2000, 2:49:55 PM (25 years ago)

Author:

sandervl

Message:

JvdH: don't start playback in WaveOutRestart when no buffers have been added

File:

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

trunk/src/winmm/dwaveout.cpp

@@ -1 @@
-/* $Id: dwaveout.cpp,v 1.24 2000-04-09 11:29:07 sandervl Exp $ */
+/* $Id: dwaveout.cpp,v 1.25 2000-06-03 12:49:55 sandervl Exp $ */
 
 /*
@@ -517 +517 @@
         return(MMSYSERR_NOERROR);
     }
-    wmutex->enter(VMUTEX_WAIT_FOREVER);
-    State     = STATE_PLAYING;
-    fUnderrun = FALSE;
-    wmutex->leave();
-    curbuf = curPlayBuf;
-    for(i=0;i<PREFILLBUF_DART;i++) {
-        MixSetupParms->pmixWrite(MixSetupParms->ulMixHandle, &MixBuffer[curbuf], 1);
-        if(++curbuf == PREFILLBUF_DART) {
-                curbuf = 0;
-        }
+    //Only write buffers to dart if mixer has been initialized; if not, then
+    //the first buffer write will do this for us.
+    if(fMixerSetup == TRUE) {
+        wmutex->enter(VMUTEX_WAIT_FOREVER);
+        State     = STATE_PLAYING;
+        fUnderrun = FALSE;
+        wmutex->leave();
+        curbuf = curPlayBuf;
+        for(i=0;i<PREFILLBUF_DART;i++) {
+                MixSetupParms->pmixWrite(MixSetupParms->ulMixHandle, &MixBuffer[curbuf], 1);
+                if(++curbuf == PREFILLBUF_DART) {
+                        curbuf = 0;
+                }
+        }
     }
     return(MMSYSERR_NOERROR);