From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 8 Jun 2020 07:17:57 +0000 (+0200)
Subject: ucm: remove strict: in ${OpenName} substitution
X-Git-Tag: v1.2.3~6
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=9b5fde505452e030cb42c71d087aed54d0942c0e;p=alsa-lib.git

ucm: remove strict: in ${OpenName} substitution

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

diff --git a/src/ucm/parser.c b/src/ucm/parser.c
index 1d0874d2..b8ee2439 100644
--- a/src/ucm/parser.c
+++ b/src/ucm/parser.c
@@ -2202,8 +2202,6 @@ int uc_mgr_import_master_config(snd_use_case_mgr_t *uc_mgr)
 		/* do not handle the error here */
 		/* we can refer the virtual UCM config */
 		get_by_card_name(uc_mgr, name);
-	} else {
-		name += 7;
 	}
 
 	err = load_toplevel_config(uc_mgr, &cfg);
diff --git a/src/ucm/ucm_subs.c b/src/ucm/ucm_subs.c
index ce6b5eda..d501da34 100644
--- a/src/ucm/ucm_subs.c
+++ b/src/ucm/ucm_subs.c
@@ -31,10 +31,15 @@
 
 static char *rval_open_name(snd_use_case_mgr_t *uc_mgr)
 {
+	const char *name;
 	if (uc_mgr->conf_format < 3)
 		return NULL;
-	if (uc_mgr->card_name && uc_mgr->card_name[0])
-		return strdup(uc_mgr->card_name);
+	name = uc_mgr->card_name;
+	if (name) {
+		if (strncmp(name, "strict:", 7) == 0)
+			name += 7;
+		return strdup(name);
+	}
 	return NULL;
 }