conf: ICE17[12][24]: define pcm configuration block only one time

There may be multiple ICE17[12][24] 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/ICE1712.conf b/src/conf/cards/ICE1712.conf
index db62684e25f2408044cac34f63bbe9778bbe84b9..190d2c5990520316e2186ca25587ca9e3d348217 100644 (file)
--- a/src/conf/cards/ICE1712.conf
+++ b/src/conf/cards/ICE1712.conf
@@ -3,7 +3,7 @@
 #
 
 # default with dmix & dsnoop
-ICE1712.pcm.default {
+ICE1712.pcm.!default {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -27,7 +27,7 @@ ICE1712.pcm.default {
 
 <confdir:pcm/front.conf>
 
-ICE1712.pcm.front.0 {
+ICE1712.pcm.front.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -57,7 +57,7 @@ ICE1712.pcm.front.0 {
 
 <confdir:pcm/surround40.conf>
 
-ICE1712.pcm.surround40.0 {
+ICE1712.pcm.surround40.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -80,7 +80,7 @@ ICE1712.pcm.surround40.0 {
 <confdir:pcm/surround51.conf>
 <confdir:pcm/surround71.conf>
 
-ICE1712.pcm.surround51.0 {
+ICE1712.pcm.surround51.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -99,7 +99,7 @@ ICE1712.pcm.surround51.0 {
        slave.channels 10
 }
 
-ICE1712.pcm.surround71.0 {
+ICE1712.pcm.surround71.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -122,7 +122,7 @@ ICE1712.pcm.surround71.0 {
 
 <confdir:pcm/iec958.conf>
 
-ICE1712.pcm.iec958.0 {
+ICE1712.pcm.iec958.!0 {
        @args [ CARD AES0 AES1 AES2 AES3 ]
        @args.CARD {
                type string

diff --git a/src/conf/cards/ICE1724.conf b/src/conf/cards/ICE1724.conf
index 61cac0132f07f0a4673684a3c4766c542cb6d84c..16045dc439acd26e0e6b66cd9327bc4cc5c42bef 100644 (file)
--- a/src/conf/cards/ICE1724.conf
+++ b/src/conf/cards/ICE1724.conf
@@ -3,7 +3,7 @@
 #
 
 # default with dmix & dsnoop
-ICE1724.pcm.default {
+ICE1724.pcm.!default {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -27,7 +27,7 @@ ICE1724.pcm.default {
 
 <confdir:pcm/front.conf>
 
-ICE1724.pcm.front.0 {
+ICE1724.pcm.front.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -38,7 +38,7 @@ ICE1724.pcm.front.0 {
 
 <confdir:pcm/rear.conf>
 
-ICE1724.pcm.rear.0 {
+ICE1724.pcm.rear.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -51,7 +51,7 @@ ICE1724.pcm.rear.0 {
 
 <confdir:pcm/center_lfe.conf>
 
-ICE1724.pcm.center_lfe.0 {
+ICE1724.pcm.center_lfe.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -63,7 +63,7 @@ ICE1724.pcm.center_lfe.0 {
 
 <confdir:pcm/side.conf>
 
-ICE1724.pcm.side.0 {
+ICE1724.pcm.side.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -76,7 +76,7 @@ ICE1724.pcm.side.0 {
 
 <confdir:pcm/surround40.conf>
 
-ICE1724.pcm.surround40.0 {
+ICE1724.pcm.surround40.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -100,7 +100,7 @@ ICE1724.pcm.surround40.0 {
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
 
-ICE1724.pcm.surround51.0 {
+ICE1724.pcm.surround51.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -123,7 +123,7 @@ ICE1724.pcm.surround51.0 {
 
 <confdir:pcm/surround71.conf>
 
-ICE1724.pcm.surround71.0 {
+ICE1724.pcm.surround71.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -148,7 +148,7 @@ ICE1724.pcm.surround71.0 {
 
 <confdir:pcm/iec958.conf>
 
-ICE1724.pcm.iec958.0 {
+ICE1724.pcm.iec958.!0 {
        @args [ CARD AES0 AES1 AES2 AES3 ]
        @args.CARD {
                type string