From: James Courtier-Dutton Date: Sat, 24 Dec 2005 15:54:51 +0000 (+0100) Subject: [ALSA] snd-emu10k1: Correct control names for Audigy 4 Pro. X-Git-Tag: v2.6.16-rc1~474^2~22^2~3^2~9 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e3b9bc0e78a330d0dc6669ace7925e8c132e08a7;p=linux-2.6-omap-h63xx.git [ALSA] snd-emu10k1: Correct control names for Audigy 4 Pro. Modules: EMU10K1/EMU10K2 driver Signed-off-by: James Courtier-Dutton --- diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c index 306fe4aa4aa..2e86a901a0a 100644 --- a/sound/pci/emu10k1/emumixer.c +++ b/sound/pci/emu10k1/emumixer.c @@ -866,7 +866,17 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu, c = emu10k1_rename_ctls; for (; *c; c += 2) rename_ctl(card, c[0], c[1]); - + if (emu->card_capabilities->subsystem == 0x20071102) { /* Audigy 4 Pro */ + rename_ctl(card, "Line2 Capture Volume", "Line1/Mic Capture Volume"); + rename_ctl(card, "Analog Mix Capture Volume", "Line2 Capture Volume"); + rename_ctl(card, "Aux2 Capture Volume", "Line3 Capture Volume"); + rename_ctl(card, "Mic Capture Volume", "Unknown1 Capture Volume"); + remove_ctl(card, "Headphone Playback Switch"); + remove_ctl(card, "Headphone Playback Volume"); + remove_ctl(card, "3D Control - Center"); + remove_ctl(card, "3D Control - Depth"); + remove_ctl(card, "3D Control - Switch"); + } if ((kctl = emu->ctl_send_routing = snd_ctl_new1(&snd_emu10k1_send_routing_control, emu)) == NULL) return -ENOMEM; kctl->id.device = pcm_device;