diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-06-02 08:17:27 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-06-02 09:54:46 -0400 |
commit | 6585db943aade186d38eaab2720c18887b94c875 (patch) | |
tree | 14096ed4f87535a2ab14066ef9ec16d3be4e6b9e | |
parent | 822fa19b5c23746577687a0ec48eae0ec1cd22a0 (diff) |
ALSA: ctxfi - Fix surround mixer names
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>
-rw-r--r-- | sound/pci/ctxfi/ctmixer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/pci/ctxfi/ctmixer.c b/sound/pci/ctxfi/ctmixer.c index b7950768c3f8..177c46e248db 100644 --- a/sound/pci/ctxfi/ctmixer.c +++ b/sound/pci/ctxfi/ctmixer.c | |||
@@ -168,7 +168,7 @@ ct_kcontrol_init_table[NUM_CTALSA_MIXERS] = { | |||
168 | }, | 168 | }, |
169 | [MIXER_WAVES_P] = { | 169 | [MIXER_WAVES_P] = { |
170 | .ctl = 1, | 170 | .ctl = 1, |
171 | .name = "Surround Playback Volume", | 171 | .name = "Side Playback Volume", |
172 | }, | 172 | }, |
173 | [MIXER_WAVEC_P] = { | 173 | [MIXER_WAVEC_P] = { |
174 | .ctl = 1, | 174 | .ctl = 1, |
@@ -176,7 +176,7 @@ ct_kcontrol_init_table[NUM_CTALSA_MIXERS] = { | |||
176 | }, | 176 | }, |
177 | [MIXER_WAVER_P] = { | 177 | [MIXER_WAVER_P] = { |
178 | .ctl = 1, | 178 | .ctl = 1, |
179 | .name = "Rear Playback Volume", | 179 | .name = "Surround Playback Volume", |
180 | }, | 180 | }, |
181 | 181 | ||
182 | [MIXER_PCM_C_S] = { | 182 | [MIXER_PCM_C_S] = { |
@@ -213,7 +213,7 @@ ct_kcontrol_init_table[NUM_CTALSA_MIXERS] = { | |||
213 | }, | 213 | }, |
214 | [MIXER_WAVES_P_S] = { | 214 | [MIXER_WAVES_P_S] = { |
215 | .ctl = 1, | 215 | .ctl = 1, |
216 | .name = "Surround Playback Switch", | 216 | .name = "Side Playback Switch", |
217 | }, | 217 | }, |
218 | [MIXER_WAVEC_P_S] = { | 218 | [MIXER_WAVEC_P_S] = { |
219 | .ctl = 1, | 219 | .ctl = 1, |
@@ -221,7 +221,7 @@ ct_kcontrol_init_table[NUM_CTALSA_MIXERS] = { | |||
221 | }, | 221 | }, |
222 | [MIXER_WAVER_P_S] = { | 222 | [MIXER_WAVER_P_S] = { |
223 | .ctl = 1, | 223 | .ctl = 1, |
224 | .name = "Rear Playback Switch", | 224 | .name = "Surround Playback Switch", |
225 | }, | 225 | }, |
226 | [MIXER_DIGITAL_IO_S] = { | 226 | [MIXER_DIGITAL_IO_S] = { |
227 | .ctl = 0, | 227 | .ctl = 0, |