From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 27 May 2020 12:04:13 +0000 (+0200)
Subject: ucm: substitute device strings in the device lists
X-Git-Tag: android-x86-8.1-r6~300
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=991990cdf2ee418338888895e3b0f1ad21beed34;p=android-x86%2Fexternal-alsa-lib.git

ucm: substitute device strings in the device lists

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

diff --git a/src/ucm/parser.c b/src/ucm/parser.c
index 506114ca..e4b1b715 100644
--- a/src/ucm/parser.c
+++ b/src/ucm/parser.c
@@ -493,7 +493,11 @@ static int parse_device_list(snd_use_case_mgr_t *uc_mgr ATTRIBUTE_UNUSED,
 		sdev = calloc(1, sizeof(struct dev_list_node));
 		if (sdev == NULL)
 			return -ENOMEM;
-		err = parse_string(n, &sdev->name);
+		if (uc_mgr->conf_format < 3) {
+			err = parse_string(n, &sdev->name);
+		} else {
+			err = parse_string_substitute(uc_mgr, n, &sdev->name);
+		}
 		if (err < 0) {
 			free(sdev);
 			return err;