mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-29 23:53:32 +00:00
Code Issues Releases Wiki Activity

ALSA: ctxfi - Fix surround mixer names

Browse source 
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>
This commit is contained in:
Takashi Iwai 2009-06-02 14:17:27 +02:00
parent 822fa19b5c
commit 6585db943a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sound/pci/ctxfi/ctmixer.c
View file

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