diff options
author | James Courtier-Dutton <James@superbug.co.uk> | 2005-12-24 10:54:51 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 06:31:15 -0500 |
commit | e3b9bc0e78a330d0dc6669ace7925e8c132e08a7 (patch) | |
tree | ef86b886c163eafb0661530a0300e2cd180b0e94 /sound | |
parent | 041dec01736c59df43b0600c0fd154e50d8ccf6e (diff) |
[ALSA] snd-emu10k1: Correct control names for Audigy 4 Pro.
Modules: EMU10K1/EMU10K2 driver
Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/emu10k1/emumixer.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c index 306fe4aa4aa5..2e86a901a0a4 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, | |||
866 | c = emu10k1_rename_ctls; | 866 | c = emu10k1_rename_ctls; |
867 | for (; *c; c += 2) | 867 | for (; *c; c += 2) |
868 | rename_ctl(card, c[0], c[1]); | 868 | rename_ctl(card, c[0], c[1]); |
869 | 869 | if (emu->card_capabilities->subsystem == 0x20071102) { /* Audigy 4 Pro */ | |
870 | rename_ctl(card, "Line2 Capture Volume", "Line1/Mic Capture Volume"); | ||
871 | rename_ctl(card, "Analog Mix Capture Volume", "Line2 Capture Volume"); | ||
872 | rename_ctl(card, "Aux2 Capture Volume", "Line3 Capture Volume"); | ||
873 | rename_ctl(card, "Mic Capture Volume", "Unknown1 Capture Volume"); | ||
874 | remove_ctl(card, "Headphone Playback Switch"); | ||
875 | remove_ctl(card, "Headphone Playback Volume"); | ||
876 | remove_ctl(card, "3D Control - Center"); | ||
877 | remove_ctl(card, "3D Control - Depth"); | ||
878 | remove_ctl(card, "3D Control - Switch"); | ||
879 | } | ||
870 | if ((kctl = emu->ctl_send_routing = snd_ctl_new1(&snd_emu10k1_send_routing_control, emu)) == NULL) | 880 | if ((kctl = emu->ctl_send_routing = snd_ctl_new1(&snd_emu10k1_send_routing_control, emu)) == NULL) |
871 | return -ENOMEM; | 881 | return -ENOMEM; |
872 | kctl->id.device = pcm_device; | 882 | kctl->id.device = pcm_device; |