mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-04 13:30:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ucm: substitute the before/after identifiers

Browse source 
This allows to handle correctly declarations like:
  Before.SectionDevice "${var:DeviceMic}"

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2021-09-01 11:03:53 +02:00
parent 4a52ae4c32
commit aa04023565
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/ucm/ucm_include.c
View file

@ -91,17 +91,23 @@ static void config_dump(snd_config_t *cfg)
} }
#endif #endif
static int find_position_node(snd_config_t **res, snd_config_t *dst, static int find_position_node(snd_use_case_mgr_t *uc_mgr,
snd_config_t **res, snd_config_t *dst,
const char *id, snd_config_t *pos) const char *id, snd_config_t *pos)
{ {
const char *s; const char *s;
char *s1;
int err; int err;
err = get_string(pos, id, &s); err = get_string(pos, id, &s);
if (err < 0 && err != -ENOENT) if (err < 0 && err != -ENOENT)
return err; return err;
if (err == 0) { if (err == 0) {
err = snd_config_search(dst, s, res); err = uc_mgr_get_substituted_value(uc_mgr, &s1, s);
if (err < 0)
return err;
err = snd_config_search(dst, s1, res);
free(s1);
if (err < 0 && err != -ENOENT) if (err < 0 && err != -ENOENT)
return err; return err;
} }
@ -128,7 +134,7 @@ static int merge_it(snd_config_t *dst, snd_config_t *n, snd_config_t **_dn)
return err; return err;
} }
static int compound_merge(const char *id, static int compound_merge(snd_use_case_mgr_t *uc_mgr, const char *id,
snd_config_t *dst, snd_config_t *src, snd_config_t *dst, snd_config_t *src,
snd_config_t *before, snd_config_t *after) snd_config_t *before, snd_config_t *after)
{ {
@ -143,12 +149,12 @@ static int compound_merge(const char *id,
} }
if (before) { if (before) {
err = find_position_node(&_before, dst, id, before); err = find_position_node(uc_mgr, &_before, dst, id, before);
if (err < 0) if (err < 0)
return err; return err;
} }
if (after) { if (after) {
err = find_position_node(&_after, dst, id, after); err = find_position_node(uc_mgr, &_after, dst, id, after);
if (err < 0) if (err < 0)
return err; return err;
} }
@ -259,7 +265,7 @@ __add:
err = snd_config_search(parent, id, &parent2); err = snd_config_search(parent, id, &parent2);
if (err == -ENOENT) if (err == -ENOENT)
goto __add; goto __add;
err = compound_merge(id, parent2, n, before, after); err = compound_merge(uc_mgr, id, parent2, n, before, after);
if (err < 0) { if (err < 0) {
snd_config_delete(n); snd_config_delete(n);
return err; return err;