- turn on the jack sharing switches automatically for surround pcms.

- fixed the device number of hooked controls (all zero).
- use route plugin instead of multi plugin for remapping of channels.

diff --git a/src/conf/cards/ATIIXP.conf b/src/conf/cards/ATIIXP.conf
index 10b189183e9ffd68c1592532c3a8732b1b339b52..e3a2d3b37dd7aa9168428e93ea8ebc0597749f9f 100644 (file)
--- a/src/conf/cards/ATIIXP.conf
+++ b/src/conf/cards/ATIIXP.conf
@@ -34,6 +34,7 @@ ATIIXP.pcm.surround40.0 {
                                name "Line-In As Surround"
                                preserve true
                                value true
+                               lock true
                                optional true
                        }
                        {
@@ -69,12 +70,14 @@ ATIIXP.pcm.surround51.0 {
                                name "Line-In As Surround"
                                preserve true
                                value true
+                               lock true
                                optional true
                        }
                        {
                                name "Mic As Center/LFE"
                                preserve true
                                value true
+                               lock true
                                optional true
                        }
                        {
@@ -125,18 +128,21 @@ ATIIXP.pcm.iec958.0 {
                hook_args [
                        {
                                name "IEC958 Playback AC97-SPSA"
+                               device 0
                                lock true
                                preserve true
                                value 3
                        }
                        {
                                name "IEC958 Playback Default"
+                               device 0
                                lock true
                                preserve true
                                value [ $AES0 $AES1 $AES2 $AES3 ]
                        }
                        {
                                name "IEC958 Playback Switch"
+                               device 0
                                lock true
                                preserve true
                                value true

diff --git a/src/conf/cards/ICH.conf b/src/conf/cards/ICH.conf
index ee6aaf5e08b40f251c3ae43aab202c73dfadf42a..729d0efda4406fc3dc88b8a897e4c4233bd19127 100644 (file)
--- a/src/conf/cards/ICH.conf
+++ b/src/conf/cards/ICH.conf
@@ -16,7 +16,37 @@ ICH.pcm.front.0 {
 
 <confdir:pcm/surround40.conf>
 
-ICH.pcm.surround40.0 "cards.ICH.pcm.front.0"
+ICH.pcm.surround40.0 {
+       @args [ CARD ]
+       @args.CARD {
+               type string
+       }
+       type hooks
+       slave.pcm {
+               type hw
+               card $CARD
+               device 0
+       }
+       hooks.0 {
+               type ctl_elems
+               hook_args [
+                       {
+                               name "Line-In As Surround"
+                               preserve true
+                               value true
+                               lock true
+                               optional true
+                       }
+                       {
+                               name "Surround Down Mix"
+                               preserve true
+                               value off
+                               lock true
+                               optional true
+                       }
+               ]
+       }
+}
 
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
@@ -27,26 +57,55 @@ ICH.pcm.surround51.0 {
        @args.CARD {
                type string
        }
-       type multi
-       slaves [
-               {
-                       pcm {
-                               @func concat
-                               strings [
-                                       "cards.ICH.pcm.front.0:CARD=" $CARD
-                               ]
-                       }
-                       channels 6
+       type route
+       ttable.0.0 1
+       ttable.1.1 1
+       ttable.2.4 1
+       ttable.3.5 1
+       ttable.4.2 1
+       ttable.5.3 1
+       slave.pcm {
+               type hooks
+               slave.pcm {
+                       type hw
+                       card $CARD
+                       device 0
+               }
+               hooks.0 {
+                       type ctl_elems
+                       hook_args [
+                               {
+                                       name "Line-In As Surround"
+                                       preserve true
+                                       value true
+                                       lock true
+                                       optional true
+                               }
+                               {
+                                       name "Mic As Center/LFE"
+                                       preserve true
+                                       value true
+                                       lock true
+                                       optional true
+                               }
+                               {
+                                       name "Surround Down Mix"
+                                       preserve true
+                                       value off
+                                       lock true
+                                       optional true
+                               }
+                               {
+                                       name "Center/LFE Down Mix"
+                                       preserve true
+                                       value off
+                                       lock true
+                                       optional true
+                               }
+                       ]
                }
-       ]
-       bindings [
-               { slave 0 channel 0 }
-               { slave 0 channel 1 }
-               { slave 0 channel 4 }
-               { slave 0 channel 5 }
-               { slave 0 channel 2 }
-               { slave 0 channel 3 }
-       ]
+       }
+       slave.channels 6
 }
 
 <confdir:pcm/iec958.conf>

diff --git a/src/conf/cards/NFORCE.conf b/src/conf/cards/NFORCE.conf
index 7413a9d9b810aef7606c3fa5696a315cc3fb7525..407381be1752240c7148b4956cd56ac1acf16e19 100644 (file)
--- a/src/conf/cards/NFORCE.conf
+++ b/src/conf/cards/NFORCE.conf
@@ -16,7 +16,37 @@ NFORCE.pcm.front.0 {
 
 <confdir:pcm/surround40.conf>
 
-NFORCE.pcm.surround40.0 "cards.NFORCE.pcm.front.0"
+NFORCE.pcm.surround40.0 {
+       @args [ CARD ]
+       @args.CARD {
+               type string
+       }
+       type hooks
+       slave.pcm {
+               type hw
+               card $CARD
+               device 0
+       }
+       hooks.0 {
+               type ctl_elems
+               hook_args [
+                       {
+                               name "Line-In As Surround"
+                               preserve true
+                               value true
+                               lock true
+                               optional true
+                       }
+                       {
+                               name "Surround Down Mix"
+                               preserve true
+                               value off
+                               lock true
+                               optional true
+                       }
+               ]
+       }
+}
 
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
@@ -27,26 +57,55 @@ NFORCE.pcm.surround51.0 {
        @args.CARD {
                type string
        }
-       type multi
-       slaves [
-               {
-                       pcm {
-                               @func concat
-                               strings [
-                                       "cards.NFORCE.pcm.front.0:CARD=" $CARD
-                               ]
-                       }
-                       channels 6
+       type route
+       ttable.0.0 1
+       ttable.1.1 1
+       ttable.2.4 1
+       ttable.3.5 1
+       ttable.4.2 1
+       ttable.5.3 1
+       slave.pcm {
+               type hooks
+               slave.pcm {
+                       type hw
+                       card $CARD
+                       device 0
+               }
+               hooks.0 {
+                       type ctl_elems
+                       hook_args [
+                               {
+                                       name "Line-In As Surround"
+                                       preserve true
+                                       value true
+                                       lock true
+                                       optional true
+                               }
+                               {
+                                       name "Mic As Center/LFE"
+                                       preserve true
+                                       value true
+                                       lock true
+                                       optional true
+                               }
+                               {
+                                       name "Surround Down Mix"
+                                       preserve true
+                                       value off
+                                       lock true
+                                       optional true
+                               }
+                               {
+                                       name "Center/LFE Down Mix"
+                                       preserve true
+                                       value off
+                                       lock true
+                                       optional true
+                               }
+                       ]
                }
-       ]
-       bindings [
-               { slave 0 channel 0 }
-               { slave 0 channel 1 }
-               { slave 0 channel 4 }
-               { slave 0 channel 5 }
-               { slave 0 channel 2 }
-               { slave 0 channel 3 }
-       ]
+       }
+       slave.channels 6
 }
 
 <confdir:pcm/iec958.conf>

diff --git a/src/conf/cards/VIA8233.conf b/src/conf/cards/VIA8233.conf
index 9eb84886015eb92cf5d3140b96b378d2a0c292d1..cace92897d640f37f46ca31b4132407ea4d5be2d 100644 (file)
--- a/src/conf/cards/VIA8233.conf
+++ b/src/conf/cards/VIA8233.conf
@@ -21,16 +21,88 @@ VIA8233.pcm.surround40.0 {
        @args.CARD {
                type string
        }
-       type hw
-       card $CARD
-       device 1
+       type hooks
+       slave.pcm {
+               type hw
+               card $CARD
+               device 1
+       }
+       hooks.0 {
+               type ctl_elems
+               hook_args [
+                       {
+                               name "Line-In As Surround"
+                               device 0
+                               preserve true
+                               value true
+                               lock true
+                               optional true
+                       }
+                       {
+                               name "Surround Down Mix"
+                               device 0
+                               preserve true
+                               value off
+                               lock true
+                               optional true
+                       }
+               ]
+       }
 }
 
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
 
-VIA8233.pcm.surround51.0 "cards.VIA8233.pcm.surround40.0"
+VIA8233.pcm.surround51.0 {
+       @args [ CARD ]
+       @args.CARD {
+               type string
+       }
+       type hooks
+       slave.pcm {
+               type hw
+               card $CARD
+               device 1
+       }
+       hooks.0 {
+               type ctl_elems
+               hook_args [
+                       {
+                               name "Line-In As Surround"
+                               device 0
+                               preserve true
+                               value true
+                               lock true
+                               optional true
+                       }
+                       {
+                               name "Mic As Center/LFE"
+                               device 0
+                               preserve true
+                               value true
+                               lock true
+                               optional true
+                       }
+                       {
+                               name "Surround Down Mix"
+                               device 0
+                               preserve true
+                               value off
+                               lock true
+                               optional true
+                       }
+                       {
+                               name "Center/LFE Down Mix"
+                               device 0
+                               preserve true
+                               value off
+                               lock true
+                               optional true
+                       }
+               ]
+       }
+}
 
 <confdir:pcm/iec958.conf>
 
@@ -39,9 +111,6 @@ VIA8233.pcm.iec958.0 {
        @args.CARD {
                type string
        }
-       @args.DEV {
-               type integer
-       }
        @args.AES0 {
                type integer
        }

diff --git a/src/conf/cards/VIA8233A.conf b/src/conf/cards/VIA8233A.conf
index f4dfe87dd464300a03cab0237ff9aa22624706eb..05a99e1ec44cee63b53163f03627ca3224c6bb24 100644 (file)
--- a/src/conf/cards/VIA8233A.conf
+++ b/src/conf/cards/VIA8233A.conf
@@ -38,6 +38,20 @@ VIA8233A.pcm.surround40.0 {
                                value flase
                                optional true
                        }
+                       {
+                               name "Line-In As Surround"
+                               preserve true
+                               value true
+                               lock true
+                               optional true
+                       }
+                       {
+                               name "Surround Down Mix"
+                               preserve true
+                               value off
+                               lock true
+                               optional true
+                       }
                ]
        }
 }
@@ -68,6 +82,34 @@ VIA8233A.pcm.surround51.0 {
                                value true
                                optional true
                        }
+                       {
+                               name "Line-In As Surround"
+                               preserve true
+                               value true
+                               lock true
+                               optional true
+                       }
+                       {
+                               name "Mic As Center/LFE"
+                               preserve true
+                               value true
+                               lock true
+                               optional true
+                       }
+                       {
+                               name "Surround Down Mix"
+                               preserve true
+                               value off
+                               lock true
+                               optional true
+                       }
+                       {
+                               name "Center/LFE Down Mix"
+                               preserve true
+                               value off
+                               lock true
+                               optional true
+                       }
                ]
        }
 }
@@ -79,9 +121,6 @@ VIA8233A.pcm.iec958.0 {
        @args.CARD {
                type string
        }
-       @args.DEV {
-               type integer
-       }
        @args.AES0 {
                type integer
        }