Changeset 8568 for trunk/src/winmm/waveoutdaud.cpp

Timestamp:

Jun 4, 2002, 7:36:56 PM (23 years ago)

Author:

sandervl

Message:

Updates for wave playback

File:

• trunk/src/winmm/waveoutdaud.cpp (modified) (3 diffs)

trunk/src/winmm/waveoutdaud.cpp

@@ -1 @@
-/* $Id: waveoutdaud.cpp,v 1.7 2002-04-07 14:36:32 sandervl Exp $ */
+/* $Id: waveoutdaud.cpp,v 1.8 2002-06-04 17:36:56 sandervl Exp $ */
 
 /*
@@ -160 +160 @@
     }
 
-    if(State == STATE_STOPPED) {//continue playback
-        restart();
-    }
-    else
-    if(fUnderrun) {
-        dprintf(("Resume playback after underrun"));
+    if(State == STATE_STOPPED || fUnderrun) {
+        wmutex.enter();
+        State     = STATE_PLAYING;
         fUnderrun = FALSE;
-        State = STATE_PLAYING;
-
-        // Resume the playback.
-        resume();
+        wmutex.leave();
+
+        if(sendIOCTL(DAUDIO_START, &cmd)) {
+            dprintf(("Unable to (re)start stream!!!!!"));
+            return MMSYSERR_ERROR;
+        }
     }
     return(MMSYSERR_NOERROR);
@@ -266 +265 @@
 /******************************************************************************/
 /******************************************************************************/
-MMRESULT DAudioWaveOut::restart()
-{
-    DAUDIO_CMD cmd;
-
-    dprintf(("DAudioWaveOut::restart"));
-    if(State == STATE_PLAYING)
-        return(MMSYSERR_NOERROR);
-
-    wmutex.enter();
-    State     = STATE_PLAYING;
-    fUnderrun = FALSE;
-    wmutex.leave();
-
-    return sendIOCTL(DAUDIO_START, &cmd);
-}
-/******************************************************************************/
-/******************************************************************************/
 ULONG DAudioWaveOut::getPosition()
 {