Changeset 9004 for trunk/src

Timestamp:

Aug 14, 2002, 9:02:10 PM (23 years ago)

Author:

sandervl

Message:

proper playback fix

File:

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

trunk/src/winmm/waveoutdart.cpp

@@ -1 @@
-/* $Id: waveoutdart.cpp,v 1.13 2002-08-14 17:37:55 sandervl Exp $ */
+/* $Id: waveoutdart.cpp,v 1.14 2002-08-14 19:02:10 sandervl Exp $ */
 
 /*
@@ -277 +277 @@
 
         //write buffers to DART; starts playback
-        // MCI_MIXSETUP_PARMS->pMixWrite does alter FS: selector!
+        dprintf(("WINMM: transfer all buffers to DART"));
         USHORT selTIB = RestoreOS2FS(); // save current FS selector
 
@@ -314 +314 @@
 
         //write buffers to DART; starts playback
-        // MCI_MIXSETUP_PARMS->pMixWrite does alter FS: selector!
+        dprintf(("WINMM: transfer all buffers to DART"));
         USHORT selTIB = RestoreOS2FS(); // save current FS selector
 
@@ -346 +346 @@
     memset(&Params, 0, sizeof(Params));
 
-    // Pause the playback.
+    // Pause playback.
     mymciSendCommand(DeviceId, MCI_PAUSE, MCI_WAIT, (PVOID)&Params, 0);
 
@@ -365 +365 @@
         return(MMSYSERR_NOERROR);
     }
+    State = STATE_PLAYING;
     wmutex.leave();
 
-    //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;
-        curbuf = curPlayBuf;
-        writeBuffer();  //must be called before (re)starting playback
-        wmutex.leave();
-
-        // 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
-    }
+    // Resume playback.
+    mymciSendCommand(DeviceId, MCI_RESUME, MCI_WAIT, (PVOID)&Params, 0);
 
     return(MMSYSERR_NOERROR);
@@ -570 +550 @@
     bytesPlayed += MixBuffer[curPlayBuf].ulBufferLength;
 
+    //update our buffer index
     if(curPlayBuf == PREFILLBUF_DART-1)
          curPlayBuf = 0;
@@ -629 +610 @@
     wmutex.leave();
 
-    //Transfer buffer to DART
-    // MCI_MIXSETUP_PARMS->pMixWrite does alter FS: selector!
+    //Transfer the buffer we just finished playing to DART
+    dprintf2(("WINMM: handler transfer buffer %d", pBuffer - MixBuffer));
     USHORT selTIB = RestoreOS2FS(); // save current FS selector
-    MixSetupParms->pmixWrite(MixSetupParms->ulMixHandle, &MixBuffer[curFillBuf], 1);
+    MixSetupParms->pmixWrite(MixSetupParms->ulMixHandle, pBuffer, 1);
     SetFS(selTIB);           // switch back to the saved FS selector
 
@@ -683 +664 @@
         if(curPlayPos == MixBuffer[curFillBuf].ulBufferLength) {
             curPlayPos = 0;
+
             if(++curFillBuf == PREFILLBUF_DART) {
                 curFillBuf = 0;