Fix surroundX PCM

From: Julian Scheel <julian@jusst.de>

Hi all,

attached is an updated ICE1724.conf - I have added channels X parameters to
the .pcm.surroundXX-fields, because otherwise it's for example not possible
to play a 5.1-stream on surround51 and a stereo-stream on side simultaneous.
I need this feature to do multiroom-sound through one single sound-card (one
room playing a DVD with 5.1, another room playing some MP3s through channels
7 and 8).
I hope you could follow my explanations and will add this to the tree.

Cheers,
Julian

diff --git a/src/conf/cards/ICE1724.conf b/src/conf/cards/ICE1724.conf
index b104e86723915d4daa7983d4fea1e0b620a66b58..a790b57e2bf6ebd7c8a3b20fa9fb2fb07ce851da 100644 (file)
--- a/src/conf/cards/ICE1724.conf
+++ b/src/conf/cards/ICE1724.conf
@@ -23,7 +23,7 @@ ICE1724.pcm.rear.0 {
        type hw
        card $CARD
        device 2
-       subdevice 1
+       subdevice 0
 }      
 
 <confdir:pcm/center_lfe.conf>
@@ -36,7 +36,7 @@ ICE1724.pcm.center_lfe.0 {
        type hw
        card $CARD
        device 2
-       subdevice 0
+       subdevice 1
 }      
 
 <confdir:pcm/side.conf>
@@ -64,9 +64,12 @@ ICE1724.pcm.surround40.0 {
        ttable.1.1 1
        ttable.2.4 1
        ttable.3.5 1
-       slave.pcm {
-               type hw
-               card $CARD
+       slave {
+               channels 4
+               pcm {
+                       type hw
+                       card $CARD
+               }
        }
 }      
 
@@ -86,9 +89,12 @@ ICE1724.pcm.surround51.0 {
        ttable.3.5 1
        ttable.4.2 1
        ttable.5.3 1
-       slave.pcm {
-               type hw
-               card $CARD
+       slave {
+               channels 6
+                pcm {
+                       type hw
+                       card $CARD
+               }
        }
 }
 
@@ -108,9 +114,12 @@ ICE1724.pcm.surround71.0 {
        ttable.5.3 1
        ttable.6.6 1
        ttable.7.7 1
-       slave.pcm {
-               type hw
-               card $CARD
+       slave {
+               channels 8
+               pcm {
+                       type hw
+                       card $CARD
+               }
        }
 }