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 1d0874d2a566d6e5a40529187a29e6f0f7a10075..b8ee24399a4117e51091ce3ae40d63c8960a17c5 100644 (file)
--- 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 ce6b5eda4862104e8aa824002bf866343da37bf0..d501da345cf4526c30b70b2370cd586436682025 100644 (file)
--- 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;
 }