From patchwork Fri Feb 27 19:03:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ingo Brueckl X-Patchwork-Id: 5902731 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9D5CCBF440 for ; Fri, 27 Feb 2015 19:06:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CEDE820260 for ; Fri, 27 Feb 2015 19:06:58 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id DF51E20253 for ; Fri, 27 Feb 2015 19:06:56 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id E1B5D26520F; Fri, 27 Feb 2015 20:06:55 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 8D3C5265176; Fri, 27 Feb 2015 20:06:12 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 3AC83265158; Fri, 27 Feb 2015 20:06:10 +0100 (CET) Received: from mout8.wup.tal.de (mout8.wup.tal.de [195.8.233.43]) by alsa0.perex.cz (Postfix) with ESMTP id 3FDEE260A5B for ; Fri, 27 Feb 2015 20:06:03 +0100 (CET) Received: from point.localnet (mue-88-130-106-058.dsl.tropolys.de [88.130.106.58]) (Authenticated sender: ib@wtal.de) by smtp.tal.de (Postfix) with ESMTPA id AB0E69206548; Fri, 27 Feb 2015 20:06:02 +0100 (CET) Received: from ib by point.localnet with local (masqmail 0.2.21) id 1YRQEb-4yF-00; Fri, 27 Feb 2015 20:06:01 +0100 Message-ID: <54f0bf96.2c66145e.bm001@wupperonline.de> From: =?ISO-8859-1?Q?Ingo=20Br=FCckl?= To: alsa-devel@alsa-project.org Date: Fri, 27 Feb 2015 20:03:50 +0100 MIME-Version: 1.0 X-Mailer: blueMail/Linux 1.5 Cc: tiwai@suse.de, david.henningsson@canonical.com Subject: [alsa-devel] [PATCH] ALSA: hda - Make slave strings more user-friendly X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP "Line Out" has been used throughout, so don't abbreviate. Signed-off-by: Ingo Brückl --- 1.7.10 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, };