conf: ICH,ICH4,ICH-MODEM: define pcm configuration block only one time

There may be multiple ICH 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/ICH-MODEM.conf b/src/conf/cards/ICH-MODEM.conf
index b96b5aaf1ad06492992f1f07b002b4e5a5b10c21..855f3a960f324f81cc329d7712409b16e5173381 100644 (file)
--- a/src/conf/cards/ICH-MODEM.conf
+++ b/src/conf/cards/ICH-MODEM.conf
@@ -4,7 +4,7 @@
 
 <confdir:pcm/modem.conf>
 
-ICH-MODEM.pcm.modem.0 {
+ICH-MODEM.pcm.modem.!0 {
        @args [ CARD ]
        @args.CARD {
                type string

diff --git a/src/conf/cards/ICH.conf b/src/conf/cards/ICH.conf
index 6fc9a5a236c1276d5e718e72b85aad3d9ce29b25..c35c8d0209c08b4f704f03452d5bee831197fc90 100644 (file)
--- a/src/conf/cards/ICH.conf
+++ b/src/conf/cards/ICH.conf
@@ -4,7 +4,7 @@
 
 <confdir:pcm/front.conf>
 
-ICH.pcm.front.0 {
+ICH.pcm.front.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -21,7 +21,7 @@ ICH.pcm.front.0 {
 }      
 
 # default with dmix+softvol & dsnoop
-ICH.pcm.default {
+ICH.pcm.!default {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -52,7 +52,7 @@ ICH.pcm.default {
 
 <confdir:pcm/surround40.conf>
 
-ICH.pcm.surround40.0 {
+ICH.pcm.surround40.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -103,7 +103,7 @@ ICH.pcm.surround40.0 {
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
 
-ICH.pcm.surround51.0 {
+ICH.pcm.surround51.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -174,7 +174,7 @@ ICH.pcm.surround51.0 {
 
 <confdir:pcm/iec958.conf>
 
-ICH.pcm.iec958.0 {
+ICH.pcm.iec958.!0 {
        @args [ CARD AES0 AES1 AES2 AES3 ]
        @args.CARD {
                type string

diff --git a/src/conf/cards/ICH4.conf b/src/conf/cards/ICH4.conf
index 64ec883d9c73b12414d42861ef710215eb208b92..11c85a6e08ae7f48ff000934eabf58efc6849d61 100644 (file)
--- a/src/conf/cards/ICH4.conf
+++ b/src/conf/cards/ICH4.conf
@@ -4,7 +4,7 @@
 
 <confdir:pcm/front.conf>
 
-ICH4.pcm.front.0 {
+ICH4.pcm.front.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -21,7 +21,7 @@ ICH4.pcm.front.0 {
 }      
 
 # default with dmix+softvol & dsnoop
-ICH4.pcm.default {
+ICH4.pcm.!default {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -52,7 +52,7 @@ ICH4.pcm.default {
 
 <confdir:pcm/surround40.conf>
 
-ICH4.pcm.surround40.0 {
+ICH4.pcm.surround40.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -103,7 +103,7 @@ ICH4.pcm.surround40.0 {
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
 
-ICH4.pcm.surround51.0 {
+ICH4.pcm.surround51.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -164,7 +164,7 @@ ICH4.pcm.surround51.0 {
 
 <confdir:pcm/iec958.conf>
 
-ICH4.pcm.iec958.0 {
+ICH4.pcm.iec958.!0 {
        @args [ CARD AES0 AES1 AES2 AES3 ]
        @args.CARD {
                type string