Commit 298efee7 authored Sep 06, 2012 by David Henningsson Committed by Takashi Iwai Sep 06, 2012

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>

parent 2d7e887c

sound/pci/hda/patch_sigmatel.c

+6 −3

Original line number	Original line	Diff line number	Diff line
	@@ -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:
			if (num_outs <= 1) {
	name = "Speaker";		name = "Speaker";
	idx = i;		idx = i;
	break;		break;
			}
			/* Fall through in case of multi speaker outs */
	default:		default:
	name = chname[i];		name = chname[i];
	idx = 0;		idx = 0;