Changeset 3852 for trunk/src

Timestamp:

Jul 18, 2000, 8:34:43 PM (25 years ago)

Author:

sandervl

Message:

waveOutSetVolume fix

Location:

trunk/src/winmm

Files:

• dwaveout.cpp (modified) (6 diffs)
• dwaveout.h (modified) (3 diffs)
• waveout.cpp (modified) (2 diffs)

trunk/src/winmm/dwaveout.cpp

@@ -1 @@
-/* $Id: dwaveout.cpp,v 1.27 2000-06-30 08:40:05 sandervl Exp $ */
+/* $Id: dwaveout.cpp,v 1.28 2000-07-18 18:34:41 sandervl Exp $ */
 
 /*
@@ -119 +119 @@
    ulError       = 0;
    selCallback   = 0;
-   volume        = 0xFFFFFFFF;
+   volume        = defvolume;
    State         = STATE_STOPPED;
 
@@ -423 +423 @@
         wmutex->leave();
 
+        //write buffers to DART; starts playback
         MixSetupParms->pmixWrite(MixSetupParms->ulMixHandle,
                                  MixBuffer,
@@ -529 +530 @@
         wmutex->leave();
         curbuf = curPlayBuf;
+
         for(i=0;i<PREFILLBUF_DART;i++) {
                 MixSetupParms->pmixWrite(MixSetupParms->ulMixHandle, &MixBuffer[curbuf], 1);
@@ -776 +778 @@
   MCI_SET_PARMS msp = {0};
 
+  dprintf(("DartWaveOut::setVolume %x %x", ulVolL, ulVolR));
   volume = ulVol;
 
@@ -804 +807 @@
 }
 /******************************************************************************/
+//Called if waveOutSetVolume is called by the application with waveout handle NULL
+//Sets the default volume of each waveout stream (until it's volume is changed
+//with an appropriate waveOutSetVolume call)
+/******************************************************************************/
+void DartWaveOut::setDefaultVolume(ULONG volume)
+{
+  defvolume = volume;
+}
+/******************************************************************************/
 /******************************************************************************/
 DartWaveOut *DartWaveOut::waveout = NULL;
-
+ULONG DartWaveOut::defvolume = 0xFFFFFFFF;
+

trunk/src/winmm/dwaveout.h

@@ -1 @@
-/* $Id: dwaveout.h,v 1.9 2000-04-08 09:16:54 sandervl Exp $ */
+/* $Id: dwaveout.h,v 1.10 2000-07-18 18:34:43 sandervl Exp $ */
 
 /*
@@ -58 +58 @@
   static int  getNumDevices();
 
+  static void setDefaultVolume(ULONG volume);
+
 protected:
   static void mciError(ULONG ulError);
@@ -99 +101 @@
     static    DartWaveOut*    waveout;                // List of Timer
 
+    static    ULONG           defvolume;      //default volume for streams (if waveOutSetVolume called with NULL stream)
+
 #ifndef _OS2WIN_H
     friend    LONG APIENTRY WaveOutHandler(ULONG ulStatus, PMCI_MIX_BUFFER pBuffer, ULONG ulFlags);

trunk/src/winmm/waveout.cpp

@@ -1 @@
-/* $Id: waveout.cpp,v 1.14 2000-04-06 20:36:29 sandervl Exp $ */
+/* $Id: waveout.cpp,v 1.15 2000-07-18 18:34:43 sandervl Exp $ */
 //#undef DEBUG
 /*
@@ -438 +438 @@
     return(dwave->setVolume(dwVolume));
   }
-  else
-      return MMSYSERR_NOERROR;
+  if(hwo == NULL) {
+        DartWaveOut::setDefaultVolume(dwVolume);
+  }
+  return MMSYSERR_NOERROR;
 //    return(MMSYSERR_INVALHANDLE);
 }