Changeset 486 for OCO/trunk/drv16/mixer.cpp

Timestamp:

May 23, 2010, 10:28:06 PM (15 years ago)

Author:

David Azarewicz

Message:

add ability to set volume on headphone, code cleanup

File:

• OCO/trunk/drv16/mixer.cpp (modified) (6 diffs)

OCO/trunk/drv16/mixer.cpp

@@ -50 +50 @@
 static int IOCTL90ToALSAControl[IOCTL90_MAX_CONTROLS][3] = {
 // IOCTL90 id       ALSA id,                 ALSA id 2,              fIsProperty
-/* MONOIN        */ OSS32_MIX_VOLUME_SPEAKER,  -1,                     FALSE,
-/* PHONESET      */ OSS32_MIX_VOLUME_PHONE,  -1,                     FALSE,
-/* MICSET        */ OSS32_MIX_VOLUME_MIC,    -1,                     FALSE,
-/* LINESET       */ OSS32_MIX_VOLUME_LINEIN, -1,                     FALSE,
-/* CDSET         */ OSS32_MIX_VOLUME_CD,     -1,                     FALSE,
-/* VIDEOSET      */ OSS32_MIX_VOLUME_VIDEO,  -1,                     FALSE,
-/* AUXSET        */ OSS32_MIX_VOLUME_AUX,    -1,                     FALSE,
-/* none          */ -1,                      -1,                     FALSE,
-/* none          */ -1,                      -1,                     FALSE,
-/* none          */ -1,                      -1,                     FALSE,
-/* none          */ -1,                      -1,                     FALSE,
-/* BASSTREBLESET */ OSS32_MIX_LEVEL_BASS,    OSS32_MIX_LEVEL_TREBLE, TRUE,
-/* THREEDSET     */ -1,                      -1,                     FALSE,
-/* STREAMVOLSET  */ OSS32_MIX_VOLUME_PCM,    -1,                     FALSE,
-/* RECORDSRCSET  */ OSS32_MIX_INPUTSRC,      -1,                     TRUE,
-/* RECORDGAINSET */ OSS32_MIX_VOLUME_CAPTURE,-1,                     FALSE,
+/* MONOIN        */ OSS32_MIX_VOLUME_SPEAKER,   -1,                     FALSE,
+/* PHONESET      */ OSS32_MIX_VOLUME_PHONE,     -1,                     FALSE,
+/* MICSET        */ OSS32_MIX_VOLUME_MIC,       -1,                     FALSE,
+/* LINESET       */ OSS32_MIX_VOLUME_LINEIN,    -1,                     FALSE,
+/* CDSET         */ OSS32_MIX_VOLUME_CD,        -1,                     FALSE,
+/* VIDEOSET      */ OSS32_MIX_VOLUME_VIDEO,     -1,                     FALSE,
+/* AUXSET        */ OSS32_MIX_VOLUME_AUX,       -1,                     FALSE,
+/* HEADPHONESET  */ OSS32_MIX_VOLUME_HEADPHONE, -1,                     FALSE,
+/* none          */ -1,                         -1,                     FALSE,
+/* none          */ -1,                         -1,                     FALSE,
+/* none          */ -1,                         -1,                     FALSE,
+/* BASSTREBLESET */ OSS32_MIX_LEVEL_BASS,    OSS32_MIX_LEVEL_TREBLE,    TRUE,
+/* THREEDSET     */ -1,                         -1,                     FALSE,
+/* STREAMVOLSET  */ OSS32_MIX_VOLUME_PCM,       -1,                     FALSE,
+/* RECORDSRCSET  */ OSS32_MIX_INPUTSRC,         -1,                     TRUE,
+/* RECORDGAINSET */ OSS32_MIX_VOLUME_CAPTURE,   -1,                     FALSE,
 };
 
@@ -81 +81 @@
 /* OSS32_MIX_VOLUME_SPEAKER       */   MONOINSET & 0xF,
 /* OSS32_MIX_VOLUME_PHONE         */   PHONESET & 0xF,
-/* OSS32_MIX_VOLUME_HEADPHONE     */   -1,
+/* OSS32_MIX_VOLUME_HEADPHONE     */   HEADPHONESET & 0xF,
 /* OSS32_MIX_VOLUME_AUX           */   AUXSET & 0xF,
 /* OSS32_MIX_VOLUME_CAPTURE       */   RECORDGAINSET & 0xF,
@@ -313 +313 @@
 BOOL DBGCALLCONV MixerSetWaveVolume(OSSSTREAMID mixerStreamId, OSSSTREAMID StreamId, ULONG Volume, int fFlags)
 {
+    dprintf(("MixerSetWaveVolume Vol=%lx", Volume));
     if(!fSetWaveVolume || OSS16_WaveSetVolume(StreamId, Volume) != OSSERR_SUCCESS) {
         fSetWaveVolume = FALSE;
@@ -327 +328 @@
     BOOL fInputGainHack = FALSE;
 
+    dprintf(("MixerSetVolume Ctl=%lx Vol=%lx", ulControl, ulVolume));
     if(!(fFlags & MIXFLAG_FORCE_UPDATE) && fRecGainIOCTL90 && ulControl == OSS32_MIX_VOLUME_CAPTURE)
         return TRUE;    //locked
@@ -649 +651 @@
     }
     if(mixcaps.fuCtrlCaps & OSS32_MIX_FLAG(OSS32_MIX_VOLUME_MIDI)) {
+                dprintf(("MixerInit: MIX_VOLUME_MIDI not processed"));
     }
     if(mixcaps.fuCtrlCaps & OSS32_MIX_FLAG(OSS32_MIX_VOLUME_LINEIN)) {
@@ -717 +720 @@
     }
     if(mixcaps.fuCtrlCaps & OSS32_MIX_FLAG(OSS32_MIX_VOLUME_HEADPHONE)) {
+        ALSAIOCTLMap[HEADPHONESET]     = 1;
+        ALSAIOCTLMap[HEADPHONEQUERY]   = 1;
+
+        //Set HEADPHONE
+        rp.s.ioctl.bCode  = HEADPHONESET;
+        rp.s.ioctl.pvData = (void FAR *)&mixinfo;
+        mixinfo.Mute    = 0;
+        mixinfo.VolumeR = mixinfo.VolumeL = 80;
+        IoctlMixer(&rp, LDev);
+//              dprintf(("MixerInit: MIX_VOLUME_HEADPHONE not processed"));
     }
     if(mixcaps.fuCtrlCaps & OSS32_MIX_FLAG(OSS32_MIX_VOLUME_AUX)) {