OSDN Git Service

conf: _snd_config_evaluate - remove 'delete compound members' call
authorJaroslav Kysela <perex@perex.cz>
Wed, 12 May 2021 10:12:57 +0000 (12:12 +0200)
committerJaroslav Kysela <perex@perex.cz>
Wed, 12 May 2021 10:13:31 +0000 (12:13 +0200)
With the recent snd_config_substitute() fix, remove the duplicate
code.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
src/conf.c

index c160a1f..72422f1 100644 (file)
@@ -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);