conf: AACI,ATIIXP: define pcm configuration block only one time

There may be multiple AACI,ATIIXP 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/AACI.conf b/src/conf/cards/AACI.conf
index 748586a0726cbd873af79914e197c98d29c9e2aa..ff4778b4412fc8a108d1239395148ca3e6c2eb96 100644 (file)
--- a/src/conf/cards/AACI.conf
+++ b/src/conf/cards/AACI.conf
@@ -4,7 +4,7 @@
 
 <confdir:pcm/front.conf>
 
-AACI.pcm.front.0 {
+AACI.pcm.front.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -19,7 +19,7 @@ AACI.pcm.surround40.0 "cards.AACI.pcm.front.0"
 
 <confdir:pcm/surround51.conf>
 
-AACI.pcm.surround51.0 {
+AACI.pcm.surround51.!0 {
        @args [ CARD ]
        @args.CARD {
                type string

diff --git a/src/conf/cards/ATIIXP-MODEM.conf b/src/conf/cards/ATIIXP-MODEM.conf
index 6e52af053cc8c57d47e26ef18bcc3dc4ac81f3dd..1f69b735d84e7bb4901873dd16b430b2c094a6be 100644 (file)
--- a/src/conf/cards/ATIIXP-MODEM.conf
+++ b/src/conf/cards/ATIIXP-MODEM.conf
@@ -4,7 +4,7 @@
 
 <confdir:pcm/modem.conf>
 
-ATIIXP-MODEM.pcm.modem.0 {
+ATIIXP-MODEM.pcm.modem.!0 {
        @args [ CARD ]
        @args.CARD {
                type string

diff --git a/src/conf/cards/ATIIXP-SPDMA.conf b/src/conf/cards/ATIIXP-SPDMA.conf
index 42540d6817c0479f6166e89f731e50705164065a..12c40efc8f34b085ef6d54f90aaf61512c0834da 100644 (file)
--- a/src/conf/cards/ATIIXP-SPDMA.conf
+++ b/src/conf/cards/ATIIXP-SPDMA.conf
@@ -4,7 +4,7 @@
 
 <confdir:pcm/front.conf>
 
-ATIIXP-SPDMA.pcm.front.0 {
+ATIIXP-SPDMA.pcm.front.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -14,7 +14,7 @@ ATIIXP-SPDMA.pcm.front.0 {
 }      
 
 # default with dmix/dsnoop
-ATIIXP.pcm.default {
+ATIIXP.pcm.!default {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -38,7 +38,7 @@ ATIIXP.pcm.default {
 
 <confdir:pcm/surround40.conf>
 
-ATIIXP-SPDMA.pcm.surround40.0 {
+ATIIXP-SPDMA.pcm.surround40.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -82,7 +82,7 @@ ATIIXP-SPDMA.pcm.surround40.0 {
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
 
-ATIIXP-SPDMA.pcm.surround51.0 {
+ATIIXP-SPDMA.pcm.surround51.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -136,7 +136,7 @@ ATIIXP-SPDMA.pcm.surround51.0 {
 
 <confdir:pcm/iec958.conf>
 
-ATIIXP-SPDMA.pcm.iec958.0 {
+ATIIXP-SPDMA.pcm.iec958.!0 {
        @args [ CARD AES0 AES1 AES2 AES3 ]
        @args.CARD {
                type string

diff --git a/src/conf/cards/ATIIXP.conf b/src/conf/cards/ATIIXP.conf
index c4d33ef34a682c8f8a966be695ea4d20a93f9618..13e01c488b31942b7f8b69b1b3d86fa1baf170d7 100644 (file)
--- a/src/conf/cards/ATIIXP.conf
+++ b/src/conf/cards/ATIIXP.conf
@@ -4,7 +4,7 @@
 
 <confdir:pcm/front.conf>
 
-ATIIXP.pcm.front.0 {
+ATIIXP.pcm.front.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -14,7 +14,7 @@ ATIIXP.pcm.front.0 {
 }      
 
 # default with dmix/dsnoop
-ATIIXP.pcm.default {
+ATIIXP.pcm.!default {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -38,7 +38,7 @@ ATIIXP.pcm.default {
 
 <confdir:pcm/surround40.conf>
 
-ATIIXP.pcm.surround40.0 {
+ATIIXP.pcm.surround40.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -82,7 +82,7 @@ ATIIXP.pcm.surround40.0 {
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
 
-ATIIXP.pcm.surround51.0 {
+ATIIXP.pcm.surround51.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -136,7 +136,7 @@ ATIIXP.pcm.surround51.0 {
 
 <confdir:pcm/iec958.conf>
 
-ATIIXP.pcm.iec958.0 {
+ATIIXP.pcm.iec958.!0 {
        @args [ CARD AES0 AES1 AES2 AES3 ]
        @args.CARD {
                type string