Add channels parameter to surround40/51 definitions

Add channels parameter to surround40/51 definitions for drivers
using a single device.

diff --git a/src/conf/cards/ATIIXP-SPDMA.conf b/src/conf/cards/ATIIXP-SPDMA.conf
index dbed4a0cdbc1112b345134ac6afae769249338e0..e8899e92559a3824f8a8788c4ca31aef98a7140c 100644 (file)
--- a/src/conf/cards/ATIIXP-SPDMA.conf
+++ b/src/conf/cards/ATIIXP-SPDMA.conf
@@ -49,6 +49,7 @@ ATIIXP-SPDMA.pcm.surround40.0 {
                type hw
                card $CARD
                device 0
+               channels 4
        }
        hooks.0 {
                type ctl_elems
@@ -92,6 +93,7 @@ ATIIXP-SPDMA.pcm.surround51.0 {
                type hw
                card $CARD
                device 0
+               channels 6
        }
        hooks.0 {
                type ctl_elems

diff --git a/src/conf/cards/ATIIXP.conf b/src/conf/cards/ATIIXP.conf
index 3aee38baa5d3d6760a83df1371d2ef425c28c535..911eb5de9de80af1c88012cac9731a46863fda3f 100644 (file)
--- a/src/conf/cards/ATIIXP.conf
+++ b/src/conf/cards/ATIIXP.conf
@@ -49,6 +49,7 @@ ATIIXP.pcm.surround40.0 {
                type hw
                card $CARD
                device 0
+               channels 4
        }
        hooks.0 {
                type ctl_elems
@@ -92,6 +93,7 @@ ATIIXP.pcm.surround51.0 {
                type hw
                card $CARD
                device 0
+               channels 6
        }
        hooks.0 {
                type ctl_elems

diff --git a/src/conf/cards/Aureon51.conf b/src/conf/cards/Aureon51.conf
index 983a903a2f7c2384551c7bb4907eea916a05fb20..d63d8b7da2c149a0d4f41afa89b861c10ef05518 100644 (file)
--- a/src/conf/cards/Aureon51.conf
+++ b/src/conf/cards/Aureon51.conf
@@ -84,6 +84,7 @@ Aureon51.pcm.surround40.0 {
        }
        type hw
        card $CARD
+       channels 4
 }      
 
 <confdir:pcm/surround41.conf>
@@ -97,6 +98,7 @@ Aureon51.pcm.surround51.0 {
        }
        type hw
        card $CARD
+       channels 6
 }
 
 <confdir:pcm/iec958.conf>

diff --git a/src/conf/cards/Aureon71.conf b/src/conf/cards/Aureon71.conf
index 98fa59a4f8e01b2431b9286ac5803dfd7637a1d2..8e05098c8c395c3420d292a39d2cc484ad9bc1f8 100644 (file)
--- a/src/conf/cards/Aureon71.conf
+++ b/src/conf/cards/Aureon71.conf
@@ -84,6 +84,7 @@ Aureon71.pcm.surround40.0 {
        }
        type hw
        card $CARD
+       channels 4
 }      
 
 <confdir:pcm/surround41.conf>
@@ -97,6 +98,7 @@ Aureon71.pcm.surround51.0 {
        }
        type hw
        card $CARD
+       channels 6
 }
 
 <confdir:pcm/surround71.conf>

diff --git a/src/conf/cards/CMI8738-MC6.conf b/src/conf/cards/CMI8738-MC6.conf
index 6cd270e2cdb6f4cfbcc3de980cc7d0f6adabb2ab..f38488ecbcd45a00e493349b90833661d6d80dec 100644 (file)
--- a/src/conf/cards/CMI8738-MC6.conf
+++ b/src/conf/cards/CMI8738-MC6.conf
@@ -63,6 +63,7 @@ CMI8738-MC6.pcm.surround40.0 {
                type hw
                card $CARD
                device 1
+               channels 4
        }
        hooks.0 {
                type ctl_elems
@@ -77,12 +78,34 @@ CMI8738-MC6.pcm.surround40.0 {
        }
 }      
 
-
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
 
-CMI8738-MC6.pcm.surround51.0 "cards.CMI8738-MC6.pcm.surround40.0"
+CMI8738-MC6.pcm.surround51.0 {
+       @args [ CARD ]
+       @args.CARD {
+               type string
+       }
+       type hooks
+       slave.pcm {
+               type hw
+               card $CARD
+               device 1
+               channels 6
+       }
+       hooks.0 {
+               type ctl_elems
+               hook_args [
+                       {
+                               name "Four Channel Mode"
+                               lock true
+                               preserve true
+                               value false
+                       }
+               ]
+       }
+}      
 
 <confdir:pcm/iec958.conf>
 

diff --git a/src/conf/cards/CMI8738-MC8.conf b/src/conf/cards/CMI8738-MC8.conf
index 603fc798eab07dbc797094b1529acce44c337f0d..d33a61a37ec8ae953eacd7a40ca520a0d2a53a67 100644 (file)
--- a/src/conf/cards/CMI8738-MC8.conf
+++ b/src/conf/cards/CMI8738-MC8.conf
@@ -85,6 +85,7 @@ CMI8738-MC8.pcm.surround40.0 {
                        type hw
                        card $CARD
                        device 1
+                       channels 4
                }
                hooks.0 {
                        type ctl_elems
@@ -109,11 +110,71 @@ CMI8738-MC8.pcm.surround40.0 {
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
 
-CMI8738-MC8.pcm.surround51.0 "cards.CMI8738-MC8.pcm.surround40.0"
+CMI8738-MC8.pcm.surround51.0 {
+       @args [ CARD ]
+       @args.CARD {
+               type string
+       }
+       type softvol
+       slave.pcm {
+               type hooks
+               slave.pcm {
+                       type hw
+                       card $CARD
+                       device 1
+                       channels 6
+               }
+               hooks.0 {
+                       type ctl_elems
+                       hook_args [
+                       {
+                               name "Four Channel Mode"
+                               lock true
+                               preserve true
+                               value false
+                       }
+                       ]
+               }
+       }
+       control {
+               name "PCM Playback Volume"
+               card $CARD
+       }
+}      
 
 <confdir:pcm/surround71.conf>
 
-CMI8738-MC8.pcm.surround71.0 "cards.CMI8738-MC8.pcm.surround40.0"
+CMI8738-MC8.pcm.surround71.0 {
+       @args [ CARD ]
+       @args.CARD {
+               type string
+       }
+       type softvol
+       slave.pcm {
+               type hooks
+               slave.pcm {
+                       type hw
+                       card $CARD
+                       device 1
+                       channels 8
+               }
+               hooks.0 {
+                       type ctl_elems
+                       hook_args [
+                       {
+                               name "Four Channel Mode"
+                               lock true
+                               preserve true
+                               value false
+                       }
+                       ]
+               }
+       }
+       control {
+               name "PCM Playback Volume"
+               card $CARD
+       }
+}      
 
 <confdir:pcm/iec958.conf>
 

diff --git a/src/conf/cards/ICH.conf b/src/conf/cards/ICH.conf
index a48268b5ddc56d3934bf6d99efd88eeb9c6a9c7a..d21638b469e703a567e6336d127dee80f1b70985 100644 (file)
--- a/src/conf/cards/ICH.conf
+++ b/src/conf/cards/ICH.conf
@@ -65,6 +65,7 @@ ICH.pcm.surround40.0 {
                        type hw
                        card $CARD
                        device 0
+                       channels 4
                }
                hooks.0 {
                        type ctl_elems
@@ -123,6 +124,7 @@ ICH.pcm.surround51.0 {
                                type hw
                                card $CARD
                                device 0
+                               channels 6
                        }
                        hooks.0 {
                                type ctl_elems

diff --git a/src/conf/cards/ICH4.conf b/src/conf/cards/ICH4.conf
index ddcd7c9d66ac0a0070c039c2e4ed54df3864dcb8..a5d1aa481cbc805446a71c7d82a61d23782fd9f2 100644 (file)
--- a/src/conf/cards/ICH4.conf
+++ b/src/conf/cards/ICH4.conf
@@ -65,6 +65,7 @@ ICH4.pcm.surround40.0 {
                        type hw
                        card $CARD
                        device 0
+                       channels 4
                }
                hooks.0 {
                        type ctl_elems
@@ -115,6 +116,7 @@ ICH4.pcm.surround51.0 {
                        type hw
                        card $CARD
                        device 0
+                       channels 6
                }
                hooks.0 {
                        type ctl_elems

diff --git a/src/conf/cards/NFORCE.conf b/src/conf/cards/NFORCE.conf
index 607906e4c8cc8c56d31e93a06f4c8157c81655ff..0e051aefb1559dd71c9684470fb8d09def6b6cbb 100644 (file)
--- a/src/conf/cards/NFORCE.conf
+++ b/src/conf/cards/NFORCE.conf
@@ -65,6 +65,7 @@ NFORCE.pcm.surround40.0 {
                        type hw
                        card $CARD
                        device 0
+                       channels 4
                }
                hooks.0 {
                        type ctl_elems
@@ -123,6 +124,7 @@ NFORCE.pcm.surround51.0 {
                                type hw
                                card $CARD
                                device 0
+                               channels 6
                        }
                        hooks.0 {
                                type ctl_elems

diff --git a/src/conf/cards/VIA8233.conf b/src/conf/cards/VIA8233.conf
index b7a21aefb80e2d3460dcd125d9ef9d7932c7a3d5..b2ec9452ea39b3b58d7112bb9b88cfc6d853abf9 100644 (file)
--- a/src/conf/cards/VIA8233.conf
+++ b/src/conf/cards/VIA8233.conf
@@ -58,6 +58,7 @@ VIA8233.pcm.surround40.0 {
                type hw
                card $CARD
                device 1
+               channels 4
        }
        hooks.0 {
                type ctl_elems
@@ -103,6 +104,7 @@ VIA8233.pcm.surround51.0 {
                type hw
                card $CARD
                device 1
+               channels 6
        }
        hooks.0 {
                type ctl_elems

diff --git a/src/conf/cards/VIA8233A.conf b/src/conf/cards/VIA8233A.conf
index 50972641148db9188672cf0b73cfa2a5646868e6..637fee9ce5d0c742943a7c7e0e027d4f0cad614b 100644 (file)
--- a/src/conf/cards/VIA8233A.conf
+++ b/src/conf/cards/VIA8233A.conf
@@ -49,6 +49,7 @@ VIA8233A.pcm.surround40.0 {
                type hw
                card $CARD
                device 0
+               channels 4
        }
        hooks.0 {
                type ctl_elems
@@ -100,6 +101,7 @@ VIA8233A.pcm.surround51.0 {
                type hw
                card $CARD
                device 0
+               channels 6
        }
        hooks.0 {
                type ctl_elems

diff --git a/src/conf/cards/VIA8237.conf b/src/conf/cards/VIA8237.conf
index 5f93570e8f4a9631c46c1d63dc51a26825b48ba0..a0985b0d07efb5f4069e0ec1f4184141782b96f5 100644 (file)
--- a/src/conf/cards/VIA8237.conf
+++ b/src/conf/cards/VIA8237.conf
@@ -58,6 +58,7 @@ VIA8237.pcm.surround40.0 {
                type hw
                card $CARD
                device 1
+               channels 4
        }
        hooks.0 {
                type ctl_elems
@@ -104,6 +105,7 @@ VIA8237.pcm.surround51.0 {
                        type hw
                        card $CARD
                        device 1
+                       channels 6
                }
                hooks.0 {
                        type ctl_elems