]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[ALSA] snd-emu10k1: Correct control names for Audigy 4 Pro.
authorJames Courtier-Dutton <James@superbug.co.uk>
Sat, 24 Dec 2005 15:54:51 +0000 (16:54 +0100)
committerJaroslav Kysela <perex@suse.cz>
Tue, 3 Jan 2006 11:31:15 +0000 (12:31 +0100)
Modules: EMU10K1/EMU10K2 driver

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
sound/pci/emu10k1/emumixer.c

index 306fe4aa4aa53e5cb05de32a018169d06f897119..2e86a901a0a4b2e7db0c50c876aabf06d7238e9e 100644 (file)
@@ -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;