From: Takashi Iwai Date: Tue, 22 Feb 2005 20:23:18 +0000 (+0000) Subject: Fix card type to string X-Git-Tag: v1.0.9rc1~14 X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=970b1450bebaf849fb83fcf785206e877587277f;p=alsa-lib.git 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 572023fc..eedac04a 100644 --- 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 5a8e49fc..e4d5c8ad 100644 --- 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 5941937b..b5b8386d 100644 --- 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 7ad988a8..976f870c 100644 --- 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 a00ef4bd..860c5b48 100644 --- 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 d054380a..98eda2c9 100644 --- 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 f9d2b310..de087d6c 100644 --- 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 6cffaa8d..6cd270e2 100644 --- 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 a02e356c..074d1137 100644 --- 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 79437ea8..cca58ffb 100644 --- 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 951b8e27..0348f4e8 100644 --- 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 7207bf99..5a0adae7 100644 --- 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 aeaaf073..c0819279 100644 --- 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 04f11826..553ce5e3 100644 --- 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 bf109247..eebe3aa1 100644 --- 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 923cc587..89e54b44 100644 --- 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 9cae96bd..37c23d07 100644 --- 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 f67b8765..f15b62d9 100644 --- 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 b8f88cdb..bdea52e2 100644 --- 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 1103e5c4..4f37a8ff 100644 --- 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 a9474377..6dbc97b6 100644 --- 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 {