From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 20 May 2020 10:17:39 +0000 (+0200)
Subject: ucm: allow syntax version 3
X-Git-Tag: v1.2.3~43
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=9c88ead1bb2f26f5a404cd44fc3ae8538581867a;p=alsa-lib.git

ucm: allow syntax version 3

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

diff --git a/src/ucm/parser.c b/src/ucm/parser.c
index d8e7b82c..63441e78 100644
--- a/src/ucm/parser.c
+++ b/src/ucm/parser.c
@@ -1804,6 +1804,7 @@ static int parse_master_file(snd_use_case_mgr_t *uc_mgr, snd_config_t *cfg)
 		}
 		/* delete this field to avoid strcmp() call in the loop */
 		snd_config_delete(n);
+		uc_mgr->conf_format = l;
 	}
 
 	/* in-place evaluation */
diff --git a/src/ucm/ucm_local.h b/src/ucm/ucm_local.h
index 25a50b4d..30edd9cb 100644
--- a/src/ucm/ucm_local.h
+++ b/src/ucm/ucm_local.h
@@ -40,7 +40,7 @@
 #include <pthread.h>
 #include "use-case.h"
 
-#define SYNTAX_VERSION_MAX	2
+#define SYNTAX_VERSION_MAX	3
 
 #define MAX_CARD_SHORT_NAME	32
 #define MAX_CARD_LONG_NAME	80