mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-12-16 08:56:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Renamed envname -> vars

Browse source
This commit is contained in:
Abramo Bagnara 2001-06-18 08:45:18 +00:00
parent 158f7c20b0
commit f1fe5d5fb2
2 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/alsa.conf
View file

@ -12,7 +12,7 @@ pcm.hw {
type integer type integer
default { default {
@func igetenv @func igetenv
envname [ vars [
ALSA_PCM_CARD ALSA_PCM_CARD
ALSA_CARD ALSA_CARD
] ]
@ -23,7 +23,7 @@ pcm.hw {
type integer type integer
default { default {
@func igetenv @func igetenv
envname [ vars [
ALSA_PCM_DEVICE ALSA_PCM_DEVICE
] ]
default 0 default 0
@ -45,7 +45,7 @@ pcm.plughw {
type integer type integer
default { default {
@func igetenv @func igetenv
envname [ vars [
ALSA_PCM_CARD ALSA_PCM_CARD
ALSA_CARD ALSA_CARD
] ]
@ -56,7 +56,7 @@ pcm.plughw {
type integer type integer
default { default {
@func igetenv @func igetenv
envname [ vars [
ALSA_PCM_DEVICE ALSA_PCM_DEVICE
] ]
default 0 default 0
@ -140,7 +140,7 @@ pcm.default {
type hw type hw
card { card {
@func igetenv @func igetenv
envname [ vars [
ALSA_PCM_CARD ALSA_PCM_CARD
ALSA_CARD ALSA_CARD
] ]
@ -148,7 +148,7 @@ pcm.default {
} }
device { device {
@func igetenv @func igetenv
envname [ vars [
ALSA_PCM_DEVICE ALSA_PCM_DEVICE
] ]
default 0 default 0
@ -163,7 +163,7 @@ pcm.front {
type integer type integer
default { default {
@func igetenv @func igetenv
envname [ vars [
ALSA_FRONT_CARD ALSA_FRONT_CARD
ALSA_PCM_CARD ALSA_PCM_CARD
ALSA_CARD ALSA_CARD
@ -175,7 +175,7 @@ pcm.front {
type integer type integer
default { default {
@func igetenv @func igetenv
envname [ vars [
ALSA_FRONT_DEVICE ALSA_FRONT_DEVICE
] ]
default 0 default 0
@ -210,7 +210,7 @@ pcm.rear {
type integer type integer
default { default {
@func igetenv @func igetenv
envname [ vars [
ALSA_REAR_CARD ALSA_REAR_CARD
ALSA_PCM_CARD ALSA_PCM_CARD
ALSA_CARD ALSA_CARD
@ -222,7 +222,7 @@ pcm.rear {
type integer type integer
default { default {
@func igetenv @func igetenv
envname [ vars [
ALSA_REAR_DEVICE ALSA_REAR_DEVICE
] ]
default 0 default 0
@ -257,7 +257,7 @@ pcm.center_lfe {
type integer type integer
default { default {
@func igetenv @func igetenv
envname [ vars [
ALSA_CENTER_LFE_CARD ALSA_CENTER_LFE_CARD
ALSA_PCM_CARD ALSA_PCM_CARD
ALSA_CARD ALSA_CARD
@ -269,7 +269,7 @@ pcm.center_lfe {
type integer type integer
default { default {
@func igetenv @func igetenv
envname [ vars [
ALSA_CENTER_LFE_DEVICE ALSA_CENTER_LFE_DEVICE
] ]
default 0 default 0
@ -304,7 +304,7 @@ pcm.surround40 {
type integer type integer
default { default {
@func igetenv @func igetenv
envname [ vars [
ALSA_SURROUND40_CARD ALSA_SURROUND40_CARD
ALSA_PCM_CARD ALSA_PCM_CARD
ALSA_CARD ALSA_CARD
@ -316,7 +316,7 @@ pcm.surround40 {
type integer type integer
default { default {
@func igetenv @func igetenv
envname [ vars [
ALSA_SURROUND40_DEVICE ALSA_SURROUND40_DEVICE
] ]
default 0 default 0
@ -351,7 +351,7 @@ pcm.surround51 {
type integer type integer
default { default {
@func igetenv @func igetenv
envname [ vars [
ALSA_SURROUND51_CARD ALSA_SURROUND51_CARD
ALSA_PCM_CARD ALSA_PCM_CARD
ALSA_CARD ALSA_CARD
@ -363,7 +363,7 @@ pcm.surround51 {
type integer type integer
default { default {
@func igetenv @func igetenv
envname [ vars [
ALSA_SURROUND51_DEVICE ALSA_SURROUND51_DEVICE
] ]
default 0 default 0
@ -398,7 +398,7 @@ pcm.iec958 {
type integer type integer
default { default {
@func igetenv @func igetenv
envname [ vars [
ALSA_IEC958_CARD ALSA_IEC958_CARD
ALSA_PCM_CARD ALSA_PCM_CARD
ALSA_CARD ALSA_CARD
@ -410,7 +410,7 @@ pcm.iec958 {
type integer type integer
default { default {
@func igetenv @func igetenv
envname [ vars [
ALSA_IEC958_DEVICE ALSA_IEC958_DEVICE
] ]
default 0 default 0
@ -476,7 +476,7 @@ ctl.hw {
type integer type integer
default { default {
@func igetenv @func igetenv
envname [ vars [
ALSA_CTL_CARD ALSA_CTL_CARD
ALSA_CARD ALSA_CARD
] ]
@ -504,7 +504,7 @@ ctl.default {
type hw type hw
card { card {
@func igetenv @func igetenv
envname [ vars [
ALSA_CTL_CARD ALSA_CTL_CARD
ALSA_CARD ALSA_CARD
] ]
@ -522,7 +522,7 @@ rawmidi.hw {
type integer type integer
default { default {
@func igetenv @func igetenv
envname [ vars [
ALSA_RAWMIDI_CARD ALSA_RAWMIDI_CARD
ALSA_CARD ALSA_CARD
] ]
@ -533,7 +533,7 @@ rawmidi.hw {
type integer type integer
default { default {
@func igetenv @func igetenv
envname [ vars [
ALSA_RAWMIDI_DEVICE ALSA_RAWMIDI_DEVICE
] ]
default 0 default 0
@ -553,7 +553,7 @@ rawmidi.default {
type hw type hw
card { card {
@func igetenv @func igetenv
envname [ vars [
ALSA_RAWMIDI_CARD ALSA_RAWMIDI_CARD
ALSA_CARD ALSA_CARD
] ]
@ -561,7 +561,7 @@ rawmidi.default {
} }
device { device {
@func igetenv @func igetenv
envname [ vars [
ALSA_RAWMIDI_DEVICE ALSA_RAWMIDI_DEVICE
] ]
default 0 default 0

6
src/confmisc.c
View file

@ -218,14 +218,14 @@ int snd_func_getenv(snd_config_t **dst, snd_config_t *root, snd_config_t *src, v
char *res, *def = NULL; char *res, *def = NULL;
int idx = 0, err; int idx = 0, err;
err = snd_config_search(src, "envname", &n); err = snd_config_search(src, "vars", &n);
if (err < 0) { if (err < 0) {
SNDERR("field envname not found"); SNDERR("field vars not found");
goto __error; goto __error;
} }
err = snd_config_evaluate(n, root, private_data, NULL); err = snd_config_evaluate(n, root, private_data, NULL);
if (err < 0) { if (err < 0) {
SNDERR("error evaluating envname"); SNDERR("error evaluating vars");
goto __error; goto __error;
} }
err = snd_config_search(src, "default", &d); err = snd_config_search(src, "default", &d);