Update of /cvsroot/alsa/alsa-kernel/pci/emu10k1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4797/pci/emu10k1
Modified Files:
emufx.c
Log Message:
- improved the mixer names of Audigy2 without AC97 codec for better OSS emulation.
Index: emufx.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/emu10k1/emufx.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- emufx.c 26 Jan 2004 11:48:40 -0000 1.48
+++ emufx.c 4 Feb 2004 18:26:44 -0000 1.49
@@ -1330,7 +1330,7 @@
#define A_ADD_VOLUME_IN(var,vol,input) \
A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input))
- /* AC'97 Playback Volume - used only for mic */
+ /* AC'97 Playback Volume - used only for mic (renamed later) */
A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_AC97_L);
A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_AC97_R);
snd_emu10k1_init_stereo_control(&controls[nctl++], "AMic Playback Volume",
gpr, 0);
@@ -1347,12 +1347,16 @@
/* Audigy CD Playback Volume */
A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_SPDIF_CD_L);
A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_SPDIF_CD_R);
- snd_emu10k1_init_stereo_control(&controls[nctl++], "Audigy CD Playback
Volume", gpr, 0);
+ snd_emu10k1_init_stereo_control(&controls[nctl++],
+ emu->no_ac97 ? "CD Playback Volume" : "Audigy
CD Playback Volume",
+ gpr, 0);
gpr += 2;
/* Audigy CD Capture Volume */
A_ADD_VOLUME_IN(capture, gpr, A_EXTIN_SPDIF_CD_L);
A_ADD_VOLUME_IN(capture+1, gpr+1, A_EXTIN_SPDIF_CD_R);
- snd_emu10k1_init_stereo_control(&controls[nctl++], "Audigy CD Capture Volume",
gpr, 0);
+ snd_emu10k1_init_stereo_control(&controls[nctl++],
+ emu->no_ac97 ? "CD Capture Volume" : "Audigy
CD Capture Volume",
+ gpr, 0);
gpr += 2;
/* Optical SPDIF Playback Volume */
@@ -1369,12 +1373,16 @@
/* Line2 Playback Volume */
A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_LINE2_L);
A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_LINE2_R);
- snd_emu10k1_init_stereo_control(&controls[nctl++], "Line2 Playback Volume",
gpr, 0);
+ snd_emu10k1_init_stereo_control(&controls[nctl++],
+ emu->no_ac97 ? "Line Playback Volume" : "Line2
Playback Volume",
+ gpr, 0);
gpr += 2;
/* Line2 Capture Volume */
A_ADD_VOLUME_IN(capture, gpr, A_EXTIN_LINE2_L);
A_ADD_VOLUME_IN(capture+1, gpr+1, A_EXTIN_LINE2_R);
- snd_emu10k1_init_stereo_control(&controls[nctl++], "Line2 Capture Volume",
gpr, 0);
+ snd_emu10k1_init_stereo_control(&controls[nctl++],
+ emu->no_ac97 ? "Line Capture Volume" : "Line2
Capture Volume",
+ gpr, 0);
gpr += 2;
/* Philips ADC Playback Volume */
@@ -1391,12 +1399,16 @@
/* Aux2 Playback Volume */
A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_AUX2_L);
A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_AUX2_R);
- snd_emu10k1_init_stereo_control(&controls[nctl++], "Aux2 Playback Volume",
gpr, 0);
+ snd_emu10k1_init_stereo_control(&controls[nctl++],
+ emu->no_ac97 ? "Aux Playback Volume" : "Aux2
Playback Volume",
+ gpr, 0);
gpr += 2;
/* Aux2 Capture Volume */
A_ADD_VOLUME_IN(capture, gpr, A_EXTIN_AUX2_L);
A_ADD_VOLUME_IN(capture+1, gpr+1, A_EXTIN_AUX2_R);
- snd_emu10k1_init_stereo_control(&controls[nctl++], "Aux2 Capture Volume", gpr,
0);
+ snd_emu10k1_init_stereo_control(&controls[nctl++],
+ emu->no_ac97 ? "Aux Capture Volume" : "Aux2
Capture Volume",
+ gpr, 0);
gpr += 2;
/* Stereo Mix Front Playback Volume */
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
