Skip to content

topology: alsatplg: add double-expansion for global defines #337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kv2019i wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −1
Open

topology: alsatplg: add double-expansion for global defines #337

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion topology/pre-process-object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1612,8 +1612,20 @@ pre_process_object_variables_expand_fcn(snd_config_t **dst, const char *str, voi

/* find variable from global definitions first */
ret = pre_process_find_variable(dst, str, conf_defines);
if (ret >= 0)
if (ret >= 0) {
/* the value may itself be a $VAR reference (e.g. from a nested Define
* inside an IncludeByKey branch) — expand it before returning */
if (snd_config_get_string(*dst, &val) >= 0 && val[0] == '$') {
char *var = strdup(val);

snd_config_delete(*dst);
ret = snd_config_evaluate_string(dst, var,
pre_process_object_variables_expand_fcn,
tplg_pp);
free(var);
}
return ret;
}

/* No global define found, proceeed to object attribute search */
if (snd_config_get_id(object_cfg, &object_id) < 0)
Expand Down