mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2026-03-10 05:33:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

conf: _snd_config_evaluate - remove 'delete compound members' call

Browse source 
With the recent snd_config_substitute() fix, remove the duplicate
code.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2021-05-12 12:12:57 +02:00
parent 8f236983b6
commit 15b59a5647
1 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/conf.c
View file

@ -4886,13 +4886,8 @@ static int _snd_config_evaluate(snd_config_t *src,
if (err < 0) if (err < 0)
SNDERR("function %s returned error: %s", func_name, snd_strerror(err)); SNDERR("function %s returned error: %s", func_name, snd_strerror(err));
snd_dlclose(h); snd_dlclose(h);
if (err >= 0 && eval) { if (err >= 0 && eval)
/* substitute merges compound members */ err = snd_config_substitute(src, eval);
/* we don't want merging at all */
err = snd_config_delete_compound_members(src);
if (err >= 0)
err = snd_config_substitute(src, eval);
}
} }
_errbuf: _errbuf:
free(buf); free(buf);