conf/emu10k1: remove compat with two decades old drivers

There really isn't much of a point to clutter the files with this.

Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/src/conf/cards/Audigy.conf b/src/conf/cards/Audigy.conf
index 1c92496653e0bfc8c997bf0538491037ea9435a8..42692cfde6f7b36b03d938ec354b0d1d19622e84 100644 (file)
--- a/src/conf/cards/Audigy.conf
+++ b/src/conf/cards/Audigy.conf
@@ -26,14 +26,6 @@ Audigy.pcm.front.0 {
                                optional true
                                value [ 255 255 0 0 0 0 0 0  255 0 0 0 0 0 0 0  0 255 0 0 0 0 0 0 ]
                        }
-                       {
-                               # for compatibility with older drivers
-                               name "EMU10K1 PCM Send Volume"
-                               index { @func private_pcm_subdevice }
-                               lock true
-                               optional true
-                               value [ 255 255 0 0 0 0 0 0  255 0 0 0 0 0 0 0  0 255 0 0 0 0 0 0 ]
-                       }
                        {
                                interface PCM
                                name "EMU10K1 PCM Send Routing"
@@ -42,15 +34,6 @@ Audigy.pcm.front.0 {
                                optional true
                                value [ 8 9 0 0 0 0 0 0  8 9 0 0 0 0 0 0  8 9 0 0 0 0 0 0 ]
                        }
-                       {
-                               # for compatibility with older drivers
-                               name "EMU10K1 PCM Send Routing"
-                               index { @func private_pcm_subdevice }
-                               lock true
-                               optional true
-                               value [ 8 9 0 0 0 0 0 0  8 9 0 0 0 0 0 0  8 9 0 0 0 0 0 0 ]
-                       }
-
                ]
        }
 }      
@@ -79,14 +62,6 @@ Audigy.pcm.rear.0 {
                                optional true
                                value [ 0 0 255 255 0 0 0 0  0 0 255 0 0 0 0 0  0 0 0 255 0 0 0 0 ]
                        }
-                       {
-                               # for compatibility with older drivers
-                               name "EMU10K1 PCM Send Volume"
-                               index { @func private_pcm_subdevice }
-                               lock true
-                               optional true
-                               value [ 0 0 255 255 0 0 0 0  0 0 255 0 0 0 0 0  0 0 0 255 0 0 0 0 ]
-                       }
                ]
        }
 }      
@@ -115,14 +90,6 @@ Audigy.pcm.center_lfe.0 {
                                optional true
                                value [ 255 255 0 0 0 0 0 0  255 0 0 0 0 0 0 0  0 255 0 0 0 0 0 0 ]
                        }
-                       {
-                               # for compatibility with older drivers
-                               name "EMU10K1 PCM Send Volume"
-                               index { @func private_pcm_subdevice }
-                               lock true
-                               optional true
-                               value [ 255 255 0 0 0 0 0 0  255 0 0 0 0 0 0 0  0 255 0 0 0 0 0 0 ]
-                       }
                        {
                                interface PCM
                                name "EMU10K1 PCM Send Routing"
@@ -131,14 +98,6 @@ Audigy.pcm.center_lfe.0 {
                                optional true
                                value [ 6 7 0 0 0 0 0 0  6 7 0 0 0 0 0 0  6 7 0 0 0 0 0 0 ]
                        }
-                       {
-                               # for compatibility with older drivers
-                               name "EMU10K1 PCM Send Routing"
-                               index { @func private_pcm_subdevice }
-                               lock true
-                               optional true
-                               value [ 6 7 0 0 0 0 0 0  6 7 0 0 0 0 0 0  6 7 0 0 0 0 0 0 ]
-                       }
                ]
        }
 }      
@@ -265,14 +224,6 @@ Audigy.pcm.iec958.0 {
                                optional true
                                value [ $AES0 $AES1 $AES2 $AES3 ]
                        }
-                       {
-                               # for compatibility with older drivers
-                               name "IEC958 Playback Default"
-                               lock true
-                               preserve true
-                               optional true
-                               value [ $AES0 $AES1 $AES2 $AES3 ]
-                       }
                        {
                                name "IEC958 Optical Raw Playback Switch"
                                lock true
@@ -287,14 +238,6 @@ Audigy.pcm.iec958.0 {
                                optional true
                                value [ 255 255 0 0 0 0 0 0  255 0 0 0 0 0 0 0  0 255 0 0 0 0 0 0 ]
                        }
-                       {
-                               # for compatibility with older drivers
-                               name "EMU10K1 PCM Send Volume"
-                               index { @func private_pcm_subdevice }
-                               lock true
-                               optional true
-                               value [ 255 255 0 0 0 0 0 0  255 0 0 0 0 0 0 0  0 255 0 0 0 0 0 0 ]
-                       }
                        {
                                interface PCM
                                name "EMU10K1 PCM Send Routing"
@@ -303,14 +246,6 @@ Audigy.pcm.iec958.0 {
                                optional true
                                value [ 20 21 0 0 0 0 0 0  20 21 0 0 0 0 0 0   20 21 0 0 0 0 0 0 ]
                        }
-                       {
-                               # for compatibility with older drivers
-                               name "EMU10K1 PCM Send Routing"
-                               index { @func private_pcm_subdevice }
-                               lock true
-                               optional true
-                               value [ 20 21 0 0 0 0 0 0  20 21 0 0 0 0 0 0   20 21 0 0 0 0 0 0 ]
-                       }
                        {
                                name "Audigy Analog/Digital Output Jack"
                                lock true

diff --git a/src/conf/cards/Audigy2.conf b/src/conf/cards/Audigy2.conf
index cbec7835888292fa735d0503c629443561f82360..35126d23fd1cd66aa4247fb1c1f6e7f3f8c94ca6 100644 (file)
--- a/src/conf/cards/Audigy2.conf
+++ b/src/conf/cards/Audigy2.conf
@@ -26,14 +26,6 @@ Audigy2.pcm.front.0 {
                                optional true
                                value [ 255 255 0 0 0 0 0 0  255 0 0 0 0 0 0 0  0 255 0 0 0 0 0 0 ]
                        }
-                       {
-                               # for compatibility with older drivers
-                               name "EMU10K1 PCM Send Volume"
-                               index { @func private_pcm_subdevice }
-                               lock true
-                               optional true
-                               value [ 255 255 0 0 0 0 0 0  255 0 0 0 0 0 0 0  0 255 0 0 0 0 0 0 ]
-                       }
                        {
                                interface PCM
                                name "EMU10K1 PCM Send Routing"
@@ -42,14 +34,6 @@ Audigy2.pcm.front.0 {
                                optional true
                                value [ 8 9 0 0 0 0 0 0  8 9 0 0 0 0 0 0  8 9 0 0 0 0 0 0 ]
                        }
-                       {
-                               # for compatibility with older drivers
-                               name "EMU10K1 PCM Send Routing"
-                               index { @func private_pcm_subdevice }
-                               lock true
-                               optional true
-                               value [ 8 9 0 0 0 0 0 0  8 9 0 0 0 0 0 0  8 9 0 0 0 0 0 0 ]
-                       }
 
                ]
        }
@@ -79,14 +63,6 @@ Audigy2.pcm.rear.0 {
                                optional true
                                value [ 0 0 255 255 0 0 0 0  0 0 255 0 0 0 0 0  0 0 0 255 0 0 0 0 ]
                        }
-                       {
-                               # for compatibility with older drivers
-                               name "EMU10K1 PCM Send Volume"
-                               index { @func private_pcm_subdevice }
-                               lock true
-                               optional true
-                               value [ 0 0 255 255 0 0 0 0  0 0 255 0 0 0 0 0  0 0 0 255 0 0 0 0 ]
-                       }
                ]
        }
 }      
@@ -115,14 +91,6 @@ Audigy2.pcm.center_lfe.0 {
                                optional true
                                value [ 255 255 0 0 0 0 0 0  255 0 0 0 0 0 0 0  0 255 0 0 0 0 0 0 ]
                        }
-                       {
-                               # for compatibility with older drivers
-                               name "EMU10K1 PCM Send Volume"
-                               index { @func private_pcm_subdevice }
-                               lock true
-                               optional true
-                               value [ 255 255 0 0 0 0 0 0  255 0 0 0 0 0 0 0  0 255 0 0 0 0 0 0 ]
-                       }
                        {
                                interface PCM
                                name "EMU10K1 PCM Send Routing"
@@ -131,14 +99,6 @@ Audigy2.pcm.center_lfe.0 {
                                optional true
                                value [ 6 7 0 0 0 0 0 0  6 7 0 0 0 0 0 0  6 7 0 0 0 0 0 0 ]
                        }
-                       {
-                               # for compatibility with older drivers
-                               name "EMU10K1 PCM Send Routing"
-                               index { @func private_pcm_subdevice }
-                               lock true
-                               optional true
-                               value [ 6 7 0 0 0 0 0 0  6 7 0 0 0 0 0 0  6 7 0 0 0 0 0 0 ]
-                       }
                ]
        }
 }
@@ -167,14 +127,6 @@ Audigy2.pcm.side.0 {
                                optional true
                                value [ 255 255 0 0 0 0 0 0  255 0 0 0 0 0 0 0  0 255 0 0 0 0 0 0 ]
                        }
-                       {
-                               # for compatibility with older drivers
-                               name "EMU10K1 PCM Send Volume"
-                               index { @func private_pcm_subdevice }
-                               lock true
-                               optional true
-                               value [ 255 255 0 0 0 0 0 0  255 0 0 0 0 0 0 0  0 255 0 0 0 0 0 0 ]
-                       }
                        {
                                interface PCM
                                name "EMU10K1 PCM Send Routing"
@@ -183,14 +135,6 @@ Audigy2.pcm.side.0 {
                                optional true
                                value [ 14 15 0 0 0 0 0 0  14 15 0 0 0 0 0 0  14 15 0 0 0 0 0 0 ]
                        }
-                       {
-                               # for compatibility with older drivers
-                               name "EMU10K1 PCM Send Routing"
-                               index { @func private_pcm_subdevice }
-                               lock true
-                               optional true
-                               value [ 14 15 0 0 0 0 0 0  14 15 0 0 0 0 0 0  14 15 0 0 0 0 0 0 ]
-                       }
                ]
        }
 }
@@ -374,13 +318,6 @@ Audigy2.pcm.iec958.0 {
                                optional true
                                value [ $AES0 $AES1 $AES2 $AES3 ]
                        }
-                       {
-                               # for compatibility with older drivers
-                               name "IEC958 Playback Default"
-                               preserve true
-                               optional true
-                               value [ $AES0 $AES1 $AES2 $AES3 ]
-                       }
                        {
                                name "IEC958 Optical Raw Playback Switch"
                                lock true
@@ -395,14 +332,6 @@ Audigy2.pcm.iec958.0 {
                                optional true
                                value [ 255 255 0 0 0 0 0 0  255 0 0 0 0 0 0 0  0 255 0 0 0 0 0 0 ]
                        }
-                       {
-                               # for compatibility with older drivers
-                               name "EMU10K1 PCM Send Volume"
-                               index { @func private_pcm_subdevice }
-                               lock true
-                               optional true
-                               value [ 255 255 0 0 0 0 0 0  255 0 0 0 0 0 0 0  0 255 0 0 0 0 0 0 ]
-                       }
                        {
                                interface PCM
                                name "EMU10K1 PCM Send Routing"
@@ -411,14 +340,6 @@ Audigy2.pcm.iec958.0 {
                                optional true
                                value [ 20 21 0 0 0 0 0 0  20 21 0 0 0 0 0 0   20 21 0 0 0 0 0 0 ]
                        }
-                       {
-                               # for compatibility with older drivers
-                               name "EMU10K1 PCM Send Routing"
-                               index { @func private_pcm_subdevice }
-                               lock true
-                               optional true
-                               value [ 20 21 0 0 0 0 0 0  20 21 0 0 0 0 0 0   20 21 0 0 0 0 0 0 ]
-                       }
                        {
                                name "Audigy Analog/Digital Output Jack"
                                lock true

diff --git a/src/conf/cards/EMU10K1.conf b/src/conf/cards/EMU10K1.conf
index ef193fe0c460024fc7c9315fba1a6e1b267a43b7..430926c7daec8c44d3db544956b6d6865619f71e 100644 (file)
--- a/src/conf/cards/EMU10K1.conf
+++ b/src/conf/cards/EMU10K1.conf
@@ -28,14 +28,6 @@ EMU10K1.pcm.front.0 {
                                        optional true
                                        value [ 255 255 0 0 255 0 0 0 0 255 0 0 ]
                                }
-                               {
-                                       # for compatibility with older drivers
-                                       name "EMU10K1 PCM Send Volume"
-                                       index { @func private_pcm_subdevice }
-                                       # lock true
-                                       optional true
-                                       value [ 255 255 0 0 255 0 0 0 0 255 0 0 ]
-                               }
                                {
                                        interface PCM
                                        name "EMU10K1 PCM Send Routing"
@@ -44,14 +36,6 @@ EMU10K1.pcm.front.0 {
                                        optional true
                                        value [ 8 9 0 0 8 9 0 0 8 9 0 0 ]
                                }
-                               {
-                                       # for compatibility with older drivers
-                                       name "EMU10K1 PCM Send Routing"
-                                       index { @func private_pcm_subdevice }
-                                       # lock true
-                                       optional true
-                                       value [ 8 9 0 0 8 9 0 0 8 9 0 0 ]
-                               }
                        ]
                }
        }
@@ -87,14 +71,6 @@ EMU10K1.pcm.rear.0 {
                                        optional true
                                        value [ 0 0 255 255 0 0 255 0 0 0 0 255 ]
                                }
-                               {
-                                       # for compatibility with older drivers
-                                       name "EMU10K1 PCM Send Volume"
-                                       index { @func private_pcm_subdevice }
-                                       # lock true
-                                       optional true
-                                       value [ 0 0 255 255 0 0 255 0 0 0 0 255 ]
-                               }
                        ]
                }
        }
@@ -152,14 +128,6 @@ EMU10K1.pcm.center_lfe.0 {
                                        optional true
                                        value [ 255 255 0 0 255 0 0 0 0 255 0 0 ]
                                }
-                               {
-                                       # for compatibility with older drivers
-                                       name "EMU10K1 PCM Send Volume"
-                                       index { @func private_pcm_subdevice }
-                                       # lock true
-                                       optional true
-                                       value [ 255 255 0 0 255 0 0 0 0 255 0 0 ]
-                               }
                                {
                                        interface PCM
                                        name "EMU10K1 PCM Send Routing"
@@ -168,14 +136,6 @@ EMU10K1.pcm.center_lfe.0 {
                                        optional true
                                        value [ 6 7 0 0 6 7 0 0 6 7 0 0 ]
                                }
-                               {
-                                       # for compatibility with older drivers
-                                       name "EMU10K1 PCM Send Routing"
-                                       index { @func private_pcm_subdevice }
-                                       # lock true
-                                       optional true
-                                       value [ 6 7 0 0 6 7 0 0 6 7 0 0 ]
-                               }
                        ]
                }
        }
@@ -304,14 +264,6 @@ EMU10K1.pcm.iec958.0 {
                                optional true
                                value [ $AES0 $AES1 $AES2 $AES3 ]
                        }
-                       {
-                               # for compatibility with older drivers
-                               name "IEC958 Playback Default"
-                               lock true
-                               preserve true
-                               optional true
-                               value [ $AES0 $AES1 $AES2 $AES3 ]
-                       }
                        {
                                name "IEC958 Optical Raw Playback Switch"
                                lock true