From: Clemens Ladisch <clemens@ladisch.de>
Date: Wed, 3 Aug 2005 12:50:32 +0000 (+0000)
Subject: use PCM interface for IEC958 controls
X-Git-Tag: v1.0.10rc1~14
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=a4c7041de54c4b87b21a8d13f4bfc7972efe0207;p=alsa-lib.git

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 8d79fe73..e43610ae 100644
--- 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 1f872674..d8bfa0fc 100644
--- 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 058bf759..c2e4fbb7 100644
--- 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 8338009a..2596a59f 100644
--- 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 f7bfe1b3..9a72b529 100644
--- 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 0f36de3f..11cb4cda 100644
--- 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 96c9fc84..bdce1376 100644
--- 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 80a2c0b1..2aa96f8b 100644
--- 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 ]
 			}
 		]