From: "Ingo Brückl" <ib@wupperonline.de>
To: alsa-devel@alsa-project.org
Cc: tiwai@suse.de, david.henningsson@canonical.com
Subject: [PATCH] ALSA: hda - Make slave strings more user-friendly
Date: Fri, 27 Feb 2015 20:03:50 +0100 [thread overview]
Message-ID: <54f0bf96.2c66145e.bm001@wupperonline.de> (raw)
"Line Out" has been used throughout, so don't abbreviate.
Signed-off-by: Ingo Brückl <ib@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
next reply other threads:[~2015-02-27 19:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-27 19:03 Ingo Brückl [this message]
2015-02-27 19:21 ` [PATCH] ALSA: hda - Make slave strings more user-friendly David Henningsson
2015-02-28 3:00 ` Raymond Yau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=54f0bf96.2c66145e.bm001@wupperonline.de \
--to=ib@wupperonline.de \
--cc=alsa-devel@alsa-project.org \
--cc=david.henningsson@canonical.com \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.