mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-31 22:25:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

conf: snd_config_merge() - merge (concat) correctly arrays

Browse source 
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2021-05-24 09:37:13 +02:00
parent e3edbf6e3b
commit 6a944d1b2a
1 changed files with 29 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/conf.c
View file

@ -2176,6 +2176,31 @@ int snd_config_add_before(snd_config_t *before, snd_config_t *child)
return 0; return 0;
} }
/*
* append all src items to the end of dst arrray
*/
static int _snd_config_array_merge(snd_config_t *dst, snd_config_t *src, int index)
{
snd_config_iterator_t si, snext;
int err;
snd_config_for_each(si, snext, src) {
snd_config_t *sn = snd_config_iterator_entry(si);
char id[16];
snd_config_remove(sn);
snprintf(id, sizeof(id), "%d", index++);
err = snd_config_set_id(sn, id);
if (err < 0) {
snd_config_delete(sn);
return err;
}
sn->parent = dst;
list_add_tail(&sn->list, &dst->u.compound.fields);
}
snd_config_delete(src);
return 0;
}
/** /**
* \brief In-place merge of two compounds * \brief In-place merge of two compounds
* \param dst[out] Compound handle for the merged contents * \param dst[out] Compound handle for the merged contents
@ -2201,13 +2226,16 @@ int snd_config_merge(snd_config_t *dst, snd_config_t *src, int override)
{ {
snd_config_iterator_t di, si, dnext, snext; snd_config_iterator_t di, si, dnext, snext;
bool found; bool found;
int err; int err, array;
assert(dst); assert(dst);
if (src == NULL) if (src == NULL)
return 0; return 0;
if (dst->type != SND_CONFIG_TYPE_COMPOUND || src->type != SND_CONFIG_TYPE_COMPOUND) if (dst->type != SND_CONFIG_TYPE_COMPOUND || src->type != SND_CONFIG_TYPE_COMPOUND)
return -EINVAL; return -EINVAL;
array = snd_config_is_array(dst);
if (array && snd_config_is_array(src))
return _snd_config_array_merge(dst, src, array);
snd_config_for_each(si, snext, src) { snd_config_for_each(si, snext, src) {
snd_config_t *sn = snd_config_iterator_entry(si); snd_config_t *sn = snd_config_iterator_entry(si);
found = false; found = false;