mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2026-02-17 22:05:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ucm: remove strict: in ${OpenName} substitution

Browse source 
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2020-06-08 09:17:57 +02:00
parent e1777ee1a1
commit 9b5fde5054
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ucm/parser.c
View file

@ -2202,8 +2202,6 @@ int uc_mgr_import_master_config(snd_use_case_mgr_t *uc_mgr)
/* do not handle the error here */ /* do not handle the error here */
/* we can refer the virtual UCM config */ /* we can refer the virtual UCM config */
get_by_card_name(uc_mgr, name); get_by_card_name(uc_mgr, name);
} else {
name += 7;
} }
err = load_toplevel_config(uc_mgr, &cfg); err = load_toplevel_config(uc_mgr, &cfg);

9
src/ucm/ucm_subs.c
View file

@ -31,10 +31,15 @@
static char *rval_open_name(snd_use_case_mgr_t *uc_mgr) static char *rval_open_name(snd_use_case_mgr_t *uc_mgr)
{ {
const char *name;
if (uc_mgr->conf_format < 3) if (uc_mgr->conf_format < 3)
return NULL; return NULL;
if (uc_mgr->card_name && uc_mgr->card_name[0]) name = uc_mgr->card_name;
return strdup(uc_mgr->card_name); if (name) {
if (strncmp(name, "strict:", 7) == 0)
name += 7;
return strdup(name);
}
return NULL; return NULL;
} }