From bbe9248e6788e7a852af15f2110dbaeace4d1907 Mon Sep 17 00:00:00 2001 From: David Henningsson Date: Thu, 18 Jun 2015 10:47:59 +0200 Subject: [PATCH] surround41/50.conf: Use chmap syntax for better flexibility In case the hardware only supports a specific channel map, this change would allow surround41/50 to select the correct channel map and channel count in this situation. Signed-off-by: David Henningsson Signed-off-by: Takashi Iwai --- src/conf/pcm/surround41.conf | 11 +++++------ src/conf/pcm/surround50.conf | 11 +++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/conf/pcm/surround41.conf b/src/conf/pcm/surround41.conf index 10e486e2..2f823815 100644 --- a/src/conf/pcm/surround41.conf +++ b/src/conf/pcm/surround41.conf @@ -53,12 +53,11 @@ pcm.!surround41 { ] } } - slave.channels 6 - ttable.0.0 1 - ttable.1.1 1 - ttable.2.2 1 - ttable.3.3 1 - ttable.4.5 1 + ttable.0.FL 1 + ttable.1.FR 1 + ttable.2.RL 1 + ttable.3.RR 1 + ttable.4.LFE 1 hint { description "4.1 Surround output to Front, Rear and Subwoofer speakers" device $DEV diff --git a/src/conf/pcm/surround50.conf b/src/conf/pcm/surround50.conf index 7b7b17e1..dc95c179 100644 --- a/src/conf/pcm/surround50.conf +++ b/src/conf/pcm/surround50.conf @@ -53,12 +53,11 @@ pcm.!surround50 { ] } } - slave.channels 6 - ttable.0.0 1 - ttable.1.1 1 - ttable.2.2 1 - ttable.3.3 1 - ttable.4.4 1 + ttable.0.FL 1 + ttable.1.FR 1 + ttable.2.RL 1 + ttable.3.RR 1 + ttable.4.FC 1 hint { description "5.0 Surround output to Front, Center and Rear speakers" device $DEV -- 2.47.1