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

Enhanced configuration syntax (added [ ] block for arrays).

Browse source 
The snd_config_expand functions expands the runtime contents (@func...).
Removed the environment variable replace code from the configuration parser.
Updated the alsa.conf configuration file.
This commit is contained in:
Jaroslav Kysela 2001-06-13 09:31:05 +00:00
parent bf780a25a5
commit 5c3075d32f
9 changed files with 1062 additions and 485 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/pcm/pcm.c
View file

@ -1035,12 +1035,10 @@ static int snd_pcm_open_noupdate(snd_pcm_t **pcmp, snd_config_t *root,
return err;
}
}
if (args == NULL && snd_config_search(pcm_conf, "$", &conf) >= 0) /* expand arguments */
args = "";
if (args) {
err = snd_config_expand(pcm_conf, args, &pcm_conf);
if (err < 0)
return err;
err = snd_config_expand(pcm_conf, args, NULL, &pcm_conf);
if (err < 0) {
SNDERR("Could not expand configuration: %s", snd_strerror(err));
return err;
}
if (snd_config_search(pcm_conf, "redirect", &conf) >= 0) {
snd_config_t *tmp_conf;
@ -1049,8 +1047,10 @@ static int snd_pcm_open_noupdate(snd_pcm_t **pcmp, snd_config_t *root,
err = snd_config_redirect_load(root, conf, &redir_name, &tmp_conf, &conf_free_tmp);
if (args)
snd_config_delete(pcm_conf);
if (err < 0)
if (err < 0) {
SNDERR("Redirect error: %s", snd_strerror(err));
return err;
}
err = snd_pcm_open_noupdate(pcmp, tmp_conf, redir_name, stream, mode);
if (redir_name)
free(redir_name);
@ -1059,8 +1059,7 @@ static int snd_pcm_open_noupdate(snd_pcm_t **pcmp, snd_config_t *root,
return err;
}
err = snd_pcm_open_conf(pcmp, name, root, pcm_conf, stream, mode);
if (args)
snd_config_delete(pcm_conf);
snd_config_delete(pcm_conf);
return err;
}