Skip to content

Commit

Permalink
ALSA: hda - fix control names for multiple speaker out on IDT/STAC
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David Henningsson authored and Takashi Iwai committed Sep 6, 2012
1 parent 2d7e887 commit 298efee
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions sound/pci/hda/patch_sigmatel.c
Original file line number Diff line number Diff line change
Expand Up @@ -3226,9 +3226,12 @@ static int create_multi_out_ctls(struct hda_codec *codec, int num_outs,
idx = i;
break;
case AUTO_PIN_SPEAKER_OUT:
name = "Speaker";
idx = i;
break;
if (num_outs <= 1) {
name = "Speaker";
idx = i;
break;
}
/* Fall through in case of multi speaker outs */
default:
name = chname[i];
idx = 0;
Expand Down

0 comments on commit 298efee

Please sign in to comment.