aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/emu10k1
diff options
context:
space:
mode:
authorJames Courtier-Dutton <James@superbug.co.uk>2006-12-06 15:38:45 -0500
committerJaroslav Kysela <perex@suse.cz>2007-02-09 03:02:18 -0500
commiteb41dab6e10332c1c9008f3cfc5b88ff1e392cb9 (patch)
treedd67a2a874644f7688230c5d6fb24a8a097de888 /sound/pci/emu10k1
parent184c1e2c4c4221c2b8d1e16c33314595373fa73f (diff)
[ALSA] emu10k1: Rename the digital optical capture control for the Audigy 2 ZS
Notebook. Digital playback and capture now works, but it is not bit accurate because it passes through a resampler. Bit accurate playback and capture will be implemented later via the p17v. Signed-off-by: James Courtier-Dutton <James@superbug.co.uk> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci/emu10k1')
-rw-r--r--sound/pci/emu10k1/emumixer.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c
index b8221f385ff9..0469546fc333 100644
--- a/sound/pci/emu10k1/emumixer.c
+++ b/sound/pci/emu10k1/emumixer.c
@@ -1486,6 +1486,7 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,
1486 "Wave Playback Volume", "OLD PCM Playback Volume", 1486 "Wave Playback Volume", "OLD PCM Playback Volume",
1487 "Wave Master Playback Volume", "Master Playback Volume", 1487 "Wave Master Playback Volume", "Master Playback Volume",
1488 "AMic Playback Volume", "Old Mic Playback Volume", 1488 "AMic Playback Volume", "Old Mic Playback Volume",
1489 "CD Capture Volume", "IEC958 Optical Capture Volume",
1489 NULL 1490 NULL
1490 }; 1491 };
1491 static char *audigy_remove_ctls_i2c_adc[] = { 1492 static char *audigy_remove_ctls_i2c_adc[] = {
@@ -1494,6 +1495,7 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,
1494 "Mic Capture Volume", 1495 "Mic Capture Volume",
1495 "Analog Mix Capture Volume", 1496 "Analog Mix Capture Volume",
1496 "Aux Capture Volume", 1497 "Aux Capture Volume",
1498 "IEC958 Optical Capture Volume",
1497 NULL 1499 NULL
1498 }; 1500 };
1499 static char *audigy_remove_ctls_1361t_adc[] = { 1501 static char *audigy_remove_ctls_1361t_adc[] = {