[alsa-devel] [PATCH] ALSA: hda - Make slave strings more user-friendly

[David Henningsson]

On 2015-02-27 20:03, Ingo Brückl wrote:
> "Line Out" has been used throughout, so don't abbreviate.

The abbreviation is on purpose because there are string lengths you need 
to stay under, especially combined with other stuff, an extreme example 
would be "Front Headphone+Line Out Surround Playback Volume" that might 
get cut off.

Also, "Headphone+LO" is already put into PulseAudio (and potentially 
other places as well).

So please don't change this.

>
> Signed-off-by: Ingo Brückl <ib at wupperonline.de>
>
> diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
> index b680b4e..834730f 100644
> --- a/sound/pci/hda/hda_generic.c
> +++ b/sound/pci/hda/hda_generic.c
> @@ -1103,9 +1103,9 @@ static const char *get_line_out_pfx(struct hda_codec *codec, int ch,
>   			if (hp_lo_shared && spk_lo_shared)
>   				return spec->vmaster_mute.hook ? "PCM" : "Master";
>   			if (hp_lo_shared)
> -				return "Headphone+LO";
> +				return "Headphone+Line Out";
>   			if (spk_lo_shared)
> -				return "Speaker+LO";
> +				return "Speaker+Line Out";
>   		}
>   	}
>
> @@ -4619,7 +4619,7 @@ static const char * const slave_pfxs[] = {
>   	"CLFE", "Bass Speaker", "PCM",
>   	"Speaker Front", "Speaker Surround", "Speaker CLFE", "Speaker Side",
>   	"Headphone Front", "Headphone Surround", "Headphone CLFE",
> -	"Headphone Side", "Headphone+LO", "Speaker+LO",
> +	"Headphone Side", "Headphone+Line Out", "Speaker+Line Out",
>   	NULL,
>   };
>
> --
> 1.7.10
>

-- 
David Henningsson, Canonical Ltd.
https://launchpad.net/~diwic