Make surround config backward compatible

Make hooks for surround config backward compatible with the older drivers
(without "Channel Mode" control).

diff --git a/src/conf/cards/ATIIXP-SPDMA.conf b/src/conf/cards/ATIIXP-SPDMA.conf
index 24bf5048c09ec5f9cad24ef76617b3804ac570e3..dbed4a0cdbc1112b345134ac6afae769249338e0 100644 (file)
--- a/src/conf/cards/ATIIXP-SPDMA.conf
+++ b/src/conf/cards/ATIIXP-SPDMA.conf
@@ -60,6 +60,13 @@ ATIIXP-SPDMA.pcm.surround40.0 {
                                lock true
                                optional true
                        }
+                       # for old drivers
+                       {
+                               name "Line-In As Surround"
+                               preserve true
+                               value true
+                               optional true
+                       }
                        {
                                name "Surround Down Mix"
                                preserve true
@@ -96,6 +103,19 @@ ATIIXP-SPDMA.pcm.surround51.0 {
                                lock true
                                optional true
                        }
+                       # for old drivers
+                       {
+                               name "Line-In As Surround"
+                               preserve true
+                               value true
+                               optional true
+                       }
+                       {
+                               name "Mic As Center/LFE"
+                               preserve true
+                               value true
+                               optional true
+                       }
                        {
                                name "Surround Down Mix"
                                preserve true

diff --git a/src/conf/cards/ATIIXP.conf b/src/conf/cards/ATIIXP.conf
index 57a168df661db68a9563bab66243a5924ab3a2af..3aee38baa5d3d6760a83df1371d2ef425c28c535 100644 (file)
--- a/src/conf/cards/ATIIXP.conf
+++ b/src/conf/cards/ATIIXP.conf
@@ -60,6 +60,13 @@ ATIIXP.pcm.surround40.0 {
                                lock true
                                optional true
                        }
+                       # for old drivers
+                       {
+                               name "Line-In As Surround"
+                               preserve true
+                               value true
+                               optional true
+                       }
                        {
                                name "Surround Down Mix"
                                preserve true
@@ -96,6 +103,19 @@ ATIIXP.pcm.surround51.0 {
                                lock true
                                optional true
                        }
+                       # for old drivers
+                       {
+                               name "Line-In As Surround"
+                               preserve true
+                               value true
+                               optional true
+                       }
+                       {
+                               name "Mic As Center/LFE"
+                               preserve true
+                               value true
+                               optional true
+                       }
                        {
                                name "Surround Down Mix"
                                preserve true

diff --git a/src/conf/cards/ICH.conf b/src/conf/cards/ICH.conf
index 165605b8e7e389855fb92f4831dc15fc5277c691..a48268b5ddc56d3934bf6d99efd88eeb9c6a9c7a 100644 (file)
--- a/src/conf/cards/ICH.conf
+++ b/src/conf/cards/ICH.conf
@@ -76,6 +76,13 @@ ICH.pcm.surround40.0 {
                                lock true
                                optional true
                        }
+                       # for old drivers
+                       {
+                               name "Line-In As Surround"
+                               preserve true
+                               value true
+                               optional true
+                       }
                        {
                                name "Surround Down Mix"
                                preserve true
@@ -127,6 +134,19 @@ ICH.pcm.surround51.0 {
                                        lock true
                                        optional true
                                }
+                               # for old drivers
+                               {
+                                       name "Line-In As Surround"
+                                       preserve true
+                                       value true
+                                       optional true
+                               }
+                               {
+                                       name "Mic As Center/LFE"
+                                       preserve true
+                                       value true
+                                       optional true
+                               }
                                {
                                        name "Surround Down Mix"
                                        preserve true

diff --git a/src/conf/cards/ICH4.conf b/src/conf/cards/ICH4.conf
index 4858614fa26c0b14e299f92f9cecd02c64312516..ddcd7c9d66ac0a0070c039c2e4ed54df3864dcb8 100644 (file)
--- a/src/conf/cards/ICH4.conf
+++ b/src/conf/cards/ICH4.conf
@@ -76,6 +76,13 @@ ICH4.pcm.surround40.0 {
                                lock true
                                optional true
                        }
+                       # for old drivers
+                       {
+                               name "Line-In As Surround"
+                               preserve true
+                               value true
+                               optional true
+                       }
                        {
                                name "Surround Down Mix"
                                preserve true
@@ -119,6 +126,19 @@ ICH4.pcm.surround51.0 {
                                lock true
                                optional true
                        }
+                       # for old drivers
+                       {
+                               name "Line-In As Surround"
+                               preserve true
+                               value true
+                               optional true
+                       }
+                       {
+                               name "Mic As Center/LFE"
+                               preserve true
+                               value true
+                               optional true
+                       }
                        {
                                name "Surround Down Mix"
                                preserve true

diff --git a/src/conf/cards/NFORCE.conf b/src/conf/cards/NFORCE.conf
index 138d8687a77ab2e0d69037ee07203505f999d2e3..607906e4c8cc8c56d31e93a06f4c8157c81655ff 100644 (file)
--- a/src/conf/cards/NFORCE.conf
+++ b/src/conf/cards/NFORCE.conf
@@ -76,6 +76,13 @@ NFORCE.pcm.surround40.0 {
                                lock true
                                optional true
                        }
+                       # for old drivers
+                       {
+                               name "Line-In As Surround"
+                               preserve true
+                               value true
+                               optional true
+                       }
                        {
                                name "Surround Down Mix"
                                preserve true
@@ -127,6 +134,19 @@ NFORCE.pcm.surround51.0 {
                                        lock true
                                        optional true
                                }
+                               # for old drivers
+                               {
+                                       name "Line-In As Surround"
+                                       preserve true
+                                       value true
+                                       optional true
+                               }
+                               {
+                                       name "Mic As Center/LFE"
+                                       preserve true
+                                       value true
+                                       optional true
+                               }
                                {
                                        name "Surround Down Mix"
                                        preserve true

diff --git a/src/conf/cards/VIA8233.conf b/src/conf/cards/VIA8233.conf
index 4d3d5c0d29c2c33ce42ea25fc4f823f5b2567e54..b7a21aefb80e2d3460dcd125d9ef9d7932c7a3d5 100644 (file)
--- a/src/conf/cards/VIA8233.conf
+++ b/src/conf/cards/VIA8233.conf
@@ -70,6 +70,13 @@ VIA8233.pcm.surround40.0 {
                                lock true
                                optional true
                        }
+                       # for old drivers
+                       {
+                               name "Line-In As Surround"
+                               preserve true
+                               value true
+                               optional true
+                       }
                        {
                                name "Surround Down Mix"
                                device 0
@@ -108,6 +115,19 @@ VIA8233.pcm.surround51.0 {
                                lock true
                                optional true
                        }
+                       # for old drivers
+                       {
+                               name "Line-In As Surround"
+                               preserve true
+                               value true
+                               optional true
+                       }
+                       {
+                               name "Mic As Center/LFE"
+                               preserve true
+                               value true
+                               optional true
+                       }
                        {
                                name "Surround Down Mix"
                                device 0

diff --git a/src/conf/cards/VIA8233A.conf b/src/conf/cards/VIA8233A.conf
index 3b784356e9051da7c1bd6129b2c221c1cfa350d2..ab0985ec63a48bcc5eea5e1808ddf5ed4ace25a0 100644 (file)
--- a/src/conf/cards/VIA8233A.conf
+++ b/src/conf/cards/VIA8233A.conf
@@ -68,6 +68,13 @@ VIA8233A.pcm.surround40.0 {
                                lock true
                                optional true
                        }
+                       # for old drivers
+                       {
+                               name "Line-In As Surround"
+                               preserve true
+                               value true
+                               optional true
+                       }
                        {
                                name "Surround Down Mix"
                                preserve true
@@ -112,6 +119,19 @@ VIA8233A.pcm.surround51.0 {
                                lock true
                                optional true
                        }
+                       # for old drivers
+                       {
+                               name "Line-In As Surround"
+                               preserve true
+                               value true
+                               optional true
+                       }
+                       {
+                               name "Mic As Center/LFE"
+                               preserve true
+                               value true
+                               optional true
+                       }
                        {
                                name "Surround Down Mix"
                                preserve true