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

Added missing defaults to alsa.conf.

Browse source 
Function snd_func_macro is now an alias to snd_func_refer.
This commit is contained in:
Jaroslav Kysela 2001-06-20 10:30:18 +00:00
parent 0c5b3434a8
commit b811df2efe
2 changed files with 9 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/alsa.conf
View file

@ -19,6 +19,12 @@ defaults.pcm.device 0
defaults.pcm.subdevice -1 defaults.pcm.subdevice -1
defaults.pcm.front.card defaults.pcm.card defaults.pcm.front.card defaults.pcm.card
defaults.pcm.front.device defaults.pcm.device defaults.pcm.front.device defaults.pcm.device
defaults.pcm.rear.card defaults.pcm.card
defaults.pcm.rear.device defaults.pcm.device
defaults.pcm.surround40.card defaults.pcm.card
defaults.pcm.surround40.device defaults.pcm.device
defaults.pcm.surround51.card defaults.pcm.card
defaults.pcm.surround51.device defaults.pcm.device
defaults.rawmidi.card 0 defaults.rawmidi.card 0
defaults.rawmidi.device 0 defaults.rawmidi.device 0
defaults.rawmidi.subdevice -1 defaults.rawmidi.subdevice -1

40
src/confmisc.c
View file

@ -692,40 +692,6 @@ int snd_func_refer(snd_config_t **dst, snd_config_t *root, snd_config_t *src, vo
return err; return err;
} }
int snd_func_macro(snd_config_t **dst, snd_config_t *root, snd_config_t *src, void *private_data) int snd_func_macro(snd_config_t **dst, snd_config_t *root,
{ snd_config_t *src, void *private_data)
snd_config_t *n; __attribute__ ((weak, alias ("snd_func_refer")));
const char *name;
char *buf = NULL;
int err;
err = snd_config_search(src, "name", &n);
if (err >= 0) {
err = snd_config_evaluate(n, root, private_data, NULL);
if (err < 0) {
SNDERR("error evaluating name");
goto _end;
}
err = snd_config_get_string(n, &name);
if (err < 0) {
SNDERR("name is not a string");
goto _end;
}
}
if (strchr(name, '.') == NULL) {
buf = malloc(6 + strlen(name) + 1);
if (buf == NULL) {
err = -ENOMEM;
goto _end;
}
strcpy(buf, "macro.");
strcat(buf, name);
}
err = snd_config_search_definition(root, NULL, name, dst);
if (err < 0)
SNDERR("Unable to find macro definition '%s'", name);
_end:
if (buf)
free(buf);
return err;
}