ALSA: hda - fix control names for multiple speaker out on IDT/STAC

For multiple speaker outs, the names were previously
"Speaker,0", "Speaker,1", "Center"/"LFE", "Speaker,3". This is
inconsistent, confusing, and is not picked up correctly by PulseAudio.
Instead use "Front", "Surround", "Center"/"LFE", "Side" which
is more standard.

BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1046734
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
David Henningsson 2012-09-06 11:17:58 +02:00 committed by Takashi Iwai
parent 2d7e887cbb
commit 298efee7f5

View file

@ -3226,9 +3226,12 @@ static int create_multi_out_ctls(struct hda_codec *codec, int num_outs,
idx = i; idx = i;
break; break;
case AUTO_PIN_SPEAKER_OUT: case AUTO_PIN_SPEAKER_OUT:
name = "Speaker"; if (num_outs <= 1) {
idx = i; name = "Speaker";
break; idx = i;
break;
}
/* Fall through in case of multi speaker outs */
default: default:
name = chname[i]; name = chname[i];
idx = 0; idx = 0;