From 2ced309ee84fbee042ea7a85d4a5fd06118a16fc Mon Sep 17 00:00:00 2001 From: Abramo Bagnara Date: Mon, 18 Jun 2001 13:34:11 +0000 Subject: [PATCH] Changed $(var) in $var --- src/alsa.conf | 74 ++++++++++++++++++------------------- src/cards/EMU10K1.conf | 30 +++++++-------- src/cards/ENS1370.conf | 16 ++++---- src/cards/FM801.conf | 16 ++++---- src/cards/INTEL8X0.conf | 16 ++++---- src/cards/SI_7018.conf | 16 ++++---- src/cards/TRID4DWAVENX.conf | 20 +++++----- src/cards/YMFPCI.conf | 20 +++++----- src/conf.c | 9 ++--- 9 files changed, 107 insertions(+), 110 deletions(-) diff --git a/src/alsa.conf b/src/alsa.conf index f8fcb472..4170d12b 100644 --- a/src/alsa.conf +++ b/src/alsa.conf @@ -43,9 +43,9 @@ pcm.hw { default -1 } type hw - card $(CARD) - device $(DEV) - subdevice $(SUBDEV) + card $CARD + device $DEV + subdevice $SUBDEV } pcm.plughw { @@ -78,9 +78,9 @@ pcm.plughw { type plug slave.pcm { type hw - card $(CARD) - device $(DEV) - subdevice $(SUBDEV) + card $CARD + device $DEV + subdevice $SUBDEV } } @@ -90,7 +90,7 @@ pcm.plug { type string } type plug - slave.pcm $(SLAVE) + slave.pcm $SLAVE } pcm.shm { @@ -102,8 +102,8 @@ pcm.shm { type string } type shm - server $(SOCKET) - pcm $(PCM) + server $SOCKET + pcm $PCM } pcm.tee { @@ -119,9 +119,9 @@ pcm.tee { default raw } type file - slave.pcm $(SLAVE) - file $(FILE) - format $(FORMAT) + slave.pcm $SLAVE + file $FILE + format $FORMAT } pcm.file { @@ -135,8 +135,8 @@ pcm.file { } type file slave.pcm null - file $(FILE) - format $(FORMAT) + file $FILE + format $FORMAT } pcm.null { @@ -200,7 +200,7 @@ pcm.front { "/cards/" { @func card_strtype - card $(CARD) + card $CARD } ".conf" ] @@ -208,7 +208,7 @@ pcm.front { name { @func concat strings [ - "pcm.front_" $(DEV) ":CARD=" $(CARD) + "pcm.front_" $DEV ":CARD=" $CARD ] } } @@ -247,7 +247,7 @@ pcm.rear { "/cards/" { @func card_strtype - card $(CARD) + card $CARD } ".conf" ] @@ -255,7 +255,7 @@ pcm.rear { name { @func concat strings [ - "pcm.rear_" $(DEV) ":CARD=" $(CARD) + "pcm.rear_" $DEV ":CARD=" $CARD ] } } @@ -294,7 +294,7 @@ pcm.center_lfe { "/cards/" { @func card_strtype - card $(CARD) + card $CARD } ".conf" ] @@ -302,7 +302,7 @@ pcm.center_lfe { name { @func concat strings [ - "pcm.center_lfe_" $(DEV) ":CARD=" $(CARD) + "pcm.center_lfe_" $DEV ":CARD=" $CARD ] } } @@ -341,7 +341,7 @@ pcm.surround40 { "/cards/" { @func card_strtype - card $(CARD) + card $CARD } ".conf" ] @@ -349,7 +349,7 @@ pcm.surround40 { name { @func concat strings [ - "pcm.surround40_" $(DEV) ":CARD=" $(CARD) + "pcm.surround40_" $DEV ":CARD=" $CARD ] } } @@ -388,7 +388,7 @@ pcm.surround51 { "/cards/" { @func card_strtype - card $(CARD) + card $CARD } ".conf" ] @@ -396,7 +396,7 @@ pcm.surround51 { name { @func concat strings [ - "pcm.surround51_" $(DEV) ":CARD=" $(CARD) + "pcm.surround51_" $DEV ":CARD=" $CARD ] } } @@ -455,7 +455,7 @@ pcm.iec958 { "/cards/" { @func card_strtype - card $(CARD) + card $CARD } ".conf" ] @@ -463,12 +463,12 @@ pcm.iec958 { name { @func concat strings [ - "pcm.iec958_" $(DEV) ":" - "CARD=" $(CARD) "," - "AES0=" $(AES0) "," - "AES1=" $(AES1) "," - "AES2=" $(AES2) "," - "AES3=" $(AES3) + "pcm.iec958_" $DEV ":" + "CARD=" $CARD "," + "AES0=" $AES0 "," + "AES1=" $AES1 "," + "AES2=" $AES2 "," + "AES3=" $AES3 ] } } @@ -493,7 +493,7 @@ ctl.hw { } } type hw - card $(CARD) + card $CARD } ctl.shm { @@ -505,8 +505,8 @@ ctl.shm { type string } type shm - server $(SOCKET) - ctl $(CTL) + server $SOCKET + ctl $CTL } ctl.default { @@ -553,9 +553,9 @@ rawmidi.hw { default -1 } type hw - card $(CARD) - device $(DEV) - subdevice $(SUBDEV) + card $CARD + device $DEV + subdevice $SUBDEV } rawmidi.default { diff --git a/src/cards/EMU10K1.conf b/src/cards/EMU10K1.conf index a1ac35ee..a2824c07 100644 --- a/src/cards/EMU10K1.conf +++ b/src/cards/EMU10K1.conf @@ -15,9 +15,9 @@ pcm.emu10k1_front { default -1 } type hw - card $(CARD) - device $(DEV) - subdevice $(SUBDEV) + card $CARD + device $DEV + subdevice $SUBDEV } pcm.front_0 { @@ -28,7 +28,7 @@ pcm.front_0 { @func refer name { @func concat - strings [ "pcm.emu10k1_front:" $(CARD) ",0,-1" ] + strings [ "pcm.emu10k1_front:" $CARD ",0,-1" ] } } @@ -48,7 +48,7 @@ pcm.emu10k1_rear { slave.pcm { @func concat strings [ - "pcm.emu10k1_front:" $(CARD) "," $(DEV) "," $(SUBDEV) + "pcm.emu10k1_front:" $CARD "," $DEV "," $SUBDEV ] } hooks.0 { @@ -78,7 +78,7 @@ pcm.rear_0 { @func refer name { @func concat - strings [ "pcm.emu10k1_rear:" $(CARD) ",0,-1" ] + strings [ "pcm.emu10k1_rear:" $CARD ",0,-1" ] } } @@ -98,7 +98,7 @@ pcm.emu10k1_center_lfe { slave.pcm { @func concat strings [ - "pcm.emu10k1_front:" $(CARD) "," $(DEV) "," $(SUBDEV) + "pcm.emu10k1_front:" $CARD "," $DEV "," $SUBDEV ] } hooks.0 { @@ -140,7 +140,7 @@ pcm.center_lfe_0 { @func refer name { @func concat - strings [ "pcm.emu10k1_center_lfe:" $(CARD) ",0,-1" ] + strings [ "pcm.emu10k1_center_lfe:" $CARD ",0,-1" ] } } @@ -155,7 +155,7 @@ pcm.surround40_0 { pcm { @func concat strings [ - "pcm.emu10k1_front:" $(CARD) ",0,-1" + "pcm.emu10k1_front:" $CARD ",0,-1" ] } channels 2 @@ -164,7 +164,7 @@ pcm.surround40_0 { pcm { @func concat strings [ - "pcm.emu10k1_rear:" $(CARD) ",0,-1" + "pcm.emu10k1_rear:" $CARD ",0,-1" ] } channels 2 @@ -189,7 +189,7 @@ pcm.surround51_0 { pcm { @func concat strings [ - "pcm.emu10k1_front:" $(CARD) ",0,-1" + "pcm.emu10k1_front:" $CARD ",0,-1" ] } channels 2 @@ -198,7 +198,7 @@ pcm.surround51_0 { pcm { @func concat strings [ - "pcm.emu10k1_rear:" $(CARD) ",0,-1" + "pcm.emu10k1_rear:" $CARD ",0,-1" ] } channels 2 @@ -207,7 +207,7 @@ pcm.surround51_0 { pcm { @func concat strings [ - "pcm.emu10k1_center_lfe:" $(CARD) ",0,-1" + "pcm.emu10k1_center_lfe:" $CARD ",0,-1" ] } channels 2 @@ -248,7 +248,7 @@ pcm.iec958_0 { @func concat strings [ "hw:" - "CARD=" $(CARD) "," + "CARD=" $CARD "," "DEV=3," "SUBDEV=0" ] @@ -260,7 +260,7 @@ pcm.iec958_0 { name "IEC958 Playback Default" lock true preserve true - value [ $(AES0) $(AES1) $(AES2) $(AES3) ] + value [ $AES0 $AES1 $AES2 $AES3 ] } { name "IEC958 Optical Raw Playback Switch" diff --git a/src/cards/ENS1370.conf b/src/cards/ENS1370.conf index 3a2c6abe..69fc304b 100644 --- a/src/cards/ENS1370.conf +++ b/src/cards/ENS1370.conf @@ -15,9 +15,9 @@ pcm.ens1370_front { default -1 } type hw - card $(CARD) - device $(DEV) - subdevice $(SUBDEV) + card $CARD + device $DEV + subdevice $SUBDEV } pcm.front_0 { @@ -28,7 +28,7 @@ pcm.front_0 { @func refer name { @func concat - strings [ "pcm.ens1370_front:" $(CARD) ",0,-1" ] + strings [ "pcm.ens1370_front:" $CARD ",0,-1" ] } } @@ -48,7 +48,7 @@ pcm.ens1370_rear { slave.pcm { @func concat strings [ - "pcm.ens1370_front:" $(CARD) "," $(DEV) "," $(SUBDEV) + "pcm.ens1370_front:" $CARD "," $DEV "," $SUBDEV ] } hooks.0 { @@ -78,7 +78,7 @@ pcm.rear_0 { @func refer name { @func concat - strings [ "pcm.ens1370_rear:" $(CARD) ",0,-1" ] + strings [ "pcm.ens1370_rear:" $CARD ",0,-1" ] } } @@ -94,7 +94,7 @@ pcm.surround40_0 { pcm { @func concat strings [ - "pcm.ens1370_front:" $(CARD) ",0,-1" + "pcm.ens1370_front:" $CARD ",0,-1" ] } channels 2 @@ -103,7 +103,7 @@ pcm.surround40_0 { pcm { @func concat strings [ - "pcm.ens1370_rear:" $(CARD) ",0,-1" + "pcm.ens1370_rear:" $CARD ",0,-1" ] } channels 2 diff --git a/src/cards/FM801.conf b/src/cards/FM801.conf index 55dbdfc7..e75ce891 100644 --- a/src/cards/FM801.conf +++ b/src/cards/FM801.conf @@ -15,9 +15,9 @@ pcm.fm801_front { default -1 } type hw - card $(CARD) - device $(DEV) - subdevice $(SUBDEV) + card $CARD + device $DEV + subdevice $SUBDEV } pcm.front_0 { @@ -28,7 +28,7 @@ pcm.front_0 { @func refer name { @func concat - strings [ "pcm.fm801_front:" $(CARD) ",0,-1" ] + strings [ "pcm.fm801_front:" $CARD ",0,-1" ] } } @@ -38,7 +38,7 @@ pcm.surround40_0 { type integer } type hw - card $(CARD) + card $CARD device 0 subdevice 0 } @@ -49,7 +49,7 @@ pcm.surround51_0 { type integer } type hw - card $(CARD) + card $CARD device 0 subdevice 0 } @@ -79,7 +79,7 @@ pcm.iec958_0 { @func concat strings [ "hw:" - "CARD=" $(CARD) "," + "CARD=" $CARD "," "DEV=0," "SUBDEV=0" ] @@ -89,7 +89,7 @@ pcm.iec958_0 { hook_args [ # { # name "IEC958 Playback Default" - # value [ $(AES0) $(AES1) $(AES2) $(AES3) ] + # value [ $AES0 $AES1 $AES2 $AES3 ] # } { name "IEC958 Raw Data Playback Switch" diff --git a/src/cards/INTEL8X0.conf b/src/cards/INTEL8X0.conf index a80ccec1..bf064d3d 100644 --- a/src/cards/INTEL8X0.conf +++ b/src/cards/INTEL8X0.conf @@ -15,9 +15,9 @@ pcm.intel8x0_front { default -1 } type hw - card $(CARD) - device $(DEV) - subdevice $(SUBDEV) + card $CARD + device $DEV + subdevice $SUBDEV } pcm.front_0 { @@ -28,7 +28,7 @@ pcm.front_0 { @func refer name { @func concat - strings [ "pcm.intel8x0_front:" $(CARD) ",0,-1" ] + strings [ "pcm.intel8x0_front:" $CARD ",0,-1" ] } } @@ -43,7 +43,7 @@ pcm.surround40_0 { pcm { @func concat strings [ - "pcm.intel8x0_front:" $(CARD) ",0,-1" + "pcm.intel8x0_front:" $CARD ",0,-1" ] } channels 4 @@ -68,7 +68,7 @@ pcm.surround51_0 { pcm { @func concat strings [ - "pcm.intel8x0_front:" $(CARD) ",0,-1" + "pcm.intel8x0_front:" $CARD ",0,-1" ] } channels 2 @@ -109,7 +109,7 @@ pcm.iec958_0 { @func concat strings [ "hw:" - "CARD=" $(CARD) "," + "CARD=" $CARD "," "DEV=0," "SUBDEV=0" ] @@ -127,7 +127,7 @@ pcm.iec958_0 { name "IEC958 Playback Default" lock true preserve true - value [ $(AES0) $(AES1) $(AES2) $(AES3) ] + value [ $AES0 $AES1 $AES2 $AES3 ] } { name "IEC958 Playback Switch" diff --git a/src/cards/SI_7018.conf b/src/cards/SI_7018.conf index d83981cc..4782753f 100644 --- a/src/cards/SI_7018.conf +++ b/src/cards/SI_7018.conf @@ -15,9 +15,9 @@ pcm.si7018_front { default -1 } type hw - card $(CARD) - device $(DEV) - subdevice $(SUBDEV) + card $CARD + device $DEV + subdevice $SUBDEV } pcm.front_0 { @@ -28,7 +28,7 @@ pcm.front_0 { @func refer name { @func concat - strings [ "pcm.si7018_front:" $(CARD) ",0,-1" ] + strings [ "pcm.si7018_front:" $CARD ",0,-1" ] } } @@ -48,7 +48,7 @@ pcm.si7018_rear { slave.pcm { @func concat strings [ - "pcm.si7018_front:" $(CARD) "," $(DEV) "," $(SUBDEV) + "pcm.si7018_front:" $CARD "," $DEV "," $SUBDEV ] } hooks.0 { @@ -72,7 +72,7 @@ pcm.rear_0 { @func refer name { @func concat - strings [ "pcm.si7018_rear:" $(CARD) ",0,-1" ] + strings [ "pcm.si7018_rear:" $CARD ",0,-1" ] } } @@ -87,7 +87,7 @@ pcm.surround40_0 { pcm { @func concat strings [ - "pcm.si7018_front:" $(CARD) ",0,-1" + "pcm.si7018_front:" $CARD ",0,-1" ] } channels 2 @@ -96,7 +96,7 @@ pcm.surround40_0 { pcm { @func concat strings [ - "pcm.si7018_rear:" $(CARD) ",0,-1" + "pcm.si7018_rear:" $CARD ",0,-1" ] } channels 2 diff --git a/src/cards/TRID4DWAVENX.conf b/src/cards/TRID4DWAVENX.conf index c3a9f6f9..5bf7bb3c 100644 --- a/src/cards/TRID4DWAVENX.conf +++ b/src/cards/TRID4DWAVENX.conf @@ -15,9 +15,9 @@ pcm.trid4dwavenx_front { default -1 } type hw - card $(CARD) - device $(DEV) - subdevice $(SUBDEV) + card $CARD + device $DEV + subdevice $SUBDEV } pcm.front_0 { @@ -28,7 +28,7 @@ pcm.front_0 { @func refer name { @func concat - strings [ "pcm.trid4dwavenx_front:" $(CARD) ",0,-1" ] + strings [ "pcm.trid4dwavenx_front:" $CARD ",0,-1" ] } } @@ -48,7 +48,7 @@ pcm.trid4dwavenx_rear { slave.pcm { @func concat strings [ - "pcm.trid4dwavenx_front:CARD=" $(CARD) ",DEV=" $(DEV) ",SUBDEV=" $(SUBDEV) + "pcm.trid4dwavenx_front:CARD=" $CARD ",DEV=" $DEV ",SUBDEV=" $SUBDEV ] } hooks.0 { @@ -87,7 +87,7 @@ pcm.rear_0 { @func refer name { @func concat - strings [ "pcm.trid4dwavenx_rear:" $(CARD) ] + strings [ "pcm.trid4dwavenx_rear:" $CARD ] } } @@ -102,7 +102,7 @@ pcm.surround40_0 { pcm { @func concat strings [ - "pcm.trid4dwavenx_front:" $(CARD) ",0,-1" + "pcm.trid4dwavenx_front:" $CARD ",0,-1" ] } channels 2 @@ -111,7 +111,7 @@ pcm.surround40_0 { pcm { @func concat strings [ - "pcm.trid4dwavenx_rear:" $(CARD) ",0,-1" + "pcm.trid4dwavenx_rear:" $CARD ",0,-1" ] } channels 2 @@ -148,7 +148,7 @@ pcm.iec958_0 { type hooks slave.pcm { type hw - card $(CARD) + card $CARD device 2 } hooks.0 { @@ -157,7 +157,7 @@ pcm.iec958_0 { { interface PCM name "IEC958 Playback PCM Stream" - value [ $(AES0) $(AES1) $(AES2) $(AES3) ] + value [ $AES0 $AES1 $AES2 $AES3 ] device 2 lock true preserve true diff --git a/src/cards/YMFPCI.conf b/src/cards/YMFPCI.conf index 8245c5cf..4bb2b0ac 100644 --- a/src/cards/YMFPCI.conf +++ b/src/cards/YMFPCI.conf @@ -15,9 +15,9 @@ pcm.ymfpci_front { default -1 } type hw - card $(CARD) - device $(DEV) - subdevice $(SUBDEV) + card $CARD + device $DEV + subdevice $SUBDEV } pcm.front_0 { @@ -28,7 +28,7 @@ pcm.front_0 { @func refer name { @func concat - strings [ "pcm.ymfpci_front:" $(CARD) ",0,-1" ] + strings [ "pcm.ymfpci_front:" $CARD ",0,-1" ] } } @@ -38,7 +38,7 @@ pcm.ymfpci_rear { type integer } type hw - card $(CARD) + card $CARD device 2 subdevice 0 } @@ -51,7 +51,7 @@ pcm.rear_0 { @func refer name { @func concat - strings [ "pcm.ymfpci_rear:" $(CARD) ] + strings [ "pcm.ymfpci_rear:" $CARD ] } } @@ -66,7 +66,7 @@ pcm.surround40_0 { pcm { @func concat strings [ - "pcm.ymfpci_front:" $(CARD) ",0,-1" + "pcm.ymfpci_front:" $CARD ",0,-1" ] } channels 2 @@ -75,7 +75,7 @@ pcm.surround40_0 { pcm { @func concat strings [ - "pcm.ymfpci_rear:" $(CARD) + "pcm.ymfpci_rear:" $CARD ] } channels 2 @@ -114,7 +114,7 @@ pcm.iec958_0 { @func concat strings [ "hw:" - "CARD=" $(CARD) "," + "CARD=" $CARD "," "DEV=1," "SUBDEV=0" ] @@ -127,7 +127,7 @@ pcm.iec958_0 { name "IEC958 Playback PCM Stream" lock true preserve true - value [ $(AES0) $(AES1) $(AES2) $(AES3) ] + value [ $AES0 $AES1 $AES2 $AES3 ] } ] } diff --git a/src/conf.c b/src/conf.c index f58c18c9..c6d6792b 100644 --- a/src/conf.c +++ b/src/conf.c @@ -1974,12 +1974,9 @@ static int _snd_config_expand(snd_config_t *src, snd_config_t *val; snd_config_t *vars = private_data; snd_config_get_string(src, &s); - if (strncmp(s, "$(", 2) == 0 && s[strlen(s) - 1] == ')') { - int len = strlen(s) - 3; - char *str = alloca(len + 1); - memcpy(str, s + 2, len); - str[len] = '\0'; - if (snd_config_search(vars, str, &val) < 0) + if (*s == '$') { + s++; + if (snd_config_search(vars, s, &val) < 0) return 0; err = snd_config_copy(dst, val); if (err < 0) -- 2.47.1