conf: Add surround 2.1 support to all cards

All cards that support 4.1 surround now also support 2.1 surround,
because they both have surround 5.1 as slave.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/src/conf/cards/ATIIXP-SPDMA.conf b/src/conf/cards/ATIIXP-SPDMA.conf
index 5c80815ddaf6e64ff8836a40a7a9ba2ed55ee74e..42540d6817c0479f6166e89f731e50705164065a 100644 (file)
--- a/src/conf/cards/ATIIXP-SPDMA.conf
+++ b/src/conf/cards/ATIIXP-SPDMA.conf
@@ -77,6 +77,7 @@ ATIIXP-SPDMA.pcm.surround40.0 {
        }
 }
 
+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>

diff --git a/src/conf/cards/ATIIXP.conf b/src/conf/cards/ATIIXP.conf
index 38d802345bfb716e8fa108c7a666127b9b3b8553..c4d33ef34a682c8f8a966be695ea4d20a93f9618 100644 (file)
--- a/src/conf/cards/ATIIXP.conf
+++ b/src/conf/cards/ATIIXP.conf
@@ -77,6 +77,7 @@ ATIIXP.pcm.surround40.0 {
        }
 }
 
+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>

diff --git a/src/conf/cards/Audigy.conf b/src/conf/cards/Audigy.conf
index 4fe38732763359f010a9cce00918ed3a6fedac3f..1c92496653e0bfc8c997bf0538491037ea9435a8 100644 (file)
--- a/src/conf/cards/Audigy.conf
+++ b/src/conf/cards/Audigy.conf
@@ -143,6 +143,7 @@ Audigy.pcm.center_lfe.0 {
        }
 }      
 
+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround40.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>

diff --git a/src/conf/cards/Audigy2.conf b/src/conf/cards/Audigy2.conf
index db45776e54c422c2bdb8317c45a65210c92bc499..cbec7835888292fa735d0503c629443561f82360 100644 (file)
--- a/src/conf/cards/Audigy2.conf
+++ b/src/conf/cards/Audigy2.conf
@@ -195,6 +195,7 @@ Audigy2.pcm.side.0 {
        }
 }
 
+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround40.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>

diff --git a/src/conf/cards/Aureon51.conf b/src/conf/cards/Aureon51.conf
index 24b4d949174bd58e4dccd4547fe8bd1e9be4abe4..07be4a77aa12e53b2632a154eb2493c2f2d6225a 100644 (file)
--- a/src/conf/cards/Aureon51.conf
+++ b/src/conf/cards/Aureon51.conf
@@ -86,6 +86,7 @@ Aureon51.pcm.surround40.0 {
        channels 4
 }      
 
+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>

diff --git a/src/conf/cards/Aureon71.conf b/src/conf/cards/Aureon71.conf
index 1479c25cce217fa9629baa782f1e21a7b96ea42d..a43ce2cee5fa064aba7f5d19ac63694faa124b38 100644 (file)
--- a/src/conf/cards/Aureon71.conf
+++ b/src/conf/cards/Aureon71.conf
@@ -86,6 +86,7 @@ Aureon71.pcm.surround40.0 {
        channels 4
 }      
 
+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>

diff --git a/src/conf/cards/CA0106.conf b/src/conf/cards/CA0106.conf
index 9d21770f84ad42bbbf35f85e47ea953ca56dd645..2f0eaf0afdc8dc826cbd3722b61cdb3310ca07f0 100644 (file)
--- a/src/conf/cards/CA0106.conf
+++ b/src/conf/cards/CA0106.conf
@@ -108,6 +108,7 @@ CA0106.pcm.surround40.0 {
        ]
 }
 
+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>

diff --git a/src/conf/cards/CMI8738-MC6.conf b/src/conf/cards/CMI8738-MC6.conf
index 171c772809ab6788f17c329cbfbb58f2abf644fe..edc67d44d96a1cc7f37c13f23794ae8f8a6a4da3 100644 (file)
--- a/src/conf/cards/CMI8738-MC6.conf
+++ b/src/conf/cards/CMI8738-MC6.conf
@@ -77,6 +77,7 @@ CMI8738-MC6.pcm.surround40.0 {
        }
 }      
 
+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>

diff --git a/src/conf/cards/CMI8738-MC8.conf b/src/conf/cards/CMI8738-MC8.conf
index a5bf6cb4889aebb1ebe386206d5289508ca631c5..ddff75304bc306bd7f3431922ce586c06db5971e 100644 (file)
--- a/src/conf/cards/CMI8738-MC8.conf
+++ b/src/conf/cards/CMI8738-MC8.conf
@@ -105,6 +105,7 @@ CMI8738-MC8.pcm.surround40.0 {
 }      
 
 
+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>

diff --git a/src/conf/cards/CMI8788.conf b/src/conf/cards/CMI8788.conf
index 0ca71e9d28de5a7095d475ab79c6d9f65f1d6f3b..edcb0c9ccc3600955cc80a446574febc71fa0227 100644 (file)
--- a/src/conf/cards/CMI8788.conf
+++ b/src/conf/cards/CMI8788.conf
@@ -48,7 +48,7 @@ CMI8788.pcm.surround40.0 {
        channels 4
 }      
 
-
+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>

diff --git a/src/conf/cards/CS46xx.conf b/src/conf/cards/CS46xx.conf
index 1983142548fdf935c030bb552654816e81f4fad5..b71c30aad514defd4437cb18120972d3458accc0 100644 (file)
--- a/src/conf/cards/CS46xx.conf
+++ b/src/conf/cards/CS46xx.conf
@@ -112,6 +112,7 @@ CS46xx.pcm.surround40.0 {
        ]
 }
 
+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>

diff --git a/src/conf/cards/EMU10K1.conf b/src/conf/cards/EMU10K1.conf
index d51f6dc02facc73f33f8da2d91540281ceac05c0..ef193fe0c460024fc7c9315fba1a6e1b267a43b7 100644 (file)
--- a/src/conf/cards/EMU10K1.conf
+++ b/src/conf/cards/EMU10K1.conf
@@ -217,6 +217,7 @@ EMU10K1.pcm.surround40.0 {
        ]
 }
 
+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>

diff --git a/src/conf/cards/EMU10K1X.conf b/src/conf/cards/EMU10K1X.conf
index b5fc708c4cb2f7d6ff0b0dc55829e093b7501210..f742863679cb0be5319755a881b36f37503c437f 100644 (file)
--- a/src/conf/cards/EMU10K1X.conf
+++ b/src/conf/cards/EMU10K1X.conf
@@ -96,6 +96,7 @@ EMU10K1X.pcm.surround40.0 {
        ]
 }
 
+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>

diff --git a/src/conf/cards/FM801.conf b/src/conf/cards/FM801.conf
index 997b2184f38c2a7a0eb7f65d35ce746b120ab85d..0ddf799cd029b97a196d01b1325abdc98a168283 100644 (file)
--- a/src/conf/cards/FM801.conf
+++ b/src/conf/cards/FM801.conf
@@ -40,6 +40,7 @@ FM801.pcm.default {
 
 FM801.pcm.surround40.0 "cards.FM801.pcm.front.0"
 
+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>

diff --git a/src/conf/cards/FireWave.conf b/src/conf/cards/FireWave.conf
index 63fb23d96bc046ce2b2b1359ddf49e05d6ab7394..fcfc83ccfb1997ebe72484f61adba3ecd19e0609 100644 (file)
--- a/src/conf/cards/FireWave.conf
+++ b/src/conf/cards/FireWave.conf
@@ -25,6 +25,7 @@ FireWave.pcm.front.0 {
        card $CARD
 }
 
+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>

diff --git a/src/conf/cards/HDA-Intel.conf b/src/conf/cards/HDA-Intel.conf
index 7976b6c52ee98f8350892a611891993fe909aeb8..fa9f6946376f91b1f9006f8ff947e69c2ddb12a8 100644 (file)
--- a/src/conf/cards/HDA-Intel.conf
+++ b/src/conf/cards/HDA-Intel.conf
@@ -71,6 +71,7 @@ HDA-Intel.pcm.default {
        hint.device 0
 }
 
+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround40.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>

diff --git a/src/conf/cards/ICE1712.conf b/src/conf/cards/ICE1712.conf
index f5b8add6322caf7658b88d17e266bbf256ebd78a..398fa7ad53077d4d1c4db77ae9b5925f9650ad47 100644 (file)
--- a/src/conf/cards/ICE1712.conf
+++ b/src/conf/cards/ICE1712.conf
@@ -74,6 +74,7 @@ ICE1712.pcm.surround40.0 {
        slave.channels 10
 }      
 
+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>

diff --git a/src/conf/cards/ICE1724.conf b/src/conf/cards/ICE1724.conf
index e806b36d92a1295e7e298f47f1b6bafee61e7497..61cac0132f07f0a4673684a3c4766c542cb6d84c 100644 (file)
--- a/src/conf/cards/ICE1724.conf
+++ b/src/conf/cards/ICE1724.conf
@@ -95,6 +95,7 @@ ICE1724.pcm.surround40.0 {
        }
 }      
 
+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>

diff --git a/src/conf/cards/ICH.conf b/src/conf/cards/ICH.conf
index 47ffef96531ca36be55d4719a89b8a4ca61d0d8b..6fc9a5a236c1276d5e718e72b85aad3d9ce29b25 100644 (file)
--- a/src/conf/cards/ICH.conf
+++ b/src/conf/cards/ICH.conf
@@ -98,6 +98,7 @@ ICH.pcm.surround40.0 {
        }
 }
 
+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>

diff --git a/src/conf/cards/ICH4.conf b/src/conf/cards/ICH4.conf
index 1bf5605bfd7f0d6fb02a033ebb8b81879cf6a071..64ec883d9c73b12414d42861ef710215eb208b92 100644 (file)
--- a/src/conf/cards/ICH4.conf
+++ b/src/conf/cards/ICH4.conf
@@ -98,6 +98,7 @@ ICH4.pcm.surround40.0 {
        }
 }
 
+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>

diff --git a/src/conf/cards/Loopback.conf b/src/conf/cards/Loopback.conf
index 5365fa1bec521bbc183c43b5f9be7beafa7b58cf..974aa75353402e502ebf863b111d8c57893c8609 100644 (file)
--- a/src/conf/cards/Loopback.conf
+++ b/src/conf/cards/Loopback.conf
@@ -63,6 +63,7 @@ Loopback.pcm.default {
        hint.device 0
 }
 
+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround40.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>

diff --git a/src/conf/cards/NFORCE.conf b/src/conf/cards/NFORCE.conf
index 6ebefe3da29edbcf4afdd9cecdedb2fecca18ff1..64d15479291ba50d08aa780ecbf5ae26dfb5f171 100644 (file)
--- a/src/conf/cards/NFORCE.conf
+++ b/src/conf/cards/NFORCE.conf
@@ -98,6 +98,7 @@ NFORCE.pcm.surround40.0 {
        }
 }
 
+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>

diff --git a/src/conf/cards/SB-XFi.conf b/src/conf/cards/SB-XFi.conf
index 38d0027fb4f2dae44cb17f922e45623180a70b1d..eb2218bfdcc704e4bf39e0e0c21539ee7f9ff8f8 100644 (file)
--- a/src/conf/cards/SB-XFi.conf
+++ b/src/conf/cards/SB-XFi.conf
@@ -53,6 +53,7 @@ SB-XFi.pcm.side.0 {
        hint.device 3
 }      
 
+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround40.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>

diff --git a/src/conf/cards/SI7018.conf b/src/conf/cards/SI7018.conf
index 7417bd5bf2e4683e1ace7d15e7e8c56492423584..02b8fc877ff362c0807ef45dc109536b157c31b6 100644 (file)
--- a/src/conf/cards/SI7018.conf
+++ b/src/conf/cards/SI7018.conf
@@ -78,6 +78,7 @@ SI7018.pcm.surround40.0 {
        ]
 }
 
+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>

diff --git a/src/conf/cards/USB-Audio.conf b/src/conf/cards/USB-Audio.conf
index 8a6d9cac6ead765108e09c61914a84d290482556..ce3ae019f7f6fa91ca224074d12891217f242300 100644 (file)
--- a/src/conf/cards/USB-Audio.conf
+++ b/src/conf/cards/USB-Audio.conf
@@ -314,6 +314,7 @@ USB-Audio.pcm.surround40_two_stereo_devices {
        }
 }
 
+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>

diff --git a/src/conf/cards/VIA8233.conf b/src/conf/cards/VIA8233.conf
index 668bfd9e421b38bd05688d7f4f53112b973d9d3e..9ad321f713a990df9c91660397a08c3669bab20d 100644 (file)
--- a/src/conf/cards/VIA8233.conf
+++ b/src/conf/cards/VIA8233.conf
@@ -86,6 +86,7 @@ VIA8233.pcm.surround40.0 {
        }
 }
 
+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>

diff --git a/src/conf/cards/VIA8233A.conf b/src/conf/cards/VIA8233A.conf
index 97d2a7daf33535de779f86cc3758ef32062402b5..679fccf3d06f6afbff5ecaf4a5ce616cc2eeb6ac 100644 (file)
--- a/src/conf/cards/VIA8233A.conf
+++ b/src/conf/cards/VIA8233A.conf
@@ -84,6 +84,7 @@ VIA8233A.pcm.surround40.0 {
        }
 }
 
+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>

diff --git a/src/conf/cards/VIA8237.conf b/src/conf/cards/VIA8237.conf
index 404e19075cbdd55bdb59e767b5508af5064f8c5a..29d8e00f6601f7f04151cccce3b57d8f79032cd9 100644 (file)
--- a/src/conf/cards/VIA8237.conf
+++ b/src/conf/cards/VIA8237.conf
@@ -79,6 +79,7 @@ VIA8237.pcm.surround40.0 {
        }
 }
 
+<confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>