Use 'Channel Mode' control

Use 'Channel Mode' control to set the 4/6 channel mode in the config hooks.

diff --git a/src/conf/cards/ATIIXP-SPDMA.conf b/src/conf/cards/ATIIXP-SPDMA.conf
index eedac04a571f0f0963aaa829fa0fbe88e1a182b7..24bf5048c09ec5f9cad24ef76617b3804ac570e3 100644 (file)
--- a/src/conf/cards/ATIIXP-SPDMA.conf
+++ b/src/conf/cards/ATIIXP-SPDMA.conf
@@ -54,9 +54,9 @@ ATIIXP-SPDMA.pcm.surround40.0 {
                type ctl_elems
                hook_args [
                        {
-                               name "Line-In As Surround"
+                               name "Channel Mode"
                                preserve true
-                               value true
+                               value "4ch"
                                lock true
                                optional true
                        }
@@ -90,16 +90,9 @@ ATIIXP-SPDMA.pcm.surround51.0 {
                type ctl_elems
                hook_args [
                        {
-                               name "Line-In As Surround"
+                               name "Channel Mode"
                                preserve true
-                               value true
-                               lock true
-                               optional true
-                       }
-                       {
-                               name "Mic As Center/LFE"
-                               preserve true
-                               value true
+                               value "6ch"
                                lock true
                                optional true
                        }

diff --git a/src/conf/cards/ATIIXP.conf b/src/conf/cards/ATIIXP.conf
index e4d5c8ad2db8ce186785a0666bf6ed945150d174..57a168df661db68a9563bab66243a5924ab3a2af 100644 (file)
--- a/src/conf/cards/ATIIXP.conf
+++ b/src/conf/cards/ATIIXP.conf
@@ -54,9 +54,9 @@ ATIIXP.pcm.surround40.0 {
                type ctl_elems
                hook_args [
                        {
-                               name "Line-In As Surround"
+                               name "Channel Mode"
                                preserve true
-                               value true
+                               value "4ch"
                                lock true
                                optional true
                        }
@@ -90,16 +90,9 @@ ATIIXP.pcm.surround51.0 {
                type ctl_elems
                hook_args [
                        {
-                               name "Line-In As Surround"
-                               preserve true
-                               value true
-                               lock true
-                               optional true
-                       }
-                       {
-                               name "Mic As Center/LFE"
+                               name "Channel Mode"
                                preserve true
-                               value true
+                               value "6ch"
                                lock true
                                optional true
                        }

diff --git a/src/conf/cards/ICH.conf b/src/conf/cards/ICH.conf
index 553ce5e3a3b172c4e10d85ea34af7f09fe28f38e..165605b8e7e389855fb92f4831dc15fc5277c691 100644 (file)
--- a/src/conf/cards/ICH.conf
+++ b/src/conf/cards/ICH.conf
@@ -70,9 +70,9 @@ ICH.pcm.surround40.0 {
                        type ctl_elems
                        hook_args [
                        {
-                               name "Line-In As Surround"
+                               name "Channel Mode"
                                preserve true
-                               value true
+                               value "4ch"
                                lock true
                                optional true
                        }
@@ -121,16 +121,9 @@ ICH.pcm.surround51.0 {
                                type ctl_elems
                                hook_args [
                                {
-                                       name "Line-In As Surround"
-                                       preserve true
-                                       value true
-                                       lock true
-                                       optional true
-                               }
-                               {
-                                       name "Mic As Center/LFE"
+                                       name "Channel Mode"
                                        preserve true
-                                       value true
+                                       value "6ch"
                                        lock true
                                        optional true
                                }

diff --git a/src/conf/cards/ICH4.conf b/src/conf/cards/ICH4.conf
index eebe3aa15540d11c9eba443072c13ed3fe93376c..4858614fa26c0b14e299f92f9cecd02c64312516 100644 (file)
--- a/src/conf/cards/ICH4.conf
+++ b/src/conf/cards/ICH4.conf
@@ -70,9 +70,9 @@ ICH4.pcm.surround40.0 {
                        type ctl_elems
                        hook_args [
                        {
-                               name "Line-In As Surround"
+                               name "Channel Mode"
                                preserve true
-                               value true
+                               value "4ch"
                                lock true
                                optional true
                        }
@@ -113,16 +113,9 @@ ICH4.pcm.surround51.0 {
                        type ctl_elems
                        hook_args [
                        {
-                               name "Line-In As Surround"
-                               preserve true
-                               value true
-                               lock true
-                               optional true
-                       }
-                       {
-                               name "Mic As Center/LFE"
+                               name "Channel Mode"
                                preserve true
-                               value true
+                               value "6ch"
                                lock true
                                optional true
                        }

diff --git a/src/conf/cards/NFORCE.conf b/src/conf/cards/NFORCE.conf
index 89e54b44b2dca59d482cdb6a11336463a1b6fbda..138d8687a77ab2e0d69037ee07203505f999d2e3 100644 (file)
--- a/src/conf/cards/NFORCE.conf
+++ b/src/conf/cards/NFORCE.conf
@@ -70,9 +70,9 @@ NFORCE.pcm.surround40.0 {
                        type ctl_elems
                        hook_args [
                        {
-                               name "Line-In As Surround"
+                               name "Channel Mode"
                                preserve true
-                               value true
+                               value "4ch"
                                lock true
                                optional true
                        }
@@ -121,16 +121,9 @@ NFORCE.pcm.surround51.0 {
                                type ctl_elems
                                hook_args [
                                {
-                                       name "Line-In As Surround"
-                                       preserve true
-                                       value true
-                                       lock true
-                                       optional true
-                               }
-                               {
-                                       name "Mic As Center/LFE"
+                                       name "Channel Mode"
                                        preserve true
-                                       value true
+                                       value "6ch"
                                        lock true
                                        optional true
                                }

diff --git a/src/conf/cards/VIA8233.conf b/src/conf/cards/VIA8233.conf
index bdea52e2bce9835b8f35d753b5766cc718a98a0e..4d3d5c0d29c2c33ce42ea25fc4f823f5b2567e54 100644 (file)
--- a/src/conf/cards/VIA8233.conf
+++ b/src/conf/cards/VIA8233.conf
@@ -63,10 +63,10 @@ VIA8233.pcm.surround40.0 {
                type ctl_elems
                hook_args [
                        {
-                               name "Line-In As Surround"
+                               name "Channel Mode"
                                device 0
                                preserve true
-                               value true
+                               value "4ch"
                                lock true
                                optional true
                        }
@@ -101,18 +101,10 @@ VIA8233.pcm.surround51.0 {
                type ctl_elems
                hook_args [
                        {
-                               name "Line-In As Surround"
+                               name "Channel Mode"
                                device 0
                                preserve true
-                               value true
-                               lock true
-                               optional true
-                       }
-                       {
-                               name "Mic As Center/LFE"
-                               device 0
-                               preserve true
-                               value true
+                               value "6ch"
                                lock true
                                optional true
                        }

diff --git a/src/conf/cards/VIA8233A.conf b/src/conf/cards/VIA8233A.conf
index 4f37a8ff7f578ea1271d3a4fa3dbd4a21664f064..3b784356e9051da7c1bd6129b2c221c1cfa350d2 100644 (file)
--- a/src/conf/cards/VIA8233A.conf
+++ b/src/conf/cards/VIA8233A.conf
@@ -62,9 +62,9 @@ VIA8233A.pcm.surround40.0 {
                                optional true
                        }
                        {
-                               name "Line-In As Surround"
+                               name "Channel Mode"
                                preserve true
-                               value true
+                               value "4ch"
                                lock true
                                optional true
                        }
@@ -106,16 +106,9 @@ VIA8233A.pcm.surround51.0 {
                                optional true
                        }
                        {
-                               name "Line-In As Surround"
-                               preserve true
-                               value true
-                               lock true
-                               optional true
-                       }
-                       {
-                               name "Mic As Center/LFE"
+                               name "Channel Mode"
                                preserve true
-                               value true
+                               value "6ch"
                                lock true
                                optional true
                        }

diff --git a/src/conf/cards/VIA8237.conf b/src/conf/cards/VIA8237.conf
index 6dbc97b61993a899e95c9611cff990688a399d45..5f93570e8f4a9631c46c1d63dc51a26825b48ba0 100644 (file)
--- a/src/conf/cards/VIA8237.conf
+++ b/src/conf/cards/VIA8237.conf
@@ -62,14 +62,14 @@ VIA8237.pcm.surround40.0 {
        hooks.0 {
                type ctl_elems
                hook_args [
-#                      {
-#                              name "Line-In As Surround"
-#                              device 0
-#                              preserve true
-#                              value true
-#                              lock true
-#                              optional true
-#                      }
+                       {
+                               name "Channel Mode"
+                               device 0
+                               preserve true
+                               value "4ch"
+                               lock true
+                               optional true
+                       }
                        {
                                name "Surround Down Mix"
                                device 0
@@ -108,22 +108,14 @@ VIA8237.pcm.surround51.0 {
                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 "Channel Mode"
+                                       device 0
+                                       preserve true
+                                       value "6ch"
+                                       lock true
+                                       optional true
+                               }
                                {
                                        name "Surround Down Mix"
                                        device 0