alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: David Henningsson <david.henningsson@canonical.com>
To: tiwai@suse.de, alsa-devel@alsa-project.org
Cc: David Henningsson <david.henningsson@canonical.com>
Subject: [PATCH v2 3/3] conf: Allow 2.1 surround to use different number of channels
Date: Fri, 28 Feb 2014 08:57:07 +0100	[thread overview]
Message-ID: <1393574227-25732-4-git-send-email-david.henningsson@canonical.com> (raw)
In-Reply-To: <1393574227-25732-1-git-send-email-david.henningsson@canonical.com>

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 <david.henningsson@canonical.com>
---
 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
-- 
1.7.9.5

  parent reply	other threads:[~2014-02-28  7:57 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-28  7:57 [PATCH v2 0/3] alsa-lib: Improve 2.1 surround support David Henningsson
2014-02-28  7:57 ` [PATCH v2 1/3] route: Allow chmap syntax for slave channels in ttable David Henningsson
2014-02-28  7:57 ` [PATCH v2 2/3] route: Select slave chmap based on ttable information David Henningsson
2014-02-28 13:49   ` Raymond Yau
2014-02-28 13:52     ` David Henningsson
2014-02-28  7:57 ` David Henningsson [this message]
2014-02-28  8:15 ` [PATCH v2 0/3] alsa-lib: Improve 2.1 surround support Takashi Iwai

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=1393574227-25732-4-git-send-email-david.henningsson@canonical.com \
    --to=david.henningsson@canonical.com \
    --cc=alsa-devel@alsa-project.org \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).