aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorJames Courtier-Dutton <James@superbug.co.uk>2005-12-16 15:59:59 -0500
committerJaroslav Kysela <perex@suse.cz>2006-01-03 06:30:57 -0500
commit39596dc898270fcaaa8a712b63fc033f86d874cf (patch)
treeae486ce7f86d782768101091b5b489e65316c6ec /sound/pci
parentdac8dddd87b1246d9d6b79352bd6f043eb804cf2 (diff)
[ALSA] snd-ca0106: update SPDIF to IEC958 in mixer control names.
Modules: CA0106 driver Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/ca0106/ca0106_mixer.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/pci/ca0106/ca0106_mixer.c b/sound/pci/ca0106/ca0106_mixer.c
index 39100cb62c4f..06fe055674fb 100644
--- a/sound/pci/ca0106/ca0106_mixer.c
+++ b/sound/pci/ca0106/ca0106_mixer.c
@@ -130,7 +130,7 @@ static int snd_ca0106_capture_source_info(struct snd_kcontrol *kcontrol,
130 struct snd_ctl_elem_info *uinfo) 130 struct snd_ctl_elem_info *uinfo)
131{ 131{
132 static char *texts[6] = { 132 static char *texts[6] = {
133 "SPDIF out", "i2s mixer out", "SPDIF in", "i2s in", "AC97 in", "SRC out" 133 "IEC958 out", "i2s mixer out", "IEC958 in", "i2s in", "AC97 in", "SRC out"
134 }; 134 };
135 135
136 uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; 136 uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
@@ -349,13 +349,13 @@ static struct snd_kcontrol_new snd_ca0106_volume_ctls[] __devinitdata = {
349 CA_VOLUME("Analog Side Playback Volume", 349 CA_VOLUME("Analog Side Playback Volume",
350 CONTROL_UNKNOWN_CHANNEL, PLAYBACK_VOLUME2), 350 CONTROL_UNKNOWN_CHANNEL, PLAYBACK_VOLUME2),
351 351
352 CA_VOLUME("SPDIF Front Playback Volume", 352 CA_VOLUME("IEC958 Front Playback Volume",
353 CONTROL_FRONT_CHANNEL, PLAYBACK_VOLUME1), 353 CONTROL_FRONT_CHANNEL, PLAYBACK_VOLUME1),
354 CA_VOLUME("SPDIF Rear Playback Volume", 354 CA_VOLUME("IEC958 Rear Playback Volume",
355 CONTROL_REAR_CHANNEL, PLAYBACK_VOLUME1), 355 CONTROL_REAR_CHANNEL, PLAYBACK_VOLUME1),
356 CA_VOLUME("SPDIF Center/LFE Playback Volume", 356 CA_VOLUME("IEC958 Center/LFE Playback Volume",
357 CONTROL_CENTER_LFE_CHANNEL, PLAYBACK_VOLUME1), 357 CONTROL_CENTER_LFE_CHANNEL, PLAYBACK_VOLUME1),
358 CA_VOLUME("SPDIF Unknown Playback Volume", 358 CA_VOLUME("IEC958 Unknown Playback Volume",
359 CONTROL_UNKNOWN_CHANNEL, PLAYBACK_VOLUME1), 359 CONTROL_UNKNOWN_CHANNEL, PLAYBACK_VOLUME1),
360 360
361 CA_VOLUME("CAPTURE feedback Playback Volume", 361 CA_VOLUME("CAPTURE feedback Playback Volume",
@@ -371,7 +371,7 @@ static struct snd_kcontrol_new snd_ca0106_volume_ctls[] __devinitdata = {
371 }, 371 },
372 { 372 {
373 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 373 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
374 .name = "SPDIF Out", 374 .name = "IEC958 Playback Switch",
375 .info = snd_ca0106_shared_spdif_info, 375 .info = snd_ca0106_shared_spdif_info,
376 .get = snd_ca0106_shared_spdif_get, 376 .get = snd_ca0106_shared_spdif_get,
377 .put = snd_ca0106_shared_spdif_put 377 .put = snd_ca0106_shared_spdif_put