]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
ALSA: ctxfi - Fix surround mixer names
authorTakashi Iwai <tiwai@suse.de>
Tue, 2 Jun 2009 12:17:27 +0000 (14:17 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 2 Jun 2009 13:54:46 +0000 (15:54 +0200)
We usually pick up "Surround" mixer for the rear output, and "Side"
for the extra surround.  Fix the channel mapping to follow it.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/ctxfi/ctmixer.c

index b7950768c3f868b481dc1035e962e661a405a6e3..177c46e248db152db82bd529d92bacdcf385ca42 100644 (file)
@@ -168,7 +168,7 @@ ct_kcontrol_init_table[NUM_CTALSA_MIXERS] = {
        },
        [MIXER_WAVES_P] = {
                .ctl = 1,
-               .name = "Surround Playback Volume",
+               .name = "Side Playback Volume",
        },
        [MIXER_WAVEC_P] = {
                .ctl = 1,
@@ -176,7 +176,7 @@ ct_kcontrol_init_table[NUM_CTALSA_MIXERS] = {
        },
        [MIXER_WAVER_P] = {
                .ctl = 1,
-               .name = "Rear Playback Volume",
+               .name = "Surround Playback Volume",
        },
 
        [MIXER_PCM_C_S] = {
@@ -213,7 +213,7 @@ ct_kcontrol_init_table[NUM_CTALSA_MIXERS] = {
        },
        [MIXER_WAVES_P_S] = {
                .ctl = 1,
-               .name = "Surround Playback Switch",
+               .name = "Side Playback Switch",
        },
        [MIXER_WAVEC_P_S] = {
                .ctl = 1,
@@ -221,7 +221,7 @@ ct_kcontrol_init_table[NUM_CTALSA_MIXERS] = {
        },
        [MIXER_WAVER_P_S] = {
                .ctl = 1,
-               .name = "Rear Playback Switch",
+               .name = "Surround Playback Switch",
        },
        [MIXER_DIGITAL_IO_S] = {
                .ctl = 0,