mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-04 13:30:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ucm: the ucm2/ subdirectory is driver name based

Browse source 
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2020-02-03 15:24:19 +01:00
parent c5a09b0fea
commit 71a1367bca
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/ucm/parser.c
View file

@ -1515,7 +1515,7 @@ static int get_card_long_name(snd_use_case_mgr_t *mgr, char *longname)
int card, err; int card, err;
snd_ctl_t *ctl; snd_ctl_t *ctl;
snd_ctl_card_info_t *info; snd_ctl_card_info_t *info;
const char *_name, *_long_name; const char *_driver, *_name, *_long_name;
snd_ctl_card_info_alloca(&info); snd_ctl_card_info_alloca(&info);
@ -1535,9 +1535,11 @@ static int get_card_long_name(snd_use_case_mgr_t *mgr, char *longname)
err = get_card_info(mgr, name, &ctl, info); err = get_card_info(mgr, name, &ctl, info);
if (err == 0) { if (err == 0) {
_driver = snd_ctl_card_info_get_driver(info);
_name = snd_ctl_card_info_get_name(info); _name = snd_ctl_card_info_get_name(info);
_long_name = snd_ctl_card_info_get_longname(info); _long_name = snd_ctl_card_info_get_longname(info);
if (!strcmp(card_name, _name) || if (!strcmp(card_name, _driver) ||
!strcmp(card_name, _name) ||
!strcmp(card_name, _long_name)) { !strcmp(card_name, _long_name)) {
snd_strlcpy(longname, _long_name, MAX_CARD_LONG_NAME); snd_strlcpy(longname, _long_name, MAX_CARD_LONG_NAME);
return 0; return 0;
@ -1560,7 +1562,7 @@ static int get_by_card(snd_use_case_mgr_t *mgr, const char *ctl_name, char *long
{ {
snd_ctl_t *ctl; snd_ctl_t *ctl;
snd_ctl_card_info_t *info; snd_ctl_card_info_t *info;
const char *_name, *_long_name; const char *_driver, *_long_name;
int err; int err;
snd_ctl_card_info_alloca(&info); snd_ctl_card_info_alloca(&info);
@ -1569,8 +1571,8 @@ static int get_by_card(snd_use_case_mgr_t *mgr, const char *ctl_name, char *long
if (err) if (err)
return err; return err;
_name = snd_ctl_card_info_get_name(info); _driver = snd_ctl_card_info_get_driver(info);
if (replace_string(&mgr->conf_dir_name, _name) == NULL) if (replace_string(&mgr->conf_dir_name, _driver) == NULL)
return -ENOMEM; return -ENOMEM;
_long_name = snd_ctl_card_info_get_longname(info); _long_name = snd_ctl_card_info_get_longname(info);
snd_strlcpy(longname, _long_name, MAX_CARD_LONG_NAME); snd_strlcpy(longname, _long_name, MAX_CARD_LONG_NAME);