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 <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/src/conf/pcm/surround41.conf b/src/conf/pcm/surround41.conf
index 10e486e21528abd5413e35e9f45e217810011ec6..2f823815821adfc01de8722392110fbd3ba84290 100644 (file)
--- 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 7b7b17e10246edd94603c1168dfad55f65f0d291..dc95c179da68fcf353c1aa1ab8b4a1ab90811059 100644 (file)
--- 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