From patchwork Fri Feb 28 07:57:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Henningsson X-Patchwork-Id: 3739381 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1201CBF13A for ; Fri, 28 Feb 2014 08:09:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 45BA220260 for ; Fri, 28 Feb 2014 08:09:19 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 4514F20259 for ; Fri, 28 Feb 2014 08:09:18 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 56FA0265A35; Fri, 28 Feb 2014 09:09:17 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,NO_DNS_FOR_FROM, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id A90E8265132; Fri, 28 Feb 2014 09:03:58 +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 F023F2650B3; Fri, 28 Feb 2014 09:03:53 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by alsa0.perex.cz (Postfix) with ESMTP id 58A31265703 for ; Fri, 28 Feb 2014 08:57:10 +0100 (CET) Received: from hd9483857.selulk5.dyn.perspektivbredband.net ([217.72.56.87] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1WJIJi-0000bT-1g; Fri, 28 Feb 2014 07:57:10 +0000 From: David Henningsson To: tiwai@suse.de, alsa-devel@alsa-project.org Date: Fri, 28 Feb 2014 08:57:07 +0100 Message-Id: <1393574227-25732-4-git-send-email-david.henningsson@canonical.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1393574227-25732-1-git-send-email-david.henningsson@canonical.com> References: <1393574227-25732-1-git-send-email-david.henningsson@canonical.com> Cc: David Henningsson Subject: [alsa-devel] [PATCH v2 3/3] conf: Allow 2.1 surround to use different number of channels 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 This way, cards that support LFE on four channels (e g laptop with internal subwoofer) can do that, and other cards on a six channel setup can use that as well. Well, note that there is still a reference to "pcm.surround51" left here. In practice, for HDA Intel sound cards this does not matter as both surround51 and surround40 reference the same definition. (And that's the only card I currently know of that actually does surround2.1 over four channels.) Signed-off-by: David Henningsson --- src/conf/pcm/surround21.conf | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/conf/pcm/surround21.conf b/src/conf/pcm/surround21.conf index be29020..7f4676b 100644 --- a/src/conf/pcm/surround21.conf +++ b/src/conf/pcm/surround21.conf @@ -51,10 +51,9 @@ pcm.!surround21 { ] } } - slave.channels 6 - ttable.0.0 1 - ttable.1.1 1 - ttable.2.5 1 + ttable.0.FL 1 + ttable.1.FR 1 + ttable.2.LFE 1 hint { description "2.1 Surround output to Front and Subwoofer speakers" device $DEV