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: merge the array items from the condition blocks

Browse source 
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2020-05-08 12:32:36 +02:00
parent 822f0c443b
commit 76c098bf6e
1 changed files with 32 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/ucm/ucm_cond.c
View file

@ -354,7 +354,8 @@ static int compound_merge(const char *id,
snd_config_iterator_t i, next; snd_config_iterator_t i, next;
snd_config_t *n, *_before = NULL, *_after = NULL; snd_config_t *n, *_before = NULL, *_after = NULL;
const char *s; const char *s;
int err; char tmpid[32];
int err, array, idx;
if (snd_config_get_type(src) != SND_CONFIG_TYPE_COMPOUND) { if (snd_config_get_type(src) != SND_CONFIG_TYPE_COMPOUND) {
uc_error("compound type expected for If True/False block"); uc_error("compound type expected for If True/False block");
@ -387,11 +388,29 @@ static int compound_merge(const char *id,
return -EINVAL; return -EINVAL;
} }
array = snd_config_is_array(dst);
if (array < 0) {
uc_error("destination configuration node is not a compound");
return array;
}
if (array && snd_config_is_array(src) <= 0) {
uc_error("source configuration node is not an array");
return -EINVAL;
}
idx = 0;
snd_config_for_each(i, next, src) { snd_config_for_each(i, next, src) {
n = snd_config_iterator_entry(i); n = snd_config_iterator_entry(i);
err = snd_config_remove(n); err = snd_config_remove(n);
if (err < 0) if (err < 0)
return err; return err;
/* for array, use a temporary non-clashing identifier */
if (array > 0) {
snprintf(tmpid, sizeof(tmpid), "_tmp_%d", idx++);
err = snd_config_set_id(n, tmpid);
if (err < 0)
return err;
}
if (_before) { if (_before) {
err = snd_config_add_before(_before, n); err = snd_config_add_before(_before, n);
if (err < 0) if (err < 0)
@ -410,6 +429,18 @@ static int compound_merge(const char *id,
} }
} }
/* set new indexes for the final array */
if (array > 0) {
idx = 0;
snd_config_for_each(i, next, dst) {
n = snd_config_iterator_entry(i);
snprintf(tmpid, sizeof(tmpid), "%d", idx++);
err = snd_config_set_id(n, tmpid);
if (err < 0)
return err;
}
}
return 0; return 0;
} }