mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-03 09:01:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ucm: configuration - implement in-place Include

Browse source 
An example:

	Include {
		File "Inc.conf"
		Before.SectionDevice "Mic"
	}

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2020-05-16 15:47:19 +02:00
parent 14636be4a8
commit 3edfebc522
6 changed files with 375 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

99
src/ucm/parser.c
View file

@ -124,6 +124,25 @@ static void configuration_filename(snd_use_case_mgr_t *uc_mgr,
configuration_filename2(fn, fn_len, 2, dir, file, suffix);
}
/*
*
*/
int uc_mgr_config_load_file(snd_use_case_mgr_t *uc_mgr,
const char *file, snd_config_t **cfg)
{
char filename[PATH_MAX];
int err;
configuration_filename(uc_mgr, filename, sizeof(filename),
uc_mgr->conf_dir_name, file, "");
err = uc_mgr_config_load(uc_mgr->conf_format, filename, cfg);
if (err < 0) {
uc_error("error: failed to open file %s : %d", filename, -errno);
return err;
}
return 0;
}
/*
* Replace mallocated string
*/
@ -174,6 +193,26 @@ int parse_get_safe_id(snd_config_t *n, const char **id)
return 0;
}
/*
* Evaluate include (in-place)
*/
static int evaluate_include(snd_use_case_mgr_t *uc_mgr,
snd_config_t *cfg)
{
snd_config_t *n;
int err;
err = snd_config_search(cfg, "Include", &n);
if (err == -ENOENT)
return 1;
if (err < 0)
return err;
err = uc_mgr_evaluate_include(uc_mgr, cfg, n);
snd_config_delete(n);
return err;
}
/*
* Evaluate condition (in-place)
*/
@ -185,7 +224,7 @@ static int evaluate_condition(snd_use_case_mgr_t *uc_mgr,
err = snd_config_search(cfg, "If", &n);
if (err == -ENOENT)
return 0;
return 1;
if (err < 0)
return err;
@ -194,6 +233,26 @@ static int evaluate_condition(snd_use_case_mgr_t *uc_mgr,
return err;
}
/*
* In-place evaluate
*/
int uc_mgr_evaluate_inplace(snd_use_case_mgr_t *uc_mgr,
snd_config_t *cfg)
{
int err1 = 0, err2 = 0;
while (err1 == 0 || err2 == 0) {
/* include at first */
err1 = evaluate_include(uc_mgr, cfg);
if (err1 < 0)
return err1;
err2 = evaluate_condition(uc_mgr, cfg);
if (err2 < 0)
return err2;
}
return 0;
}
/*
* Parse transition
*/
@ -629,8 +688,8 @@ static int parse_value(snd_use_case_mgr_t *uc_mgr ATTRIBUTE_UNUSED,
return -EINVAL;
}
/* in-place condition evaluation */
err = evaluate_condition(uc_mgr, cfg);
/* in-place evaluation */
err = uc_mgr_evaluate_inplace(uc_mgr, cfg);
if (err < 0)
return err;
@ -749,8 +808,8 @@ static int parse_modifier(snd_use_case_mgr_t *uc_mgr,
list_add_tail(&modifier->list, &verb->modifier_list);
modifier->name = strdup(name);
/* in-place condition evaluation */
err = evaluate_condition(uc_mgr, cfg);
/* in-place evaluation */
err = uc_mgr_evaluate_inplace(uc_mgr, cfg);
if (err < 0)
return err;
@ -900,8 +959,8 @@ static int parse_device(snd_use_case_mgr_t *uc_mgr,
list_add_tail(&device->list, &verb->device_list);
device->name = strdup(name);
/* in-place condition evaluation */
err = evaluate_condition(uc_mgr, cfg);
/* in-place evaluation */
err = uc_mgr_evaluate_inplace(uc_mgr, cfg);
if (err < 0)
return err;
@ -1238,8 +1297,8 @@ static int parse_verb(snd_use_case_mgr_t *uc_mgr,
snd_config_t *n;
int err;
/* in-place condition evaluation */
err = evaluate_condition(uc_mgr, cfg);
/* in-place evaluation */
err = uc_mgr_evaluate_inplace(uc_mgr, cfg);
if (err < 0)
return err;
@ -1312,7 +1371,6 @@ static int parse_verb_file(snd_use_case_mgr_t *uc_mgr,
snd_config_t *n;
struct use_case_verb *verb;
snd_config_t *cfg;
char filename[PATH_MAX];
int err;
/* allocate verb */
@ -1342,17 +1400,12 @@ static int parse_verb_file(snd_use_case_mgr_t *uc_mgr,
}
/* open Verb file for reading */
configuration_filename(uc_mgr, filename, sizeof(filename),
uc_mgr->conf_dir_name, file, "");
err = uc_mgr_config_load(uc_mgr->conf_format, filename, &cfg);
if (err < 0) {
uc_error("error: failed to open verb file %s : %d",
filename, -errno);
err = uc_mgr_config_load_file(uc_mgr, file, &cfg);
if (err < 0)
return err;
}
/* in-place condition evaluation */
err = evaluate_condition(uc_mgr, cfg);
/* in-place evaluation */
err = uc_mgr_evaluate_inplace(uc_mgr, cfg);
if (err < 0)
return err;
@ -1463,8 +1516,8 @@ static int parse_master_section(snd_use_case_mgr_t *uc_mgr, snd_config_t *cfg,
return -EINVAL;
}
/* in-place condition evaluation */
err = evaluate_condition(uc_mgr, cfg);
/* in-place evaluation */
err = uc_mgr_evaluate_inplace(uc_mgr, cfg);
if (err < 0)
return err;
@ -1630,8 +1683,8 @@ static int parse_master_file(snd_use_case_mgr_t *uc_mgr, snd_config_t *cfg)
snd_config_delete(n);
}
/* in-place condition evaluation */
err = evaluate_condition(uc_mgr, cfg);
/* in-place evaluation */
err = uc_mgr_evaluate_inplace(uc_mgr, cfg);
if (err < 0)
return err;