conf: Aureon: define pcm configuration block only one time

There may be multiple Aureon 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/Aureon51.conf b/src/conf/cards/Aureon51.conf
index 07be4a77aa12e53b2632a154eb2493c2f2d6225a..9bf346610c673f9a95868f0bdb2ec449bd3855ff 100644 (file)
--- a/src/conf/cards/Aureon51.conf
+++ b/src/conf/cards/Aureon51.conf
@@ -3,7 +3,7 @@
 #
 
 # default with dmix & dsnoop
-Aureon51.pcm.default {
+Aureon51.pcm.!default {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -27,7 +27,7 @@ Aureon51.pcm.default {
 
 <confdir:pcm/front.conf>
 
-Aureon51.pcm.front.0 {
+Aureon51.pcm.front.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -38,7 +38,7 @@ Aureon51.pcm.front.0 {
 
 <confdir:pcm/rear.conf>
 
-Aureon51.pcm.rear.0 {
+Aureon51.pcm.rear.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -51,7 +51,7 @@ Aureon51.pcm.rear.0 {
 
 <confdir:pcm/center_lfe.conf>
 
-Aureon51.pcm.center_lfe.0 {
+Aureon51.pcm.center_lfe.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -63,7 +63,7 @@ Aureon51.pcm.center_lfe.0 {
 
 <confdir:pcm/side.conf>
 
-Aureon51.pcm.side.0 {
+Aureon51.pcm.side.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -91,7 +91,7 @@ Aureon51.pcm.surround40.0 {
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
 
-Aureon51.pcm.surround51.0 {
+Aureon51.pcm.surround51.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -103,7 +103,7 @@ Aureon51.pcm.surround51.0 {
 
 <confdir:pcm/iec958.conf>
 
-Aureon51.pcm.iec958.0 {
+Aureon51.pcm.iec958.!0 {
        @args [ CARD AES0 AES1 AES2 AES3 ]
        @args.CARD {
                type string

diff --git a/src/conf/cards/Aureon71.conf b/src/conf/cards/Aureon71.conf
index a43ce2cee5fa064aba7f5d19ac63694faa124b38..f29bc29744488630f76f1b3247bc2cb1a80483e6 100644 (file)
--- a/src/conf/cards/Aureon71.conf
+++ b/src/conf/cards/Aureon71.conf
@@ -3,7 +3,7 @@
 #
 
 # default with dmix & dsnoop
-Aureon71.pcm.default {
+Aureon71.pcm.!default {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -27,7 +27,7 @@ Aureon71.pcm.default {
 
 <confdir:pcm/front.conf>
 
-Aureon71.pcm.front.0 {
+Aureon71.pcm.front.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -38,7 +38,7 @@ Aureon71.pcm.front.0 {
 
 <confdir:pcm/rear.conf>
 
-Aureon71.pcm.rear.0 {
+Aureon71.pcm.rear.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -50,7 +50,7 @@ Aureon71.pcm.rear.0 {
 
 <confdir:pcm/center_lfe.conf>
 
-Aureon71.pcm.center_lfe.0 {
+Aureon71.pcm.center_lfe.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -63,7 +63,7 @@ Aureon71.pcm.center_lfe.0 {
 
 <confdir:pcm/side.conf>
 
-Aureon71.pcm.side.0 {
+Aureon71.pcm.side.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -76,7 +76,7 @@ Aureon71.pcm.side.0 {
 
 <confdir:pcm/surround40.conf>
 
-Aureon71.pcm.surround40.0 {
+Aureon71.pcm.surround40.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -91,7 +91,7 @@ Aureon71.pcm.surround40.0 {
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
 
-Aureon71.pcm.surround51.0 {
+Aureon71.pcm.surround51.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -103,7 +103,7 @@ Aureon71.pcm.surround51.0 {
 
 <confdir:pcm/surround71.conf>
 
-Aureon71.pcm.surround71.0 {
+Aureon71.pcm.surround71.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -114,7 +114,7 @@ Aureon71.pcm.surround71.0 {
 
 <confdir:pcm/iec958.conf>
 
-Aureon71.pcm.iec958.0 {
+Aureon71.pcm.iec958.!0 {
        @args [ CARD AES0 AES1 AES2 AES3 ]
        @args.CARD {
                type string