asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-11-10 00:25:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

topology: fix the command line define merge for new includes

Browse source 
The defines from the command line must overwrite the defines
from the included configuration files forcefully.

Link: https://github.com/alsa-project/alsa-utils/pull/129
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2022-01-27 14:11:45 +01:00
parent d05ac4a078
commit e1a0711329
2 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
topology/pre-process-object.c
View file

@ -1521,6 +1521,7 @@ static int pre_process_find_variable(snd_config_t **dst, const char *str, snd_co
return -EINVAL; return -EINVAL;
} }
static int static int
pre_process_object_variables_expand_fcn(snd_config_t **dst, const char *str, void *private_data) pre_process_object_variables_expand_fcn(snd_config_t **dst, const char *str, void *private_data)
{ {

33
topology/pre-processor.c
View file

@ -225,18 +225,25 @@ err:
} }
#if SND_LIB_VER(1, 2, 5) < SND_LIB_VERSION #if SND_LIB_VER(1, 2, 5) < SND_LIB_VERSION
static int pre_process_defines(struct tplg_pre_processor *tplg_pp, const char *pre_processor_defs, static int pre_process_defines(struct tplg_pre_processor *tplg_pp, const char *pre_processor_defs)
snd_config_t *top)
{ {
snd_config_t *conf_defines, *defines; snd_config_t *conf_defines, *defines;
int ret; int ret;
ret = snd_config_search(tplg_pp->input_cfg, "Define", &conf_defines); ret = snd_config_search(tplg_pp->input_cfg, "Define", &conf_defines);
if (ret == -ENOENT) {
ret = snd_config_make_compound(&conf_defines, "Define", 0);
if (ret < 0)
return ret;
ret = snd_config_add(tplg_pp->input_cfg, conf_defines);
}
if (ret < 0) if (ret < 0)
return 0; return ret;
if (snd_config_get_type(conf_defines) != SND_CONFIG_TYPE_COMPOUND) if (snd_config_get_type(conf_defines) != SND_CONFIG_TYPE_COMPOUND) {
return 0; fprintf(stderr, "Define must be a compound!\n");
return -EINVAL;
}
/* /*
* load and merge the command line defines with the variables in the conf file to override * load and merge the command line defines with the variables in the conf file to override
@ -364,13 +371,6 @@ static int pre_process_include_conf(struct tplg_pre_processor *tplg_pp, snd_conf
goto err; goto err;
} }
/* process any args in the included file */
ret = pre_process_defines(tplg_pp, pre_processor_defs, *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, pre_processor_defs, inc_path); return pre_process_includes(tplg_pp, *new, pre_processor_defs, inc_path);
} }
@ -426,6 +426,13 @@ 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, pre_processor_defs);
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 */
@ -495,7 +502,7 @@ int pre_process(struct tplg_pre_processor *tplg_pp, char *config, size_t config_
#if SND_LIB_VER(1, 2, 5) < SND_LIB_VERSION #if SND_LIB_VER(1, 2, 5) < SND_LIB_VERSION
/* parse command line definitions */ /* parse command line definitions */
err = pre_process_defines(tplg_pp, pre_processor_defs, tplg_pp->input_cfg); err = pre_process_defines(tplg_pp, pre_processor_defs);
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;