diff options
| author | James Courtier-Dutton <James@superbug.co.uk> | 2005-12-16 21:59:59 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 12:30:57 +0100 |
| commit | 39596dc898270fcaaa8a712b63fc033f86d874cf (patch) | |
| tree | ae486ce7f86d782768101091b5b489e65316c6ec /sound/pci | |
| parent | dac8dddd87b1246d9d6b79352bd6f043eb804cf2 (diff) | |
| download | linux-39596dc898270fcaaa8a712b63fc033f86d874cf.tar.bz2 | |
[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.c | 12 |
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, struct snd_ctl_elem_info *uinfo) { static char *texts[6] = { - "SPDIF out", "i2s mixer out", "SPDIF in", "i2s in", "AC97 in", "SRC out" + "IEC958 out", "i2s mixer out", "IEC958 in", "i2s in", "AC97 in", "SRC out" }; uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; @@ -349,13 +349,13 @@ static struct snd_kcontrol_new snd_ca0106_volume_ctls[] __devinitdata = { CA_VOLUME("Analog Side Playback Volume", CONTROL_UNKNOWN_CHANNEL, PLAYBACK_VOLUME2), - CA_VOLUME("SPDIF Front Playback Volume", + CA_VOLUME("IEC958 Front Playback Volume", CONTROL_FRONT_CHANNEL, PLAYBACK_VOLUME1), - CA_VOLUME("SPDIF Rear Playback Volume", + CA_VOLUME("IEC958 Rear Playback Volume", CONTROL_REAR_CHANNEL, PLAYBACK_VOLUME1), - CA_VOLUME("SPDIF Center/LFE Playback Volume", + CA_VOLUME("IEC958 Center/LFE Playback Volume", CONTROL_CENTER_LFE_CHANNEL, PLAYBACK_VOLUME1), - CA_VOLUME("SPDIF Unknown Playback Volume", + CA_VOLUME("IEC958 Unknown Playback Volume", CONTROL_UNKNOWN_CHANNEL, PLAYBACK_VOLUME1), CA_VOLUME("CAPTURE feedback Playback Volume", @@ -371,7 +371,7 @@ static struct snd_kcontrol_new snd_ca0106_volume_ctls[] __devinitdata = { }, { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, - .name = "SPDIF Out", + .name = "IEC958 Playback Switch", .info = snd_ca0106_shared_spdif_info, .get = snd_ca0106_shared_spdif_get, .put = snd_ca0106_shared_spdif_put |