Changeset 19126

Timestamp:

Jun 5, 2002, 1:44:11 PM (23 years ago)

Author:

sandervl

Message:

Fixed DART waveout resume

File:

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

tags/trunk/src/winmm/waveoutdart.cpp ¶

@@ -1 @@
-/* $Id: waveoutdart.cpp,v 1.9 2002-06-05 09:19:30 sandervl Exp $ */
+/* $Id: waveoutdart.cpp,v 1.10 2002-06-05 11:44:11 sandervl Exp $ */
 
 /*
@@ -337 +337 @@
 {
     MCI_GENERIC_PARMS Params;
+    int i, curbuf;
 
     dprintf(("DartWaveOut::resume"));
@@ -345 +346 @@
         return(MMSYSERR_NOERROR);
     }
-
-    State = STATE_PLAYING;
     wmutex.leave();
 
-    memset(&Params, 0, sizeof(Params));
-
-    // Resume the playback.
-    mymciSendCommand(DeviceId, MCI_RESUME, MCI_WAIT, (PVOID)&Params, 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();
+        State     = STATE_PLAYING;
+        fUnderrun = FALSE;
+        wmutex.leave();
+        curbuf = curPlayBuf;
+
+        // MCI_MIXSETUP_PARMS->pMixWrite does alter FS: selector!
+        USHORT selTIB = GetFS(); // save current FS selector
+
+        for(i=0;i<PREFILLBUF_DART;i++)
+        {
+            dprintf(("restart: write buffer at %x size %d", MixBuffer[curbuf].pBuffer, MixBuffer[curbuf].ulBufferLength));
+            MixSetupParms->pmixWrite(MixSetupParms->ulMixHandle, &MixBuffer[curbuf], 1);
+            if(++curbuf == PREFILLBUF_DART)
+                curbuf = 0;
+        }
+        SetFS(selTIB);           // switch back to the saved FS selector
+    }
 
     return(MMSYSERR_NOERROR);
@@ -360 +377 @@
 MMRESULT DartWaveOut::stop()
 {
- MCI_GENERIC_PARMS Params;
+    MCI_GENERIC_PARMS Params;
 
     dprintf(("DartWaveOut::stop %s", (State == STATE_PLAYING) ? "playing" : "stopped"));
@@ -383 +400 @@
 MMRESULT DartWaveOut::reset()
 {
- MCI_GENERIC_PARMS Params;
- LPWAVEHDR tmpwavehdr;
+     MCI_GENERIC_PARMS Params;
+    LPWAVEHDR tmpwavehdr;
 
     dprintf(("DartWaveOut::reset %s", (State == STATE_PLAYING) ? "playing" : "stopped"));