mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-29 05:40:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed $(var) in $var

Browse source
This commit is contained in:
Abramo Bagnara 2001-06-18 13:34:11 +00:00
parent 9803257f70
commit 2ced309ee8
9 changed files with 107 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

74
src/alsa.conf
View file

@ -43,9 +43,9 @@ pcm.hw {
default -1 default -1
} }
type hw type hw
card $(CARD) card $CARD
device $(DEV) device $DEV
subdevice $(SUBDEV) subdevice $SUBDEV
} }
pcm.plughw { pcm.plughw {
@ -78,9 +78,9 @@ pcm.plughw {
type plug type plug
slave.pcm { slave.pcm {
type hw type hw
card $(CARD) card $CARD
device $(DEV) device $DEV
subdevice $(SUBDEV) subdevice $SUBDEV
} }
} }
@ -90,7 +90,7 @@ pcm.plug {
type string type string
} }
type plug type plug
slave.pcm $(SLAVE) slave.pcm $SLAVE
} }
pcm.shm { pcm.shm {
@ -102,8 +102,8 @@ pcm.shm {
type string type string
} }
type shm type shm
server $(SOCKET) server $SOCKET
pcm $(PCM) pcm $PCM
} }
pcm.tee { pcm.tee {
@ -119,9 +119,9 @@ pcm.tee {
default raw default raw
} }
type file type file
slave.pcm $(SLAVE) slave.pcm $SLAVE
file $(FILE) file $FILE
format $(FORMAT) format $FORMAT
} }
pcm.file { pcm.file {
@ -135,8 +135,8 @@ pcm.file {
} }
type file type file
slave.pcm null slave.pcm null
file $(FILE) file $FILE
format $(FORMAT) format $FORMAT
} }
pcm.null { pcm.null {
@ -200,7 +200,7 @@ pcm.front {
"/cards/" "/cards/"
{ {
@func card_strtype @func card_strtype
card $(CARD) card $CARD
} }
".conf" ".conf"
] ]
@ -208,7 +208,7 @@ pcm.front {
name { name {
@func concat @func concat
strings [ strings [
"pcm.front_" $(DEV) ":CARD=" $(CARD) "pcm.front_" $DEV ":CARD=" $CARD
] ]
} }
} }
@ -247,7 +247,7 @@ pcm.rear {
"/cards/" "/cards/"
{ {
@func card_strtype @func card_strtype
card $(CARD) card $CARD
} }
".conf" ".conf"
] ]
@ -255,7 +255,7 @@ pcm.rear {
name { name {
@func concat @func concat
strings [ strings [
"pcm.rear_" $(DEV) ":CARD=" $(CARD) "pcm.rear_" $DEV ":CARD=" $CARD
] ]
} }
} }
@ -294,7 +294,7 @@ pcm.center_lfe {
"/cards/" "/cards/"
{ {
@func card_strtype @func card_strtype
card $(CARD) card $CARD
} }
".conf" ".conf"
] ]
@ -302,7 +302,7 @@ pcm.center_lfe {
name { name {
@func concat @func concat
strings [ strings [
"pcm.center_lfe_" $(DEV) ":CARD=" $(CARD) "pcm.center_lfe_" $DEV ":CARD=" $CARD
] ]
} }
} }
@ -341,7 +341,7 @@ pcm.surround40 {
"/cards/" "/cards/"
{ {
@func card_strtype @func card_strtype
card $(CARD) card $CARD
} }
".conf" ".conf"
] ]
@ -349,7 +349,7 @@ pcm.surround40 {
name { name {
@func concat @func concat
strings [ strings [
"pcm.surround40_" $(DEV) ":CARD=" $(CARD) "pcm.surround40_" $DEV ":CARD=" $CARD
] ]
} }
} }
@ -388,7 +388,7 @@ pcm.surround51 {
"/cards/" "/cards/"
{ {
@func card_strtype @func card_strtype
card $(CARD) card $CARD
} }
".conf" ".conf"
] ]
@ -396,7 +396,7 @@ pcm.surround51 {
name { name {
@func concat @func concat
strings [ strings [
"pcm.surround51_" $(DEV) ":CARD=" $(CARD) "pcm.surround51_" $DEV ":CARD=" $CARD
] ]
} }
} }
@ -455,7 +455,7 @@ pcm.iec958 {
"/cards/" "/cards/"
{ {
@func card_strtype @func card_strtype
card $(CARD) card $CARD
} }
".conf" ".conf"
] ]
@ -463,12 +463,12 @@ pcm.iec958 {
name { name {
@func concat @func concat
strings [ strings [
"pcm.iec958_" $(DEV) ":" "pcm.iec958_" $DEV ":"
"CARD=" $(CARD) "," "CARD=" $CARD ","
"AES0=" $(AES0) "," "AES0=" $AES0 ","
"AES1=" $(AES1) "," "AES1=" $AES1 ","
"AES2=" $(AES2) "," "AES2=" $AES2 ","
"AES3=" $(AES3) "AES3=" $AES3
] ]
} }
} }
@ -493,7 +493,7 @@ ctl.hw {
} }
} }
type hw type hw
card $(CARD) card $CARD
} }
ctl.shm { ctl.shm {
@ -505,8 +505,8 @@ ctl.shm {
type string type string
} }
type shm type shm
server $(SOCKET) server $SOCKET
ctl $(CTL) ctl $CTL
} }
ctl.default { ctl.default {
@ -553,9 +553,9 @@ rawmidi.hw {
default -1 default -1
} }
type hw type hw
card $(CARD) card $CARD
device $(DEV) device $DEV
subdevice $(SUBDEV) subdevice $SUBDEV
} }
rawmidi.default { rawmidi.default {

30
src/cards/EMU10K1.conf
View file

@ -15,9 +15,9 @@ pcm.emu10k1_front {
default -1 default -1
} }
type hw type hw
card $(CARD) card $CARD
device $(DEV) device $DEV
subdevice $(SUBDEV) subdevice $SUBDEV
} }
pcm.front_0 { pcm.front_0 {
@ -28,7 +28,7 @@ pcm.front_0 {
@func refer @func refer
name { name {
@func concat @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 { slave.pcm {
@func concat @func concat
strings [ strings [
"pcm.emu10k1_front:" $(CARD) "," $(DEV) "," $(SUBDEV) "pcm.emu10k1_front:" $CARD "," $DEV "," $SUBDEV
] ]
} }
hooks.0 { hooks.0 {
@ -78,7 +78,7 @@ pcm.rear_0 {
@func refer @func refer
name { name {
@func concat @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 { slave.pcm {
@func concat @func concat
strings [ strings [
"pcm.emu10k1_front:" $(CARD) "," $(DEV) "," $(SUBDEV) "pcm.emu10k1_front:" $CARD "," $DEV "," $SUBDEV
] ]
} }
hooks.0 { hooks.0 {
@ -140,7 +140,7 @@ pcm.center_lfe_0 {
@func refer @func refer
name { name {
@func concat @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 { pcm {
@func concat @func concat
strings [ strings [
"pcm.emu10k1_front:" $(CARD) ",0,-1" "pcm.emu10k1_front:" $CARD ",0,-1"
] ]
} }
channels 2 channels 2
@ -164,7 +164,7 @@ pcm.surround40_0 {
pcm { pcm {
@func concat @func concat
strings [ strings [
"pcm.emu10k1_rear:" $(CARD) ",0,-1" "pcm.emu10k1_rear:" $CARD ",0,-1"
] ]
} }
channels 2 channels 2
@ -189,7 +189,7 @@ pcm.surround51_0 {
pcm { pcm {
@func concat @func concat
strings [ strings [
"pcm.emu10k1_front:" $(CARD) ",0,-1" "pcm.emu10k1_front:" $CARD ",0,-1"
] ]
} }
channels 2 channels 2
@ -198,7 +198,7 @@ pcm.surround51_0 {
pcm { pcm {
@func concat @func concat
strings [ strings [
"pcm.emu10k1_rear:" $(CARD) ",0,-1" "pcm.emu10k1_rear:" $CARD ",0,-1"
] ]
} }
channels 2 channels 2
@ -207,7 +207,7 @@ pcm.surround51_0 {
pcm { pcm {
@func concat @func concat
strings [ strings [
"pcm.emu10k1_center_lfe:" $(CARD) ",0,-1" "pcm.emu10k1_center_lfe:" $CARD ",0,-1"
] ]
} }
channels 2 channels 2
@ -248,7 +248,7 @@ pcm.iec958_0 {
@func concat @func concat
strings [ strings [
"hw:" "hw:"
"CARD=" $(CARD) "," "CARD=" $CARD ","
"DEV=3," "DEV=3,"
"SUBDEV=0" "SUBDEV=0"
] ]
@ -260,7 +260,7 @@ pcm.iec958_0 {
name "IEC958 Playback Default" name "IEC958 Playback Default"
lock true lock true
preserve true preserve true
value [ $(AES0) $(AES1) $(AES2) $(AES3) ] value [ $AES0 $AES1 $AES2 $AES3 ]
} }
{ {
name "IEC958 Optical Raw Playback Switch" name "IEC958 Optical Raw Playback Switch"

16
src/cards/ENS1370.conf
View file

@ -15,9 +15,9 @@ pcm.ens1370_front {
default -1 default -1
} }
type hw type hw
card $(CARD) card $CARD
device $(DEV) device $DEV
subdevice $(SUBDEV) subdevice $SUBDEV
} }
pcm.front_0 { pcm.front_0 {
@ -28,7 +28,7 @@ pcm.front_0 {
@func refer @func refer
name { name {
@func concat @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 { slave.pcm {
@func concat @func concat
strings [ strings [
"pcm.ens1370_front:" $(CARD) "," $(DEV) "," $(SUBDEV) "pcm.ens1370_front:" $CARD "," $DEV "," $SUBDEV
] ]
} }
hooks.0 { hooks.0 {
@ -78,7 +78,7 @@ pcm.rear_0 {
@func refer @func refer
name { name {
@func concat @func concat
strings [ "pcm.ens1370_rear:" $(CARD) ",0,-1" ] strings [ "pcm.ens1370_rear:" $CARD ",0,-1" ]
} }
} }
@ -94,7 +94,7 @@ pcm.surround40_0 {
pcm { pcm {
@func concat @func concat
strings [ strings [
"pcm.ens1370_front:" $(CARD) ",0,-1" "pcm.ens1370_front:" $CARD ",0,-1"
] ]
} }
channels 2 channels 2
@ -103,7 +103,7 @@ pcm.surround40_0 {
pcm { pcm {
@func concat @func concat
strings [ strings [
"pcm.ens1370_rear:" $(CARD) ",0,-1" "pcm.ens1370_rear:" $CARD ",0,-1"
] ]
} }
channels 2 channels 2

16
src/cards/FM801.conf
View file

@ -15,9 +15,9 @@ pcm.fm801_front {
default -1 default -1
} }
type hw type hw
card $(CARD) card $CARD
device $(DEV) device $DEV
subdevice $(SUBDEV) subdevice $SUBDEV
} }
pcm.front_0 { pcm.front_0 {
@ -28,7 +28,7 @@ pcm.front_0 {
@func refer @func refer
name { name {
@func concat @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 integer
} }
type hw type hw
card $(CARD) card $CARD
device 0 device 0
subdevice 0 subdevice 0
} }
@ -49,7 +49,7 @@ pcm.surround51_0 {
type integer type integer
} }
type hw type hw
card $(CARD) card $CARD
device 0 device 0
subdevice 0 subdevice 0
} }
@ -79,7 +79,7 @@ pcm.iec958_0 {
@func concat @func concat
strings [ strings [
"hw:" "hw:"
"CARD=" $(CARD) "," "CARD=" $CARD ","
"DEV=0," "DEV=0,"
"SUBDEV=0" "SUBDEV=0"
] ]
@ -89,7 +89,7 @@ pcm.iec958_0 {
hook_args [ hook_args [
# { # {
# name "IEC958 Playback Default" # name "IEC958 Playback Default"
# value [ $(AES0) $(AES1) $(AES2) $(AES3) ] # value [ $AES0 $AES1 $AES2 $AES3 ]
# } # }
{ {
name "IEC958 Raw Data Playback Switch" name "IEC958 Raw Data Playback Switch"

16
src/cards/INTEL8X0.conf
View file

@ -15,9 +15,9 @@ pcm.intel8x0_front {
default -1 default -1
} }
type hw type hw
card $(CARD) card $CARD
device $(DEV) device $DEV
subdevice $(SUBDEV) subdevice $SUBDEV
} }
pcm.front_0 { pcm.front_0 {
@ -28,7 +28,7 @@ pcm.front_0 {
@func refer @func refer
name { name {
@func concat @func concat
strings [ "pcm.intel8x0_front:" $(CARD) ",0,-1" ] strings [ "pcm.intel8x0_front:" $CARD ",0,-1" ]
} }
} }
@ -43,7 +43,7 @@ pcm.surround40_0 {
pcm { pcm {
@func concat @func concat
strings [ strings [
"pcm.intel8x0_front:" $(CARD) ",0,-1" "pcm.intel8x0_front:" $CARD ",0,-1"
] ]
} }
channels 4 channels 4
@ -68,7 +68,7 @@ pcm.surround51_0 {
pcm { pcm {
@func concat @func concat
strings [ strings [
"pcm.intel8x0_front:" $(CARD) ",0,-1" "pcm.intel8x0_front:" $CARD ",0,-1"
] ]
} }
channels 2 channels 2
@ -109,7 +109,7 @@ pcm.iec958_0 {
@func concat @func concat
strings [ strings [
"hw:" "hw:"
"CARD=" $(CARD) "," "CARD=" $CARD ","
"DEV=0," "DEV=0,"
"SUBDEV=0" "SUBDEV=0"
] ]
@ -127,7 +127,7 @@ pcm.iec958_0 {
name "IEC958 Playback Default" name "IEC958 Playback Default"
lock true lock true
preserve true preserve true
value [ $(AES0) $(AES1) $(AES2) $(AES3) ] value [ $AES0 $AES1 $AES2 $AES3 ]
} }
{ {
name "IEC958 Playback Switch" name "IEC958 Playback Switch"

16
src/cards/SI_7018.conf
View file

@ -15,9 +15,9 @@ pcm.si7018_front {
default -1 default -1
} }
type hw type hw
card $(CARD) card $CARD
device $(DEV) device $DEV
subdevice $(SUBDEV) subdevice $SUBDEV
} }
pcm.front_0 { pcm.front_0 {
@ -28,7 +28,7 @@ pcm.front_0 {
@func refer @func refer
name { name {
@func concat @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 { slave.pcm {
@func concat @func concat
strings [ strings [
"pcm.si7018_front:" $(CARD) "," $(DEV) "," $(SUBDEV) "pcm.si7018_front:" $CARD "," $DEV "," $SUBDEV
] ]
} }
hooks.0 { hooks.0 {
@ -72,7 +72,7 @@ pcm.rear_0 {
@func refer @func refer
name { name {
@func concat @func concat
strings [ "pcm.si7018_rear:" $(CARD) ",0,-1" ] strings [ "pcm.si7018_rear:" $CARD ",0,-1" ]
} }
} }
@ -87,7 +87,7 @@ pcm.surround40_0 {
pcm { pcm {
@func concat @func concat
strings [ strings [
"pcm.si7018_front:" $(CARD) ",0,-1" "pcm.si7018_front:" $CARD ",0,-1"
] ]
} }
channels 2 channels 2
@ -96,7 +96,7 @@ pcm.surround40_0 {
pcm { pcm {
@func concat @func concat
strings [ strings [
"pcm.si7018_rear:" $(CARD) ",0,-1" "pcm.si7018_rear:" $CARD ",0,-1"
] ]
} }
channels 2 channels 2

20
src/cards/TRID4DWAVENX.conf
View file

@ -15,9 +15,9 @@ pcm.trid4dwavenx_front {
default -1 default -1
} }
type hw type hw
card $(CARD) card $CARD
device $(DEV) device $DEV
subdevice $(SUBDEV) subdevice $SUBDEV
} }
pcm.front_0 { pcm.front_0 {
@ -28,7 +28,7 @@ pcm.front_0 {
@func refer @func refer
name { name {
@func concat @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 { slave.pcm {
@func concat @func concat
strings [ strings [
"pcm.trid4dwavenx_front:CARD=" $(CARD) ",DEV=" $(DEV) ",SUBDEV=" $(SUBDEV) "pcm.trid4dwavenx_front:CARD=" $CARD ",DEV=" $DEV ",SUBDEV=" $SUBDEV
] ]
} }
hooks.0 { hooks.0 {
@ -87,7 +87,7 @@ pcm.rear_0 {
@func refer @func refer
name { name {
@func concat @func concat
strings [ "pcm.trid4dwavenx_rear:" $(CARD) ] strings [ "pcm.trid4dwavenx_rear:" $CARD ]
} }
} }
@ -102,7 +102,7 @@ pcm.surround40_0 {
pcm { pcm {
@func concat @func concat
strings [ strings [
"pcm.trid4dwavenx_front:" $(CARD) ",0,-1" "pcm.trid4dwavenx_front:" $CARD ",0,-1"
] ]
} }
channels 2 channels 2
@ -111,7 +111,7 @@ pcm.surround40_0 {
pcm { pcm {
@func concat @func concat
strings [ strings [
"pcm.trid4dwavenx_rear:" $(CARD) ",0,-1" "pcm.trid4dwavenx_rear:" $CARD ",0,-1"
] ]
} }
channels 2 channels 2
@ -148,7 +148,7 @@ pcm.iec958_0 {
type hooks type hooks
slave.pcm { slave.pcm {
type hw type hw
card $(CARD) card $CARD
device 2 device 2
} }
hooks.0 { hooks.0 {
@ -157,7 +157,7 @@ pcm.iec958_0 {
{ {
interface PCM interface PCM
name "IEC958 Playback PCM Stream" name "IEC958 Playback PCM Stream"
value [ $(AES0) $(AES1) $(AES2) $(AES3) ] value [ $AES0 $AES1 $AES2 $AES3 ]
device 2 device 2
lock true lock true
preserve true preserve true

20
src/cards/YMFPCI.conf
View file

@ -15,9 +15,9 @@ pcm.ymfpci_front {
default -1 default -1
} }
type hw type hw
card $(CARD) card $CARD
device $(DEV) device $DEV
subdevice $(SUBDEV) subdevice $SUBDEV
} }
pcm.front_0 { pcm.front_0 {
@ -28,7 +28,7 @@ pcm.front_0 {
@func refer @func refer
name { name {
@func concat @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 integer
} }
type hw type hw
card $(CARD) card $CARD
device 2 device 2
subdevice 0 subdevice 0
} }
@ -51,7 +51,7 @@ pcm.rear_0 {
@func refer @func refer
name { name {
@func concat @func concat
strings [ "pcm.ymfpci_rear:" $(CARD) ] strings [ "pcm.ymfpci_rear:" $CARD ]
} }
} }
@ -66,7 +66,7 @@ pcm.surround40_0 {
pcm { pcm {
@func concat @func concat
strings [ strings [
"pcm.ymfpci_front:" $(CARD) ",0,-1" "pcm.ymfpci_front:" $CARD ",0,-1"
] ]
} }
channels 2 channels 2
@ -75,7 +75,7 @@ pcm.surround40_0 {
pcm { pcm {
@func concat @func concat
strings [ strings [
"pcm.ymfpci_rear:" $(CARD) "pcm.ymfpci_rear:" $CARD
] ]
} }
channels 2 channels 2
@ -114,7 +114,7 @@ pcm.iec958_0 {
@func concat @func concat
strings [ strings [
"hw:" "hw:"
"CARD=" $(CARD) "," "CARD=" $CARD ","
"DEV=1," "DEV=1,"
"SUBDEV=0" "SUBDEV=0"
] ]
@ -127,7 +127,7 @@ pcm.iec958_0 {
name "IEC958 Playback PCM Stream" name "IEC958 Playback PCM Stream"
lock true lock true
preserve true preserve true
value [ $(AES0) $(AES1) $(AES2) $(AES3) ] value [ $AES0 $AES1 $AES2 $AES3 ]
} }
] ]
} }

9
src/conf.c
View file

@ -1974,12 +1974,9 @@ static int _snd_config_expand(snd_config_t *src,
snd_config_t *val; snd_config_t *val;
snd_config_t *vars = private_data; snd_config_t *vars = private_data;
snd_config_get_string(src, &s); snd_config_get_string(src, &s);
if (strncmp(s, "$(", 2) == 0 && s[strlen(s) - 1] == ')') { if (*s == '$') {
int len = strlen(s) - 3; s++;
char *str = alloca(len + 1); if (snd_config_search(vars, s, &val) < 0)
memcpy(str, s + 2, len);
str[len] = '\0';
if (snd_config_search(vars, str, &val) < 0)
return 0; return 0;
err = snd_config_copy(dst, val); err = snd_config_copy(dst, val);
if (err < 0) if (err < 0)