From: James Courtier-Dutton Date: Wed, 6 Dec 2006 20:38:45 +0000 (+0000) Subject: [ALSA] emu10k1: Rename the digital optical capture control for the Audigy 2 ZS X-Git-Tag: v2.6.21-rc1~83^2~62^2~101 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb41dab6e10332c1c9008f3cfc5b88ff1e392cb9;p=linux-2.6 [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 Signed-off-by: Jaroslav Kysela --- diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c index b8221f385f..0469546fc3 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, "Wave Playback Volume", "OLD PCM Playback Volume", "Wave Master Playback Volume", "Master Playback Volume", "AMic Playback Volume", "Old Mic Playback Volume", + "CD Capture Volume", "IEC958 Optical Capture Volume", NULL }; static char *audigy_remove_ctls_i2c_adc[] = { @@ -1494,6 +1495,7 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu, "Mic Capture Volume", "Analog Mix Capture Volume", "Aux Capture Volume", + "IEC958 Optical Capture Volume", NULL }; static char *audigy_remove_ctls_1361t_adc[] = {