asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-12-22 13:16:31 +01:00
Code Issues Projects Releases Packages Wiki Activity

topology: fix the define section merge from the included files

Browse source 
The bellow commit assumed that the merge of the included file
is to the main configuration tree, but it's for the subtree.
The Define compound from the included file must be handled
separately.

Link: https://github.com/alsa-project/alsa-utils/pull/140
Fixes: e1a0711 ("topology: fix the command line define merge for new includes")
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2022-01-28 09:34:06 +01:00
parent 329cc772af
commit 123eecf7fa
1 changed files with 38 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
topology/pre-processor.c
View file

@ -247,34 +247,34 @@ static int pre_process_set_defines(struct tplg_pre_processor *tplg_pp, const cha
return 0; return 0;
} }
static int pre_process_defines(struct tplg_pre_processor *tplg_pp) static int pre_process_add_defines(struct tplg_pre_processor *tplg_pp, snd_config_t *from)
{ {
snd_config_t *conf_defines; snd_config_t *conf_defines;
int ret; int ret;
conf_defines = tplg_pp->define_cfg_merged; ret = snd_config_search(from, "Define", &conf_defines);
if (conf_defines == NULL) { if (ret < 0)
ret = snd_config_search(tplg_pp->input_cfg, "Define", &conf_defines); return ret;
if (ret == -ENOENT) {
ret = snd_config_make_compound(&conf_defines, "Define", 0); if (snd_config_get_type(conf_defines) != SND_CONFIG_TYPE_COMPOUND) {
if (ret < 0) fprintf(stderr, "Define must be a compound!\n");
return ret; return -EINVAL;
ret = snd_config_add(tplg_pp->input_cfg, conf_defines); }
}
if (tplg_pp->input_cfg == from)
tplg_pp->define_cfg_merged = conf_defines;
if (tplg_pp->define_cfg_merged == NULL) {
ret = snd_config_make_compound(&tplg_pp->define_cfg_merged, "Define", 0);
if (ret < 0)
return ret;
ret = snd_config_add(tplg_pp->input_cfg, tplg_pp->define_cfg_merged);
if (ret < 0) if (ret < 0)
return ret; return ret;
if (snd_config_get_type(conf_defines) != SND_CONFIG_TYPE_COMPOUND) {
fprintf(stderr, "Define must be a compound!\n");
return -EINVAL;
}
/* cache for the next possible iteration, skip the search and verification */
tplg_pp->define_cfg_merged = conf_defines;
} }
/* /*
* load and merge the command line defines with the variables in the conf file to override * merge the command line defines with the variables in the conf file to override
* default values * default values
*/ */
ret = snd_config_merge(conf_defines, tplg_pp->define_cfg, true); ret = snd_config_merge(conf_defines, tplg_pp->define_cfg, true);
@ -283,6 +283,17 @@ static int pre_process_defines(struct tplg_pre_processor *tplg_pp)
return ret; return ret;
} }
if (tplg_pp->define_cfg_merged != conf_defines) {
/*
* merge back to the main configuration tree (Define subtree)
*/
ret = snd_config_merge(tplg_pp->define_cfg_merged, conf_defines, true);
if (ret < 0) {
fprintf(stderr, "Failed to override main variable definitions\n");
return ret;
}
}
return 0; return 0;
} }
@ -389,6 +400,13 @@ static int pre_process_include_conf(struct tplg_pre_processor *tplg_pp, snd_conf
goto err; goto err;
} }
/* forcefully overwrite with defines from the command line */
ret = pre_process_add_defines(tplg_pp, *new);
if (ret < 0) {
fprintf(stderr, "Failed to parse arguments in input config\n");
goto err;
}
/* recursively process any nested includes */ /* recursively process any nested includes */
return pre_process_includes(tplg_pp, *new); return pre_process_includes(tplg_pp, *new);
} }
@ -443,13 +461,6 @@ static int pre_process_includes(struct tplg_pre_processor *tplg_pp, snd_config_t
fprintf(stderr, "Failed to add included conf\n"); fprintf(stderr, "Failed to add included conf\n");
return ret; return ret;
} }
/* forcefully overwrite with defines from the command line */
ret = pre_process_defines(tplg_pp);
if (ret < 0) {
fprintf(stderr, "Failed to parse arguments in input config\n");
return ret;
}
} }
/* remove all includes from current top */ /* remove all includes from current top */
@ -526,7 +537,7 @@ int pre_process(struct tplg_pre_processor *tplg_pp, char *config, size_t config_
} }
/* parse command line definitions */ /* parse command line definitions */
err = pre_process_defines(tplg_pp); err = pre_process_add_defines(tplg_pp, top);
if (err < 0) { if (err < 0) {
fprintf(stderr, "Failed to parse arguments in input config\n"); fprintf(stderr, "Failed to parse arguments in input config\n");
goto err; goto err;