use PCM interface for IEC958 controls

For consistency, use the PCM interface instead of MIXER for IEC958
default/mask/stream mixer controls.

diff --git a/src/conf/cards/Audigy.conf b/src/conf/cards/Audigy.conf
index 8d79fe735a90c04c0edf057742aa2ea9e36137bb..e43610aeb1cd3a88b3d02fcff550b6680858653e 100644 (file)
--- a/src/conf/cards/Audigy.conf
+++ b/src/conf/cards/Audigy.conf
@@ -264,9 +264,20 @@ Audigy.pcm.iec958.0 {
                type ctl_elems
                hook_args [
                        {
+                               interface PCM
                                name "IEC958 Playback Default"
+                               device 0
                                lock true
                                preserve true
+                               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 ]
                        }
                        {

diff --git a/src/conf/cards/Audigy2.conf b/src/conf/cards/Audigy2.conf
index 1f872674490f265187248ec9d653fa58624c242c..d8bfa0fccc3b64bd8edc20959893d9ad21fbdd8a 100644 (file)
--- a/src/conf/cards/Audigy2.conf
+++ b/src/conf/cards/Audigy2.conf
@@ -376,8 +376,18 @@ Audigy2.pcm.iec958.0 {
                type ctl_elems
                hook_args [
                        {
+                               interface PCM
+                               name "IEC958 Playback Default"
+                               device 0
+                               preserve true
+                               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 ]
                        }
                        {

diff --git a/src/conf/cards/CA0106.conf b/src/conf/cards/CA0106.conf
index 058bf759950f13f9a77cccd9f17b13a759877577..c2e4fbb7cb6d1d7b6fce4d4a590846d83274ac90 100644 (file)
--- a/src/conf/cards/CA0106.conf
+++ b/src/conf/cards/CA0106.conf
@@ -237,10 +237,21 @@ CA0106.pcm.iec958.0 {
                                value 1
                        }
                        {
+                               interface PCM
                                name "IEC958 Playback Default"
                                index 1
                                lock true
                                preserve true
+                               optional true
+                               value [ $AES0 $AES1 $AES2 $AES3 ]
+                       }
+                       {
+                               # for compatibility with older drivers
+                               name "IEC958 Playback Default"
+                               index 1
+                               lock true
+                               preserve true
+                               optional true
                                value [ $AES0 $AES1 $AES2 $AES3 ]
                        }
                ]

diff --git a/src/conf/cards/EMU10K1.conf b/src/conf/cards/EMU10K1.conf
index 8338009a0c0f8fa7486d9ae77194732b4e86dcd4..2596a59f6ec79193ed26e566bd3041eecfdb1b67 100644 (file)
--- a/src/conf/cards/EMU10K1.conf
+++ b/src/conf/cards/EMU10K1.conf
@@ -262,9 +262,20 @@ EMU10K1.pcm.iec958.0 {
                type ctl_elems
                hook_args [
                        {
+                               interface PCM
+                               name "IEC958 Playback Default"
+                               device 2
+                               lock true
+                               preserve true
+                               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 ]
                        }
                        {

diff --git a/src/conf/cards/EMU10K1X.conf b/src/conf/cards/EMU10K1X.conf
index f7bfe1b3310a198e354230a78bd789c3627db3ba..9a72b529ab4e22b1e3d41961508ad4ffb71cc81d 100644 (file)
--- a/src/conf/cards/EMU10K1X.conf
+++ b/src/conf/cards/EMU10K1X.conf
@@ -181,10 +181,21 @@ EMU10K1X.pcm.iec958.0 {
                                value 0
                        }
                        {
+                               interface PCM
                                name "IEC958 Playback Default"
                                index 0
                                lock true
                                preserve true
+                               optional true
+                               value [ $AES0 $AES1 $AES2 $AES3 ]
+                       }
+                       {
+                               # for compatibility with older drivers
+                               name "IEC958 Playback Default"
+                               index 0
+                               lock true
+                               preserve true
+                               optional true
                                value [ $AES0 $AES1 $AES2 $AES3 ]
                        }
                ]

diff --git a/src/conf/cards/VX222.conf b/src/conf/cards/VX222.conf
index 0f36de3f48ba2943a5f190adaef8da5e8e049999..11cb4cdaa314deb911212c72b580f2fc6bf2393c 100644 (file)
--- a/src/conf/cards/VX222.conf
+++ b/src/conf/cards/VX222.conf
@@ -43,9 +43,19 @@ VX222.pcm.iec958.0 {
                type ctl_elems
                hook_args [
                        {
+                               interface PCM
                                name "IEC958 Playback Default"
                                lock true
                                preserve true
+                               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 ]
                        }
                ]

diff --git a/src/conf/cards/VXPocket.conf b/src/conf/cards/VXPocket.conf
index 96c9fc84208cc92193f4bb8ed01399c3bbe0e48a..bdce137615d463fe8ad4b58f827db492c4052104 100644 (file)
--- a/src/conf/cards/VXPocket.conf
+++ b/src/conf/cards/VXPocket.conf
@@ -43,9 +43,19 @@ VXPocket.pcm.iec958.0 {
                type ctl_elems
                hook_args [
                        {
+                               interface PCM
                                name "IEC958 Playback Default"
                                lock true
                                preserve true
+                               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 ]
                        }
                ]

diff --git a/src/conf/cards/VXPocket440.conf b/src/conf/cards/VXPocket440.conf
index 80a2c0b11d577f4e103667d5dc940f9739d5d064..2aa96f8bb4b4f35c67083d834eae4ba733fe61a7 100644 (file)
--- a/src/conf/cards/VXPocket440.conf
+++ b/src/conf/cards/VXPocket440.conf
@@ -92,9 +92,19 @@ VXPocket440.pcm.iec958.0 {
                type ctl_elems
                hook_args [
                        {
+                               interface PCM
                                name "IEC958 Playback Default"
                                lock true
                                preserve true
+                               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 ]
                        }
                ]