From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 8 Apr 2021 10:48:38 +0000 (+0200)
Subject: ucm: add ${ConfLibDir} substitution
X-Git-Tag: v1.2.5~64
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=62a51c1da1297f86828bfb0ac6292c40f141e2e8;p=alsa-lib.git

ucm: add ${ConfLibDir} substitution

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

diff --git a/src/ucm/ucm_subs.c b/src/ucm/ucm_subs.c
index 08de526c..87cace44 100644
--- a/src/ucm/ucm_subs.c
+++ b/src/ucm/ucm_subs.c
@@ -44,6 +44,13 @@ static char *rval_open_name(snd_use_case_mgr_t *uc_mgr)
 	return NULL;
 }
 
+static char *rval_conf_libdir(snd_use_case_mgr_t *uc_mgr)
+{
+	if (uc_mgr->conf_format < 4)
+		return NULL;
+	return strdup(snd_config_topdir());
+}
+
 static char *rval_conf_topdir(snd_use_case_mgr_t *uc_mgr)
 {
 	const char *dir;
@@ -619,6 +626,7 @@ __std:
 		}
 		fcn2 = NULL;
 		MATCH_VARIABLE(value, "${OpenName}", rval_open_name, false);
+		MATCH_VARIABLE(value, "${ConfLibDir}", rval_conf_libdir, false);
 		MATCH_VARIABLE(value, "${ConfTopDir}", rval_conf_topdir, false);
 		MATCH_VARIABLE(value, "${ConfDir}", rval_conf_dir, false);
 		MATCH_VARIABLE(value, "${ConfName}", rval_conf_name, false);