conf: VIA686A,VIA82xx: define pcm configuration block only one time

There may be multiple VIA 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/VIA686A.conf b/src/conf/cards/VIA686A.conf
index e4a06f236591f19c92ef11ecfac1be9fcff6aff0..c53dd71bf0bce30bad1b191a5d76b239c1943647 100644 (file)
--- a/src/conf/cards/VIA686A.conf
+++ b/src/conf/cards/VIA686A.conf
@@ -7,7 +7,7 @@
 
 <confdir:pcm/front.conf>
 
-VIA686A.pcm.front.0 {
+VIA686A.pcm.front.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -17,7 +17,7 @@ VIA686A.pcm.front.0 {
 }      
 
 # default with dmix/dsnoop
-VIA686A.pcm.default {
+VIA686A.pcm.!default {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -41,7 +41,7 @@ VIA686A.pcm.default {
 
 <confdir:pcm/iec958.conf>
 
-VIA686A.pcm.iec958.0 {
+VIA686A.pcm.iec958.!0 {
        @args [ CARD AES0 AES1 AES2 AES3 ]
        @args.CARD {
                type string

diff --git a/src/conf/cards/VIA8233.conf b/src/conf/cards/VIA8233.conf
index 9ad321f713a990df9c91660397a08c3669bab20d..3c25a11b396b74ccb39b643d7f32c27eef4f6d3f 100644 (file)
--- a/src/conf/cards/VIA8233.conf
+++ b/src/conf/cards/VIA8233.conf
@@ -4,7 +4,7 @@
 
 <confdir:pcm/front.conf>
 
-VIA8233.pcm.front.0 {
+VIA8233.pcm.front.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -15,7 +15,7 @@ VIA8233.pcm.front.0 {
 
 # default with softvol/dsnoop
 # VIA8233 supports multi-playback
-VIA8233.pcm.default {
+VIA8233.pcm.!default {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -46,7 +46,7 @@ VIA8233.pcm.default {
 
 <confdir:pcm/surround40.conf>
 
-VIA8233.pcm.surround40.0 {
+VIA8233.pcm.surround40.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -91,7 +91,7 @@ VIA8233.pcm.surround40.0 {
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
 
-VIA8233.pcm.surround51.0 {
+VIA8233.pcm.surround51.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -146,7 +146,7 @@ VIA8233.pcm.surround51.0 {
 
 <confdir:pcm/iec958.conf>
 
-VIA8233.pcm.iec958.0 {
+VIA8233.pcm.iec958.!0 {
        @args [ CARD AES0 AES1 AES2 AES3 ]
        @args.CARD {
                type string

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

diff --git a/src/conf/cards/VIA8237.conf b/src/conf/cards/VIA8237.conf
index 29d8e00f6601f7f04151cccce3b57d8f79032cd9..49fd6f2c82e482b463aa49982a05e65547cb4682 100644 (file)
--- a/src/conf/cards/VIA8237.conf
+++ b/src/conf/cards/VIA8237.conf
@@ -4,7 +4,7 @@
 
 <confdir:pcm/front.conf>
 
-VIA8237.pcm.front.0 {
+VIA8237.pcm.front.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -15,7 +15,7 @@ VIA8237.pcm.front.0 {
 
 # default with softvol/dsnoop
 # VIA8237 supports multi-playback
-VIA8237.pcm.default {
+VIA8237.pcm.!default {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -46,7 +46,7 @@ VIA8237.pcm.default {
 
 <confdir:pcm/surround40.conf>
 
-VIA8237.pcm.surround40.0 {
+VIA8237.pcm.surround40.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -84,7 +84,7 @@ VIA8237.pcm.surround40.0 {
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
 
-VIA8237.pcm.surround51.0 {
+VIA8237.pcm.surround51.!0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -136,7 +136,7 @@ VIA8237.pcm.surround51.0 {
 
 <confdir:pcm/iec958.conf>
 
-VIA8237.pcm.iec958.0 {
+VIA8237.pcm.iec958.!0 {
        @args [ CARD AES0 AES1 AES2 AES3 ]
        @args.CARD {
                type string