summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Henningsson <david.henningsson@canonical.com>2014-02-28 08:57:07 +0100
committerTakashi Iwai <tiwai@suse.de>2014-02-28 09:14:21 +0100
commit48f1b308cc66152eb6db66742dd0d08d888cda8d (patch)
tree86ad8b2f03ac375755848bdd7a15b5c2a903cdfb
parent5c4cd46810cef8850b037fca9e38ffd43b0bff22 (diff)
downloadalsa-lib-48f1b308cc66152eb6db66742dd0d08d888cda8d.tar.gz
conf: Allow 2.1 surround to use different number of channels
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> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--src/conf/pcm/surround21.conf7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/conf/pcm/surround21.conf b/src/conf/pcm/surround21.conf
index be29020f..7f4676b3 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