commit 39596dc898270fcaaa8a712b63fc033f86d874cf
author James Courtier-Dutton <James@superbug.co.uk> Fri Dec 16 21:59:59 2005 +0100
committer Jaroslav Kysela <perex@suse.cz> Tue Jan 03 12:30:57 2006 +0100
tree ae486ce7f86d782768101091b5b489e65316c6ec
parent dac8dddd87b1246d9d6b79352bd6f043eb804cf2

[ALSA] snd-ca0106: update SPDIF to IEC958 in mixer control names.

Modules: CA0106 driver

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>

sound/pci/ca0106/ca0106_mixer.c

diff --git a/sound/pci/ca0106/ca0106_mixer.c b/sound/pci/ca0106/ca0106_mixer.c
index 39100cb..06fe055 100644
--- a/sound/pci/ca0106/ca0106_mixer.c
+++ b/sound/pci/ca0106/ca0106_mixer.c
@@ -130,7 +130,7 @@
 					  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 @@
         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 @@
 	},
 	{
 		.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