mixer name changes for older OSS app support
PATCH 1/1 mixer name changes for older OSS app support
This patch suggested by Richard Purdie changes the names of some WM8731 and WM8750 mixers so that they will be recognised by some older OSS mixer apps.
Changes:-
o WM8731 Playback changed to Master Playback
o WM8750 Out1 changed to Headphone
o WM8750 Out2 changed to Speaker
Signed-off-by Liam Girdwood <[email protected]>
soc/codecs/wm8731.c +4 -2
@@ -310,8 +310,10 @@ static const struct soc_enum wm8731_enumstatic const struct snd_kcontrol_new wm8731_snd_controls[] = { -SOC_DOUBLE_R ("Playback Volume" ,WM8731_LOUT1V ,WM8731_ROUT1V ,0 ,127 ,0 ), -SOC_DOUBLE_R ("Playback ZC Switch" ,WM8731_LOUT1V ,WM8731_ROUT1V ,7 ,1 ,0 ), +SOC_DOUBLE_R ("Master Playback Volume" ,WM8731_LOUT1V ,WM8731_ROUT1V , +0 ,127 ,0 ), +SOC_DOUBLE_R ("Master Playback ZC Switch" ,WM8731_LOUT1V ,WM8731_ROUT1V , +7 ,1 ,0 ),SOC_DOUBLE_R ("Capture Volume" ,WM8731_LINVOL ,WM8731_RINVOL ,0 ,31 ,0 ),SOC_DOUBLE_R ("Line Capture Switch" ,WM8731_LINVOL ,WM8731_RINVOL ,7 ,1 ,1 ),
soc/codecs/wm8750.c +7 -5
@@ -444,9 +444,9 @@ SOC_DOUBLE_R("Capture ZC Switch", WM8750SOC_DOUBLE_R ("Capture ZC Switch" ,WM8750_LINVOL ,WM8750_RINVOL ,6 ,1 ,0 ),SOC_DOUBLE_R ("Capture Switch" ,WM8750_LINVOL ,WM8750_RINVOL ,7 ,1 ,1 ), -SOC_DOUBLE_R ("Out1 Playback ZC Switch" ,WM8750_LOUT1V , +SOC_DOUBLE_R ("Headphone Playback ZC Switch" ,WM8750_LOUT1V ,WM8750_ROUT1V ,7 ,1 ,0 ), -SOC_DOUBLE_R ("Out2 Playback ZC Switch" ,WM8750_LOUT2V , +SOC_DOUBLE_R ("Speaker Playback ZC Switch" ,WM8750_LOUT2V ,WM8750_ROUT2V ,7 ,1 ,0 ), SOC_ENUM("Playback De-emphasis", wm8750_enum[15]),
@@ -487,7 +487,7 @@ SOC_SINGLE("ZC Timeout Switch", WM8750_ASOC_SINGLE ("ZC Timeout Switch" ,WM8750_ADCTL1 ,0 ,1 ,0 ),SOC_SINGLE ("Playback Invert Switch" ,WM8750_ADCTL1 ,1 ,1 ,0 ), -SOC_SINGLE("Right Out2 Playback Invert Switch", WM8750_ADCTL2, 4, 1, 0), +SOC_SINGLE("Right Speaker Playback Invert Switch", WM8750_ADCTL2, 4, 1, 0),/* Unimplemented */ /* ADCDAC Bit 0 - ADCHPD */
@@ -514,8 +514,10 @@ SOC_DOUBLE_R("Bypass Mono Playback VolumSOC_SINGLE ("Mono Playback ZC Switch" ,WM8750_MOUTV ,7 ,1 ,0 ), -SOC_DOUBLE_R ("Out1 Playback Volume" ,WM8750_LOUT1V ,WM8750_ROUT1V ,0 ,127 ,0 ), -SOC_DOUBLE_R ("Out2 Playback Volume" ,WM8750_LOUT2V ,WM8750_ROUT2V ,0 ,127 ,0 ), +SOC_DOUBLE_R ("Headphone Playback Volume" ,WM8750_LOUT1V ,WM8750_ROUT1V , +0 ,127 ,0 ), +SOC_DOUBLE_R ("Speaker Playback Volume" ,WM8750_LOUT2V ,WM8750_ROUT2V , +0 ,127 ,0 ), SOC_SINGLE("Mono Playback Volume", WM8750_MOUTV, 0, 127, 0),
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Alsa-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/alsa-devel
Takashi Iwai
AppliedAt Thu, 09 Nov 2006 14:02:32 +0000,
Quoted 5 lines · Liam Girdwood
This patch suggested by Richard Purdie changes the names of some WM8731 and WM8750 mixers so that they will be recognised by some older OSS mixer apps.
Quoted 7 lines
Changes:-
o WM8731 Playback changed to Master Playback
o WM8750 Out1 changed to Headphone
o WM8750 Out2 changed to SpeakerSigned-off-by Liam Girdwood <[email protected]>
I applied it to HG repo. Thanks.
Takashi
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642