conf: CMI8xxx: define pcm configuration block only one time

There may be multiple CMI8xxx 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/CMI8338-SWIEC.conf b/src/conf/cards/CMI8338-SWIEC.conf
index af3a579f9e84b1ef18c7e4614002ac4f83f9064c..ca86c46651dd41fd40f4a1fdf0e1faaeb7aba2a9 100644 (file)
--- a/src/conf/cards/CMI8338-SWIEC.conf
+++ b/src/conf/cards/CMI8338-SWIEC.conf
@@ -5,7 +5,7 @@
 
 <confdir:pcm/front.conf>
 
-CMI8338-SWIEC.pcm.front.0 {
+CMI8338-SWIEC.pcm.front.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -15,7 +15,7 @@ CMI8338-SWIEC.pcm.front.0 {
 }      
 
 # default with dmix/dsnoop
-CMI8338-SWIEC.pcm.default {
+CMI8338-SWIEC.pcm.!default {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -41,7 +41,7 @@ CMI8338-SWIEC.pcm.default {
 
 # 2nd DAC
 # FIXME: we need a volume attenuator for rear channel.
-CMI8338-SWIEC.pcm.rear.0 {
+CMI8338-SWIEC.pcm.rear.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -54,7 +54,7 @@ CMI8338-SWIEC.pcm.rear.0 {
 <confdir:pcm/surround40.conf>
 
 # for the old CM8738 with 2nd DAC for rear
-CMI8338-SWIEC.pcm.surround40.0 {
+CMI8338-SWIEC.pcm.surround40.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -91,7 +91,7 @@ CMI8338-SWIEC.pcm.surround40.0 {
 
 <confdir:pcm/iec958.conf>
 
-CMI8338-SWIEC.pcm.iec958.0 {
+CMI8338-SWIEC.pcm.iec958.!0 {
        @args [ CARD AES0 AES1 AES2 AES3 ]
        @args.CARD {
                type string

diff --git a/src/conf/cards/CMI8338.conf b/src/conf/cards/CMI8338.conf
index 144fc9b0d75c95b838e3970b646820ce6c9c2a6b..0f92ad0b9d5dc8ef7e8d4e9ac66036270bc2cdc2 100644 (file)
--- a/src/conf/cards/CMI8338.conf
+++ b/src/conf/cards/CMI8338.conf
@@ -4,7 +4,7 @@
 
 <confdir:pcm/front.conf>
 
-CMI8338.pcm.front.0 {
+CMI8338.pcm.front.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -14,7 +14,7 @@ CMI8338.pcm.front.0 {
 }      
 
 # default with dmix/dsnoop
-CMI8338.pcm.default {
+CMI8338.pcm.!default {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -40,7 +40,7 @@ CMI8338.pcm.default {
 
 # 2nd DAC
 # FIXME: we need a volume attenuator for rear channel.
-CMI8338.pcm.rear.0 {
+CMI8338.pcm.rear.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -53,7 +53,7 @@ CMI8338.pcm.rear.0 {
 <confdir:pcm/surround40.conf>
 
 # for the old CM8738 with 2nd DAC for rear
-CMI8338.pcm.surround40.0 {
+CMI8338.pcm.surround40.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -90,7 +90,7 @@ CMI8338.pcm.surround40.0 {
 
 <confdir:pcm/iec958.conf>
 
-CMI8338.pcm.iec958.0 {
+CMI8338.pcm.iec958.!0 {
        @args [ CARD AES0 AES1 AES2 AES3 ]
        @args.CARD {
                type string

diff --git a/src/conf/cards/CMI8738-MC6.conf b/src/conf/cards/CMI8738-MC6.conf
index edc67d44d96a1cc7f37c13f23794ae8f8a6a4da3..2b1c7d05e81dcbf7fb9fffac9dc673240b96bb4b 100644 (file)
--- a/src/conf/cards/CMI8738-MC6.conf
+++ b/src/conf/cards/CMI8738-MC6.conf
@@ -4,7 +4,7 @@
 
 <confdir:pcm/front.conf>
 
-CMI8738-MC6.pcm.front.0 {
+CMI8738-MC6.pcm.front.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -14,7 +14,7 @@ CMI8738-MC6.pcm.front.0 {
 }      
 
 # default with dmix/dsnoop
-CMI8738-MC6.pcm.default {
+CMI8738-MC6.pcm.!default {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -40,7 +40,7 @@ CMI8738-MC6.pcm.default {
 
 # 2nd DAC
 # FIXME: we need a volume attenuator for rear channel.
-CMI8738-MC6.pcm.rear.0 {
+CMI8738-MC6.pcm.rear.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -52,7 +52,7 @@ CMI8738-MC6.pcm.rear.0 {
 
 <confdir:pcm/surround40.conf>
 
-CMI8738-MC6.pcm.surround40.0 {
+CMI8738-MC6.pcm.surround40.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -82,7 +82,7 @@ CMI8738-MC6.pcm.surround40.0 {
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
 
-CMI8738-MC6.pcm.surround51.0 {
+CMI8738-MC6.pcm.surround51.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -109,7 +109,7 @@ CMI8738-MC6.pcm.surround51.0 {
 
 <confdir:pcm/iec958.conf>
 
-CMI8738-MC6.pcm.iec958.0 {
+CMI8738-MC6.pcm.iec958.!0 {
        @args [ CARD AES0 AES1 AES2 AES3 ]
        @args.CARD {
                type string

diff --git a/src/conf/cards/CMI8738-MC8.conf b/src/conf/cards/CMI8738-MC8.conf
index ddff75304bc306bd7f3431922ce586c06db5971e..96cb3f105796b95872bbb8d4538d4a452a82aebc 100644 (file)
--- a/src/conf/cards/CMI8738-MC8.conf
+++ b/src/conf/cards/CMI8738-MC8.conf
@@ -4,7 +4,7 @@
 
 <confdir:pcm/front.conf>
 
-CMI8738-MC8.pcm.front.0 {
+CMI8738-MC8.pcm.front.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -21,7 +21,7 @@ CMI8738-MC8.pcm.front.0 {
 }      
 
 # default with dmix+softvol & dsnoop
-CMI8738-MC8.pcm.default {
+CMI8738-MC8.pcm.!default {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -53,7 +53,7 @@ CMI8738-MC8.pcm.default {
 <confdir:pcm/rear.conf>
 
 # 2nd DAC
-CMI8738-MC8.pcm.rear.0 {
+CMI8738-MC8.pcm.rear.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -72,7 +72,7 @@ CMI8738-MC8.pcm.rear.0 {
 
 <confdir:pcm/surround40.conf>
 
-CMI8738-MC8.pcm.surround40.0 {
+CMI8738-MC8.pcm.surround40.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -110,7 +110,7 @@ CMI8738-MC8.pcm.surround40.0 {
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
 
-CMI8738-MC8.pcm.surround51.0 {
+CMI8738-MC8.pcm.surround51.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -144,7 +144,7 @@ CMI8738-MC8.pcm.surround51.0 {
 
 <confdir:pcm/surround71.conf>
 
-CMI8738-MC8.pcm.surround71.0 {
+CMI8738-MC8.pcm.surround71.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -178,7 +178,7 @@ CMI8738-MC8.pcm.surround71.0 {
 
 <confdir:pcm/iec958.conf>
 
-CMI8738-MC8.pcm.iec958.0 {
+CMI8738-MC8.pcm.iec958.!0 {
        @args [ CARD AES0 AES1 AES2 AES3 ]
        @args.CARD {
                type string

diff --git a/src/conf/cards/CMI8788.conf b/src/conf/cards/CMI8788.conf
index edcb0c9ccc3600955cc80a446574febc71fa0227..c4ad9f48347598ac0f03083a00c84a1626a32dd3 100644 (file)
--- a/src/conf/cards/CMI8788.conf
+++ b/src/conf/cards/CMI8788.conf
@@ -4,7 +4,7 @@
 
 <confdir:pcm/front.conf>
 
-CMI8788.pcm.front.0 {
+CMI8788.pcm.front.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -14,7 +14,7 @@ CMI8788.pcm.front.0 {
 }      
 
 # default with dmix & dsnoop
-CMI8788.pcm.default {
+CMI8788.pcm.!default {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -38,7 +38,7 @@ CMI8788.pcm.default {
 
 <confdir:pcm/surround40.conf>
 
-CMI8788.pcm.surround40.0 {
+CMI8788.pcm.surround40.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -53,7 +53,7 @@ CMI8788.pcm.surround40.0 {
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
 
-CMI8788.pcm.surround51.0 {
+CMI8788.pcm.surround51.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -65,7 +65,7 @@ CMI8788.pcm.surround51.0 {
 
 <confdir:pcm/surround71.conf>
 
-CMI8788.pcm.surround71.0 {
+CMI8788.pcm.surround71.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -77,7 +77,7 @@ CMI8788.pcm.surround71.0 {
 
 <confdir:pcm/iec958.conf>
 
-CMI8788.pcm.iec958.0 {
+CMI8788.pcm.iec958.!0 {
        @args [ CARD AES0 AES1 AES2 AES3 ]
        @args.CARD {
                type string