Update of /cvsroot/alsa/alsa-lib/src/conf/cards In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12171
Modified Files:
ATIIXP.conf ICH.conf NFORCE.conf VIA8233.conf VIA8233A.conf
Log Message:
- 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.
Index: ATIIXP.conf
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/conf/cards/ATIIXP.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ATIIXP.conf 24 Feb 2004 16:25:26 -0000 1.1
+++ ATIIXP.conf 3 Mar 2004 18:18:34 -0000 1.2
@@ -34,6 +34,7 @@
name "Line-In As Surround"
preserve true
value true
+ lock true
optional true
}
{
@@ -69,12 +70,14 @@
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 @@
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
Index: ICH.conf
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/conf/cards/ICH.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ICH.conf 12 Aug 2003 09:34:38 -0000 1.4
+++ ICH.conf 3 Mar 2004 18:18:34 -0000 1.5
@@ -16,7 +16,37 @@
<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 @@
@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>
Index: NFORCE.conf
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/conf/cards/NFORCE.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NFORCE.conf 12 Aug 2003 09:34:38 -0000 1.2
+++ NFORCE.conf 3 Mar 2004 18:18:34 -0000 1.3
@@ -16,7 +16,37 @@
<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 @@
@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>
Index: VIA8233.conf
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/conf/cards/VIA8233.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VIA8233.conf 12 Aug 2003 09:34:38 -0000 1.3
+++ VIA8233.conf 3 Mar 2004 18:18:34 -0000 1.4
@@ -21,16 +21,88 @@
@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 @@
@args.CARD {
type string
}
- @args.DEV {
- type integer
- }
@args.AES0 {
type integer
}
Index: VIA8233A.conf
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/conf/cards/VIA8233A.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- VIA8233A.conf 12 Aug 2003 09:34:38 -0000 1.4
+++ VIA8233A.conf 3 Mar 2004 18:18:34 -0000 1.5
@@ -38,6 +38,20 @@
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 @@
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 @@
@args.CARD {
type string
}
- @args.DEV {
- type integer
- }
@args.AES0 {
type integer
}
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
