Changeset 2286 for trunk/src

Timestamp:

Dec 31, 1999, 2:55:51 PM (26 years ago)

Author:

sandervl

Message:

PD: implemented waveOutGet/SetVolume

Location:

trunk/src/winmm

Files:

• dwaveout.cpp (modified) (5 diffs)
• dwaveout.h (modified) (3 diffs)
• waveout.cpp (modified) (3 diffs)

trunk/src/winmm/dwaveout.cpp

@@ -1 @@
-/* $Id: dwaveout.cpp,v 1.12 1999-12-29 10:44:16 sandervl Exp $ */
+/* $Id: dwaveout.cpp,v 1.13 1999-12-31 13:55:51 sandervl Exp $ */
 
 /*
@@ -33 +33 @@
 #ifndef min
 #define min(a, b) ((a > b) ? b : a)
+#endif
+
+#ifndef max
+#define max(a, b) ((a > b) ? a : b)
 #endif
 
@@ -114 +118 @@
    ulError       = 0;
    selCallback   = 0;
+   volume        = 0xFFFFFFFF;
    State         = STATE_STOPPED;
 
@@ -169 +174 @@
    }
    State    = STATE_STOPPED;
+
+   setVolume(volume);
 
    wmutex   = new VMutex();
@@ -731 +738 @@
   return(TRUE);
 }
+
+/******************************************************************************/
+/******************************************************************************/
+MMRESULT DartWaveOut::setVolume(ULONG ulVol)
+{  
+  ULONG ulVolR     = (((ulVol & 0xffff0000) >> 16 )*100)/0xFFFF; // Right Volume 
+  ULONG ulVolL      = ((ulVol& 0x0000ffff)*100)/0xFFFF;          // Left Volume
+  MCI_SET_PARMS msp = {0};
+
+  volume = ulVol;
+
+// PD: My card (ESS 1868 PnP) driver can't change only
+//     one channel Left or Right :-(
+//
+#ifdef GOOD_AUDIO_CARD_DRIVER  
+
+  msp.ulAudio = MCI_SET_AUDIO_LEFT;
+  msp.ulLevel = ulVolL;
+
+  mciSendCommand(DeviceId, MCI_SET,
+                 MCI_WAIT | MCI_SET_AUDIO | MCI_SET_VOLUME,
+                 &msp, 0);
+
+  msp.ulAudio = MCI_SET_AUDIO_RIGHT;
+  msp.ulLevel = ulVolR;
+
+#else
+  msp.ulAudio = MCI_SET_AUDIO_ALL;
+  msp.ulLevel = max(ulVolR,ulVolL);
+#endif
+
+  mciSendCommand(DeviceId, MCI_SET,
+                 MCI_WAIT | MCI_SET_AUDIO | MCI_SET_VOLUME,
+                 &msp, 0);
+  return 0;
+}
 /******************************************************************************/
 /******************************************************************************/

trunk/src/winmm/dwaveout.h

@@ -1 @@
-/* $Id: dwaveout.h,v 1.6 1999-12-29 08:33:56 phaller Exp $ */
+/* $Id: dwaveout.h,v 1.7 1999-12-31 13:55:51 sandervl Exp $ */
 
 /*
@@ -41 +41 @@
      MMRESULT pause();
      MMRESULT restart();
+     MMRESULT setVolume(ULONG ulVol);
+     ULONG    getVolume() {return volume; };
      int      getState() { return State; };
      MMRESULT reset();
@@ -61 +63 @@
 
     ULONG  ulError, State;
+    ULONG  volume;                        // Volume state
 
     MCI_MIX_BUFFER     *MixBuffer;          /* Device buffers          */

trunk/src/winmm/waveout.cpp

@@ -1 @@
-/* $Id: waveout.cpp,v 1.8 1999-12-29 08:33:56 phaller Exp $ */
-#undef DEBUG
+/* $Id: waveout.cpp,v 1.9 1999-12-31 13:55:51 sandervl Exp $ */
+//#undef DEBUG
 /*
  * Wave out MM apis
@@ -381 +381 @@
   if(DartWaveOut::find(dwave) == TRUE)
   {
-    return MMSYSERR_NOTSUPPORTED;
+    if (pdwVolume!=NULL)
+      *pdwVolume=dwave->getVolume();
+    return MMSYSERR_NOERROR;    
   }
   else
@@ -394 +396 @@
   if(DartWaveOut::find(dwave) == TRUE)
   {
-    return MMSYSERR_NOTSUPPORTED;
+    return(dwave->setVolume(dwVolume));
   }
   else