From patchwork Fri Jul 20 07:27:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 10536081 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 380D660554 for ; Fri, 20 Jul 2018 07:38:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 22C3D29190 for ; Fri, 20 Jul 2018 07:38:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1731D293EC; Fri, 20 Jul 2018 07:38:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3671F291AD for ; Fri, 20 Jul 2018 07:38:45 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 7A2602677C4; Fri, 20 Jul 2018 09:28:16 +0200 (CEST) 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 4898226777F; Fri, 20 Jul 2018 09:28:01 +0200 (CEST) Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by alsa0.perex.cz (Postfix) with ESMTP id 339E32675D4 for ; Fri, 20 Jul 2018 09:27:58 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E3B8C7788E; Fri, 20 Jul 2018 07:27:57 +0000 (UTC) Received: from shalem.localdomain.com (ovpn-117-82.ams2.redhat.com [10.36.117.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id 33BC12156897; Fri, 20 Jul 2018 07:27:57 +0000 (UTC) From: Hans de Goede To: alsa-devel@alsa-project.org Date: Fri, 20 Jul 2018 09:27:41 +0200 Message-Id: <20180720072741.4632-15-hdegoede@redhat.com> In-Reply-To: <20180720072741.4632-1-hdegoede@redhat.com> References: <20180720072741.4632-1-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Fri, 20 Jul 2018 07:27:57 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Fri, 20 Jul 2018 07:27:57 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'hdegoede@redhat.com' RCPT:'' Cc: Takashi Iwai , Hans de Goede , Pierre-Louis Bossart Subject: [alsa-devel] [PATCH 14/14] conf/ucm: bytcr-rt5640: Improve human readable input/output names 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: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP The Comment field is displayed tot the end user in various UIs as such names like MonoSpeaker and DigitalMics without any spaces are no good. Also the names themselves as well as how they get displayed in the typical UI (in separate input / output tabs) makes the adding of playback and capture to the comment superfluous and this looks weird in the UI, so drop it. Signed-off-by: Hans de Goede --- src/conf/ucm/rt5640/DigitalMics.conf | 2 +- src/conf/ucm/rt5640/HeadPhones.conf | 2 +- src/conf/ucm/rt5640/HeadsetMic.conf | 2 +- src/conf/ucm/rt5640/IN1-InternalMic.conf | 2 +- src/conf/ucm/rt5640/IN3-InternalMic.conf | 2 +- src/conf/ucm/rt5640/MonoSpeaker.conf | 2 +- src/conf/ucm/rt5640/Speaker.conf | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/conf/ucm/rt5640/DigitalMics.conf b/src/conf/ucm/rt5640/DigitalMics.conf index c7d54099..06b42f16 100644 --- a/src/conf/ucm/rt5640/DigitalMics.conf +++ b/src/conf/ucm/rt5640/DigitalMics.conf @@ -1,5 +1,5 @@ SectionDevice."DigitalMics" { - Comment "DigitalMics capture" + Comment "Internal Digital Microphones" ConflictingDevice [ "IN1-InternalMics" diff --git a/src/conf/ucm/rt5640/HeadPhones.conf b/src/conf/ucm/rt5640/HeadPhones.conf index 0e7149e5..38f37a6f 100644 --- a/src/conf/ucm/rt5640/HeadPhones.conf +++ b/src/conf/ucm/rt5640/HeadPhones.conf @@ -1,5 +1,5 @@ SectionDevice."Headphones" { - Comment "Headphones playback" + Comment "Headphones" ConflictingDevice [ "Speaker" diff --git a/src/conf/ucm/rt5640/HeadsetMic.conf b/src/conf/ucm/rt5640/HeadsetMic.conf index 4d54eed0..567d4122 100644 --- a/src/conf/ucm/rt5640/HeadsetMic.conf +++ b/src/conf/ucm/rt5640/HeadsetMic.conf @@ -1,5 +1,5 @@ SectionDevice."HeadsetMic" { - Comment "Headset Mic capture" + Comment "Headset Microphone" ConflictingDevice [ "IN1-InternalMics" diff --git a/src/conf/ucm/rt5640/IN1-InternalMic.conf b/src/conf/ucm/rt5640/IN1-InternalMic.conf index d18c21db..3bf31e64 100644 --- a/src/conf/ucm/rt5640/IN1-InternalMic.conf +++ b/src/conf/ucm/rt5640/IN1-InternalMic.conf @@ -1,5 +1,5 @@ SectionDevice."IN1-InternalMics" { - Comment "Internal IN1 analog Mic capture" + Comment "Internal Microphone on IN1" ConflictingDevice [ "DigitalMics" diff --git a/src/conf/ucm/rt5640/IN3-InternalMic.conf b/src/conf/ucm/rt5640/IN3-InternalMic.conf index 17d85229..e1a6c49b 100644 --- a/src/conf/ucm/rt5640/IN3-InternalMic.conf +++ b/src/conf/ucm/rt5640/IN3-InternalMic.conf @@ -1,5 +1,5 @@ SectionDevice."IN3-InternalMics" { - Comment "Internal IN3 analog Mic capture" + Comment "Internal Microphone on IN3" ConflictingDevice [ "DigitalMics" diff --git a/src/conf/ucm/rt5640/MonoSpeaker.conf b/src/conf/ucm/rt5640/MonoSpeaker.conf index 0fb54030..58ab7807 100644 --- a/src/conf/ucm/rt5640/MonoSpeaker.conf +++ b/src/conf/ucm/rt5640/MonoSpeaker.conf @@ -1,5 +1,5 @@ SectionDevice."MonoSpeaker" { - Comment "MonoSpeaker playback" + Comment "Mono Speaker" ConflictingDevice [ "Headphones" diff --git a/src/conf/ucm/rt5640/Speaker.conf b/src/conf/ucm/rt5640/Speaker.conf index b745ed06..a7df9fbf 100644 --- a/src/conf/ucm/rt5640/Speaker.conf +++ b/src/conf/ucm/rt5640/Speaker.conf @@ -1,5 +1,5 @@ SectionDevice."Speaker" { - Comment "Speaker playback" + Comment "Speakers" ConflictingDevice [ "Headphones"