Changeset 405

Timestamp:

Nov 24, 2008, 6:12:42 AM (17 years ago)

Author:

Paul Smedley

Message:

ALSA 'PC Speaker' to IOCTL90 'MonoIn'

File:

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

OCO/trunk/drv16/mixer.cpp

@@ -50 +50 @@
 static int IOCTL90ToALSAControl[IOCTL90_MAX_CONTROLS][3] = {
 // IOCTL90 id       ALSA id,                 ALSA id 2,              fIsProperty
-/* MONOIN        */ -1                    ,  -1,                     FALSE,
+/* MONOIN        */ OSS32_MIX_VOLUME_SPEAKER,  -1,                     FALSE,
 /* PHONESET      */ OSS32_MIX_VOLUME_PHONE,  -1,                     FALSE,
 /* MICSET        */ OSS32_MIX_VOLUME_MIC,    -1,                     FALSE,
@@ -79 +79 @@
 /* OSS32_MIX_VOLUME_SPDIF         */   -1,
 /* OSS32_MIX_VOLUME_VIDEO         */   VIDEOSET & 0xF,
-/* OSS32_MIX_VOLUME_SPEAKER           */   -1,
+/* OSS32_MIX_VOLUME_SPEAKER           */   MONOINSET & 0xF,
 /* OSS32_MIX_VOLUME_PHONE             */   PHONESET & 0xF,
 /* OSS32_MIX_VOLUME_HEADPHONE     */   -1, 
@@ -692 +692 @@
     }
     if(mixcaps.fuCtrlCaps & OSS32_MIX_FLAG(OSS32_MIX_VOLUME_SPEAKER)) {
+        ALSAIOCTLMap[MONOINSET]           = 1;
+        ALSAIOCTLMap[MONOINQUERY]         = 1;
+
+        //Set MONOIN
+        rp.s.ioctl.bCode  = MONOINSET;
+        rp.s.ioctl.pvData = (void FAR *)&mixinfo;
+        mixinfo.Mute    = 1;
+        mixinfo.VolumeR = mixinfo.VolumeL = 80;
+        IoctlMixer(&rp, LDev);    
     }
     if(mixcaps.fuCtrlCaps & OSS32_MIX_FLAG(OSS32_MIX_VOLUME_PHONE)) {