Changeset 4687 for trunk/src

Timestamp:

Nov 24, 2000, 1:14:07 PM (25 years ago)

Author:

phaller

Message:

Fix FS: in pmixWrite

File:

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

trunk/src/winmm/dwaveout.cpp

@@ -1 @@
-/* $Id: dwaveout.cpp,v 1.29 2000-09-03 09:35:14 sandervl Exp $ */
+/* $Id: dwaveout.cpp,v 1.30 2000-11-24 12:14:07 phaller Exp $ */
 
 /*
@@ -8 +8 @@
  *
  * Project Odin Software License can be found in LICENSE.TXT
+ *
+ * Note:
+ * 2000/11/24 PH MCI_MIXSETUP_PARMS->pMixWrite does alter FS: selector!
  *
  */
@@ -424 +427 @@
 
         //write buffers to DART; starts playback
-        MixSetupParms->pmixWrite(MixSetupParms->ulMixHandle,
-                                 MixBuffer,
-                                 PREFILLBUF_DART);
+        {
+          // MCI_MIXSETUP_PARMS->pMixWrite does alter FS: selector!
+          USHORT selTIB = GetFS(); // save current FS selector
+
+          MixSetupParms->pmixWrite(MixSetupParms->ulMixHandle,
+                                   MixBuffer,
+                                   PREFILLBUF_DART);
+          SetFS(selTIB);           // switch back to the saved FS selector
+        }
         dprintf(("Dart playing\n"));
   }
@@ -516 +525 @@
 MMRESULT DartWaveOut::restart()
 {
- int i, curbuf;
-
-    dprintf(("DartWaveOut::restart"));
-    if(State == STATE_PLAYING) {
-        return(MMSYSERR_NOERROR);
+  int i, curbuf;
+
+  dprintf(("DartWaveOut::restart"));
+  if(State == STATE_PLAYING)
+    return(MMSYSERR_NOERROR);
+
+  //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;
+    
+    // MCI_MIXSETUP_PARMS->pMixWrite does alter FS: selector!
+    USHORT selTIB = GetFS(); // save current FS selector
+    
+    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);
+    
+    SetFS(selTIB);           // switch back to the saved FS selector
+  }
+  return(MMSYSERR_NOERROR);
 }
 /******************************************************************************/
@@ -747 +762 @@
 
   wmutex->leave();
+  
   //Transfer buffer to DART
+  // MCI_MIXSETUP_PARMS->pMixWrite does alter FS: selector!
+  USHORT selTIB = GetFS(); // save current FS selector
   MixSetupParms->pmixWrite(MixSetupParms->ulMixHandle, &MixBuffer[curPlayBuf], 1);
+  SetFS(selTIB);           // switch back to the saved FS selector
 }
 /******************************************************************************/