From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 12 May 2021 10:12:57 +0000 (+0200)
Subject: conf: _snd_config_evaluate - remove 'delete compound members' call
X-Git-Tag: v1.2.5~26
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=15b59a5647904227f84b687f921fec23e3ed2eaa;p=alsa-lib.git

conf: _snd_config_evaluate - remove 'delete compound members' call

With the recent snd_config_substitute() fix, remove the duplicate
code.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---

diff --git a/src/conf.c b/src/conf.c
index c160a1fb..72422f12 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -4886,13 +4886,8 @@ static int _snd_config_evaluate(snd_config_t *src,
 			if (err < 0)
 				SNDERR("function %s returned error: %s", func_name, snd_strerror(err));
 			snd_dlclose(h);
-			if (err >= 0 && eval) {
-				/* substitute merges compound members */
-				/* we don't want merging at all */
-				err = snd_config_delete_compound_members(src);
-				if (err >= 0)
-					err = snd_config_substitute(src, eval);
-			}
+			if (err >= 0 && eval)
+				err = snd_config_substitute(src, eval);
 		}
 	       _errbuf:
 		free(buf);