Fix card type to string

Fixed the card type to string in each config.
Also, removed suprefluous DEV argument in iec958 of some cards.

diff --git a/src/conf/cards/ATIIXP-SPDMA.conf b/src/conf/cards/ATIIXP-SPDMA.conf
index 572023fc7f30a6f86d4ac589cf2e77aa14737ba2..eedac04a571f0f0963aaa829fa0fbe88e1a182b7 100644 (file)
--- a/src/conf/cards/ATIIXP-SPDMA.conf
+++ b/src/conf/cards/ATIIXP-SPDMA.conf
@@ -18,7 +18,7 @@ ATIIXP-SPDMA.pcm.front.0 {
 ATIIXP.pcm.default {
        @args [ CARD ]
        @args.CARD {
-               type integer
+               type string
        }
        type asym
        playback.pcm {

diff --git a/src/conf/cards/ATIIXP.conf b/src/conf/cards/ATIIXP.conf
index 5a8e49fc8737697b6e9e3055e61f2583bb7f3155..e4d5c8ad2db8ce186785a0666bf6ed945150d174 100644 (file)
--- a/src/conf/cards/ATIIXP.conf
+++ b/src/conf/cards/ATIIXP.conf
@@ -18,7 +18,7 @@ ATIIXP.pcm.front.0 {
 ATIIXP.pcm.default {
        @args [ CARD ]
        @args.CARD {
-               type integer
+               type string
        }
        type asym
        playback.pcm {

diff --git a/src/conf/cards/AU8810.conf b/src/conf/cards/AU8810.conf
index 5941937bd8f360ac771840ed9632349b48b00d66..b5b8386dcfbef9c8c142c8fa8bdf024d3c66c500 100644 (file)
--- a/src/conf/cards/AU8810.conf
+++ b/src/conf/cards/AU8810.conf
@@ -21,9 +21,6 @@ AU8810.pcm.iec958.0 {
        @args.CARD {
                type string
        }
-       @args.DEV {
-               type integer
-       }
        @args.AES0 {
                type integer
        }

diff --git a/src/conf/cards/AU8830.conf b/src/conf/cards/AU8830.conf
index 7ad988a81efa467c73c0ef28089d73706d469438..976f870c2b148bef3cbc11bc695b481b89bdaa13 100644 (file)
--- a/src/conf/cards/AU8830.conf
+++ b/src/conf/cards/AU8830.conf
@@ -25,9 +25,6 @@ AU8830.pcm.iec958.0 {
        @args.CARD {
                type string
        }
-       @args.DEV {
-               type integer
-       }
        @args.AES0 {
                type integer
        }

diff --git a/src/conf/cards/Azalia.conf b/src/conf/cards/Azalia.conf
index a00ef4bd03f93354d0e13c7594f305d8206b69d4..860c5b480cf38629d3927c87d5195a0dbb76f314 100644 (file)
--- a/src/conf/cards/Azalia.conf
+++ b/src/conf/cards/Azalia.conf
@@ -7,7 +7,7 @@
 Azalia.pcm.front.0 {
        @args [ CARD ]
        @args.CARD {
-               type integer
+               type string
        }
        type softvol
        slave.pcm {
@@ -25,7 +25,7 @@ Azalia.pcm.front.0 {
 HDA-Intel.pcm.default {
        @args [ CARD ]
        @args.CARD {
-               type integer
+               type string
        }
        type asym
        playback.pcm {

diff --git a/src/conf/cards/CMI8338-SWIEC.conf b/src/conf/cards/CMI8338-SWIEC.conf
index d054380aa05590603cd0c444372e6d33688561a4..98eda2c9c5943e400812a6ee2d5be46a2ce96f6f 100644 (file)
--- a/src/conf/cards/CMI8338-SWIEC.conf
+++ b/src/conf/cards/CMI8338-SWIEC.conf
@@ -19,7 +19,7 @@ CMI8338-SWIEC.pcm.front.0 {
 CMI8338-SWIEC.pcm.default {
        @args [ CARD ]
        @args.CARD {
-               type integer
+               type string
        }
        type asym
        playback.pcm {

diff --git a/src/conf/cards/CMI8338.conf b/src/conf/cards/CMI8338.conf
index f9d2b3106dd3714e33afe1f51a61b794051f1e7d..de087d6c8ef8894ced7f20572024fdb6a6eed589 100644 (file)
--- a/src/conf/cards/CMI8338.conf
+++ b/src/conf/cards/CMI8338.conf
@@ -18,7 +18,7 @@ CMI8338.pcm.front.0 {
 CMI8338.pcm.default {
        @args [ CARD ]
        @args.CARD {
-               type integer
+               type string
        }
        type asym
        playback.pcm {

diff --git a/src/conf/cards/CMI8738-MC6.conf b/src/conf/cards/CMI8738-MC6.conf
index 6cffaa8dbed21155ab7d991408a65f8ea4d512c8..6cd270e2cdb6f4cfbcc3de980cc7d0f6adabb2ab 100644 (file)
--- a/src/conf/cards/CMI8738-MC6.conf
+++ b/src/conf/cards/CMI8738-MC6.conf
@@ -18,7 +18,7 @@ CMI8738-MC6.pcm.front.0 {
 CMI8738-MC6.pcm.default {
        @args [ CARD ]
        @args.CARD {
-               type integer
+               type string
        }
        type asym
        playback.pcm {

diff --git a/src/conf/cards/CS46xx.conf b/src/conf/cards/CS46xx.conf
index a02e356c76364188897c5d899f78ccbced83222b..074d11372da06a6b92541be23bd309be333e6837 100644 (file)
--- a/src/conf/cards/CS46xx.conf
+++ b/src/conf/cards/CS46xx.conf
@@ -19,7 +19,7 @@ CS46xx.pcm.front.0 {
 CS46xx.pcm.default {
        @args [ CARD ]
        @args.CARD {
-               type integer
+               type string
        }
        type asym
        playback.pcm {

diff --git a/src/conf/cards/ENS1370.conf b/src/conf/cards/ENS1370.conf
index 79437ea83cba804008d430a6b8b87b2b7385da2f..cca58ffbc32f44c2a05f5af985ca4ec758603144 100644 (file)
--- a/src/conf/cards/ENS1370.conf
+++ b/src/conf/cards/ENS1370.conf
@@ -18,7 +18,7 @@ ENS1370.pcm.front.0 {
 ENS1370.pcm.default {
        @args [ CARD ]
        @args.CARD {
-               type integer
+               type string
        }
        type asym
        playback.pcm {

diff --git a/src/conf/cards/ENS1371.conf b/src/conf/cards/ENS1371.conf
index 951b8e272aed2ba62d08ae1769a78cc65e281a56..0348f4e8367b3d99a0af5d195cc5099175db6d94 100644 (file)
--- a/src/conf/cards/ENS1371.conf
+++ b/src/conf/cards/ENS1371.conf
@@ -18,7 +18,7 @@ ENS1371.pcm.front.0 {
 ENS1371.pcm.default {
        @args [ CARD ]
        @args.CARD {
-               type integer
+               type string
        }
        type asym
        playback.pcm {
@@ -103,9 +103,6 @@ ENS1371.pcm.iec958.0 {
        @args.CARD {
                type string
        }
-       @args.DEV {
-               type integer
-       }
        @args.AES0 {
                type integer
        }

diff --git a/src/conf/cards/FM801.conf b/src/conf/cards/FM801.conf
index 7207bf99a2bfb07bd1e65d2e30cc0b06bb6cd934..5a0adae77876c4c41c45f804777ce49ba95948d8 100644 (file)
--- a/src/conf/cards/FM801.conf
+++ b/src/conf/cards/FM801.conf
@@ -18,7 +18,7 @@ FM801.pcm.front.0 {
 FM801.pcm.default {
        @args [ CARD ]
        @args.CARD {
-               type integer
+               type string
        }
        type asym
        playback.pcm {

diff --git a/src/conf/cards/HDA-Intel.conf b/src/conf/cards/HDA-Intel.conf
index aeaaf0732dcbbf3dfe74ba098388172b8ae30696..c0819279d98043536d6882bac7add70690b55dfe 100644 (file)
--- a/src/conf/cards/HDA-Intel.conf
+++ b/src/conf/cards/HDA-Intel.conf
@@ -7,7 +7,7 @@
 HDA-Intel.pcm.front.0 {
        @args [ CARD ]
        @args.CARD {
-               type integer
+               type string
        }
        type softvol
        slave.pcm {
@@ -25,7 +25,7 @@ HDA-Intel.pcm.front.0 {
 HDA-Intel.pcm.default {
        @args [ CARD ]
        @args.CARD {
-               type integer
+               type string
        }
        type asym
        playback.pcm {

diff --git a/src/conf/cards/ICH.conf b/src/conf/cards/ICH.conf
index 04f11826ae7b868239216352415014699c42ff05..553ce5e3a3b172c4e10d85ea34af7f09fe28f38e 100644 (file)
--- a/src/conf/cards/ICH.conf
+++ b/src/conf/cards/ICH.conf
@@ -7,7 +7,7 @@
 ICH.pcm.front.0 {
        @args [ CARD ]
        @args.CARD {
-               type integer
+               type string
        }
        type softvol
        slave.pcm {
@@ -25,7 +25,7 @@ ICH.pcm.front.0 {
 ICH.pcm.default {
        @args [ CARD ]
        @args.CARD {
-               type integer
+               type string
        }
        type asym
        playback.pcm {
@@ -56,7 +56,7 @@ ICH.pcm.default {
 ICH.pcm.surround40.0 {
        @args [ CARD ]
        @args.CARD {
-               type integer
+               type string
        }
        type softvol
        slave.pcm {
@@ -99,7 +99,7 @@ ICH.pcm.surround40.0 {
 ICH.pcm.surround51.0 {
        @args [ CARD ]
        @args.CARD {
-               type integer
+               type string
        }
        type softvol
        slave.pcm {

diff --git a/src/conf/cards/ICH4.conf b/src/conf/cards/ICH4.conf
index bf109247519a16d8798587535a16238b99222410..eebe3aa15540d11c9eba443072c13ed3fe93376c 100644 (file)
--- a/src/conf/cards/ICH4.conf
+++ b/src/conf/cards/ICH4.conf
@@ -7,7 +7,7 @@
 ICH4.pcm.front.0 {
        @args [ CARD ]
        @args.CARD {
-               type integer
+               type string
        }
        type softvol
        slave.pcm {
@@ -25,7 +25,7 @@ ICH4.pcm.front.0 {
 ICH4.pcm.default {
        @args [ CARD ]
        @args.CARD {
-               type integer
+               type string
        }
        type asym
        playback.pcm {
@@ -56,7 +56,7 @@ ICH4.pcm.default {
 ICH4.pcm.surround40.0 {
        @args [ CARD ]
        @args.CARD {
-               type integer
+               type string
        }
        type softvol
        slave.pcm {
@@ -99,7 +99,7 @@ ICH4.pcm.surround40.0 {
 ICH4.pcm.surround51.0 {
        @args [ CARD ]
        @args.CARD {
-               type integer
+               type string
        }
        type softvol
        slave.pcm {

diff --git a/src/conf/cards/NFORCE.conf b/src/conf/cards/NFORCE.conf
index 923cc5876feac38af7f9072197a8a2cfe4bfc473..89e54b44b2dca59d482cdb6a11336463a1b6fbda 100644 (file)
--- a/src/conf/cards/NFORCE.conf
+++ b/src/conf/cards/NFORCE.conf
@@ -7,7 +7,7 @@
 NFORCE.pcm.front.0 {
        @args [ CARD ]
        @args.CARD {
-               type integer
+               type string
        }
        type softvol
        slave.pcm {
@@ -25,7 +25,7 @@ NFORCE.pcm.front.0 {
 NFORCE.pcm.default {
        @args [ CARD ]
        @args.CARD {
-               type integer
+               type string
        }
        type asym
        playback.pcm {
@@ -56,7 +56,7 @@ NFORCE.pcm.default {
 NFORCE.pcm.surround40.0 {
        @args [ CARD ]
        @args.CARD {
-               type integer
+               type string
        }
        type softvol
        slave.pcm {
@@ -99,7 +99,7 @@ NFORCE.pcm.surround40.0 {
 NFORCE.pcm.surround51.0 {
        @args [ CARD ]
        @args.CARD {
-               type integer
+               type string
        }
        type softvol
        slave.pcm {

diff --git a/src/conf/cards/PC-Speaker.conf b/src/conf/cards/PC-Speaker.conf
index 9cae96bd43e589853aa6098faf78fbe3956a60d0..37c23d0724a942a22c7042c7d3c9908c2ea8f506 100644 (file)
--- a/src/conf/cards/PC-Speaker.conf
+++ b/src/conf/cards/PC-Speaker.conf
@@ -7,7 +7,7 @@
 PC-Speaker.pcm.front.0 {
        @args [ CARD ]
        @args.CARD {
-               type integer
+               type string
        }
        type hw
        card $CARD
@@ -18,7 +18,7 @@ PC-Speaker.pcm.front.0 {
 PC-Speaker.pcm.default {
        @args [ CARD ]
        @args.CARD {
-               type integer
+               type string
        }
        type asym
        playback.pcm {

diff --git a/src/conf/cards/VIA686A.conf b/src/conf/cards/VIA686A.conf
index f67b876529757962cd3f60fab25627d21c70806f..f15b62d9c956f45d6051fdc4b8eab60c947cff38 100644 (file)
--- a/src/conf/cards/VIA686A.conf
+++ b/src/conf/cards/VIA686A.conf
@@ -21,7 +21,7 @@ VIA686A.pcm.front.0 {
 VIA686A.pcm.default {
        @args [ CARD ]
        @args.CARD {
-               type integer
+               type string
        }
        type asym
        playback.pcm {

diff --git a/src/conf/cards/VIA8233.conf b/src/conf/cards/VIA8233.conf
index b8f88cdbb51cb4c473174f55bd7a2b6d42ee5dbf..bdea52e2bce9835b8f35d753b5766cc718a98a0e 100644 (file)
--- a/src/conf/cards/VIA8233.conf
+++ b/src/conf/cards/VIA8233.conf
@@ -19,7 +19,7 @@ VIA8233.pcm.front.0 {
 VIA8233.pcm.default {
        @args [ CARD ]
        @args.CARD {
-               type integer
+               type string
        }
        type asym
        playback.pcm {

diff --git a/src/conf/cards/VIA8233A.conf b/src/conf/cards/VIA8233A.conf
index 1103e5c45196020a5b04ef07e09210e5b7b7ed9a..4f37a8ff7f578ea1271d3a4fa3dbd4a21664f064 100644 (file)
--- a/src/conf/cards/VIA8233A.conf
+++ b/src/conf/cards/VIA8233A.conf
@@ -18,7 +18,7 @@ VIA8233A.pcm.front.0 {
 VIA8233A.pcm.default {
        @args [ CARD ]
        @args.CARD {
-               type integer
+               type string
        }
        type asym
        playback.pcm {

diff --git a/src/conf/cards/VIA8237.conf b/src/conf/cards/VIA8237.conf
index a9474377b9add818746692b9012ec05da2065fdf..6dbc97b61993a899e95c9611cff990688a399d45 100644 (file)
--- a/src/conf/cards/VIA8237.conf
+++ b/src/conf/cards/VIA8237.conf
@@ -19,7 +19,7 @@ VIA8237.pcm.front.0 {
 VIA8237.pcm.default {
        @args [ CARD ]
        @args.CARD {
-               type integer
+               type string
        }
        type asym
        playback.pcm {