Changeset 6026 for trunk/src

Timestamp:

Jun 16, 2001, 1:35:22 PM (24 years ago)

Author:

sandervl

Message:

resume after underrun fix

Location:

trunk/src/winmm

Files:

• waveoutbase.cpp (modified) (3 diffs)
• waveoutdart.cpp (modified) (3 diffs)
• waveoutdaud.cpp (modified) (2 diffs)

trunk/src/winmm/waveoutbase.cpp

@@ -1 @@
-/* $Id: waveoutbase.cpp,v 1.2 2001-06-02 08:30:35 sandervl Exp $ */
+/* $Id: waveoutbase.cpp,v 1.3 2001-06-16 11:35:22 sandervl Exp $ */
 
 /*
@@ -100 +100 @@
 void WaveOut::setDefaultVolume(ULONG volume)
 {
-  defvolume = volume;
+    dprintf(("WaveOut::setDefaultVolume %x", volume));
+    defvolume = volume;
 }
 /******************************************************************************/
@@ -106 +107 @@
 DWORD WaveOut::getDefaultVolume()
 {
-  return defvolume;
+    return defvolume;
 }
 /******************************************************************************/

trunk/src/winmm/waveoutdart.cpp

@@ -1 @@
-/* $Id: waveoutdart.cpp,v 1.4 2001-04-29 14:40:12 sandervl Exp $ */
+/* $Id: waveoutdart.cpp,v 1.5 2001-06-16 11:35:22 sandervl Exp $ */
 
 /*
@@ -283 +283 @@
         else wavehdr = pwh;
 
-        if(State != STATE_STOPPED) {//don't start playback if paused
+        if(!fUnderrun && State != STATE_STOPPED) {//don't start playback if paused
             wmutex.leave();
             return(MMSYSERR_NOERROR);
@@ -703 +703 @@
   MCI_SET_PARMS msp = {0};
 
-  dprintf(("DartWaveOut::setVolume %x %x", ulVolL, ulVolR));
+  dprintf(("DartWaveOut::setVolume %d %d", ulVolL, ulVolR));
   volume = ulVol;
 

trunk/src/winmm/waveoutdaud.cpp

@@ -1 @@
-/* $Id: waveoutdaud.cpp,v 1.5 2001-04-30 21:06:56 sandervl Exp $ */
+/* $Id: waveoutdaud.cpp,v 1.6 2001-06-16 11:35:22 sandervl Exp $ */
 
 /*
@@ -377 +377 @@
     cmd.Vol.VolumeR = (((ulVol & 0xFFFF0000) >> 16)*100)/0xFFFF;
     cmd.Vol.VolumeL =  ((ulVol & 0x0000FFFF)       *100)/0xFFFF;
+    dprintf(("DAudioWaveOut::setVolume %d %d", cmd.Vol.VolumeL, cmd.Vol.VolumeR));
     return sendIOCTL(DAUDIO_SETVOLUME, &cmd);
 }