Map ALSA "PC Speaker" to IOCTL90 "MonoIn"

[rudi]

This should allow the PC speaker volume/mute on certain notebooks to be controlled via LBMixer.

[Paul Smedley]

Test uniaud16.sys

[Paul Smedley]

This diff + the attached uniaud16.sys might be enough to implement this request: Index: mixer.cpp =================================================================== --- mixer.cpp (revision 400) +++ mixer.cpp (working copy) @@ -49,7 +49,7 @@

#define IOCTL90_MAX_CONTROLS 0x10 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, /* LINESET */ OSS32_MIX_VOLUME_LINEIN, -1, FALSE,

@@ -78,7 +78,7 @@

/* OSS32_MIX_VOLUME_CD */ CDSET & 0xF, /* 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, /* OSS32_MIX_VOLUME_AUX */ AUXSET & 0xF,

@@ -691,6 +691,15 @@

IoctlMixer(&rp, LDev);

} 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)) {

ALSAIOCTLMap[PHONESET] = 1;

[rudi]

Hi Paul,

looks good so far !

I'm currently running the new UNIAUD16 with an unmodified older version of UNIAUD32 and I can mute/unmute the speaker using LBMixer. Volume control doesn't work, but that is most likely a problem of that UNIAUD32 on my specific hardware...

Thanks !