conf: Audigy: define pcm configuration block only one time

There may be multiple Audigy soundcards in the system. Overwrite
the PCM configurations when loaded multiple times.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/src/conf/cards/Audigy.conf b/src/conf/cards/Audigy.conf
index 42692cfde6f7b36b03d938ec354b0d1d19622e84..a353c6242defa2a74f24b91e2367463f2305ca93 100644 (file)
--- a/src/conf/cards/Audigy.conf
+++ b/src/conf/cards/Audigy.conf
@@ -4,7 +4,7 @@
 
 <confdir:pcm/front.conf>
 
-Audigy.pcm.front.0 {
+Audigy.pcm.front.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -40,7 +40,7 @@ Audigy.pcm.front.0 {
 
 <confdir:pcm/rear.conf>
 
-Audigy.pcm.rear.0 {
+Audigy.pcm.rear.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -68,7 +68,7 @@ Audigy.pcm.rear.0 {
 
 <confdir:pcm/center_lfe.conf>
 
-Audigy.pcm.center_lfe.0 {
+Audigy.pcm.center_lfe.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -107,7 +107,7 @@ Audigy.pcm.center_lfe.0 {
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 
-Audigy.pcm.surround40.0 {
+Audigy.pcm.surround40.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -143,7 +143,7 @@ Audigy.pcm.surround40.0 {
 
 <confdir:pcm/surround51.conf>
 
-Audigy.pcm.surround51.0 {
+Audigy.pcm.surround51.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -190,7 +190,7 @@ Audigy.pcm.surround51.0 {
 
 <confdir:pcm/iec958.conf>
 
-Audigy.pcm.iec958.0 {
+Audigy.pcm.iec958.!0 {
        @args [ CARD AES0 AES1 AES2 AES3 ]
        @args.CARD {
                type string

diff --git a/src/conf/cards/Audigy2.conf b/src/conf/cards/Audigy2.conf
index 35126d23fd1cd66aa4247fb1c1f6e7f3f8c94ca6..3c15fd1d4e2e06223827252fe72164c410de0d82 100644 (file)
--- a/src/conf/cards/Audigy2.conf
+++ b/src/conf/cards/Audigy2.conf
@@ -4,7 +4,7 @@
 
 <confdir:pcm/front.conf>
 
-Audigy2.pcm.front.0 {
+Audigy2.pcm.front.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -41,7 +41,7 @@ Audigy2.pcm.front.0 {
 
 <confdir:pcm/rear.conf>
 
-Audigy2.pcm.rear.0 {
+Audigy2.pcm.rear.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -69,7 +69,7 @@ Audigy2.pcm.rear.0 {
 
 <confdir:pcm/center_lfe.conf>
 
-Audigy2.pcm.center_lfe.0 {
+Audigy2.pcm.center_lfe.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -105,7 +105,7 @@ Audigy2.pcm.center_lfe.0 {
 
 <confdir:pcm/side.conf>
 
-Audigy2.pcm.side.0 {
+Audigy2.pcm.side.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -144,7 +144,7 @@ Audigy2.pcm.side.0 {
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 
-Audigy2.pcm.surround40.0 {
+Audigy2.pcm.surround40.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -180,7 +180,7 @@ Audigy2.pcm.surround40.0 {
 
 <confdir:pcm/surround51.conf>
 
-Audigy2.pcm.surround51.0 {
+Audigy2.pcm.surround51.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -227,7 +227,7 @@ Audigy2.pcm.surround51.0 {
 
 <confdir:pcm/surround71.conf>
 
-Audigy2.pcm.surround71.0 {
+Audigy2.pcm.surround71.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -285,7 +285,7 @@ Audigy2.pcm.surround71.0 {
 
 <confdir:pcm/iec958.conf>
 
-Audigy2.pcm.iec958.0 {
+Audigy2.pcm.iec958.!0 {
        @args [ CARD AES0 AES1 AES2 AES3 ]
        @args.CARD {
                type string