mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-03 09:01:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ucm: fix the local ucm control device name caching

Browse source 
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2021-04-23 17:24:36 +02:00
parent 3e731ff51e
commit 6ddba54a07
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/ucm/ucm_local.h
View file

@ -120,6 +120,7 @@ struct ctl_list {
snd_ctl_t *ctl;
snd_ctl_card_info_t *ctl_info;
int slave;
int ucm_group;
};
struct ucm_dev_name {

17
src/ucm/utils.c
View file

@ -266,16 +266,21 @@ int uc_mgr_open_ctl(snd_use_case_mgr_t *uc_mgr,
struct ctl_dev *ctl_dev;
snd_ctl_card_info_t *info;
const char *id;
int err, card;
int err, card, ucm_group, ucm_offset;
snd_ctl_card_info_alloca(&info);
ucm_group = _snd_is_ucm_device(device);
ucm_offset = ucm_group ? 8 : 0;
/* cache lookup */
list_for_each(pos1, &uc_mgr->ctl_list) {
ctl_list = list_entry(pos1, struct ctl_list, list);
if (ctl_list->ucm_group != ucm_group)
continue;
list_for_each(pos2, &ctl_list->dev_list) {
ctl_dev = list_entry(pos2, struct ctl_dev, list);
if (strcmp(ctl_dev->device, device) == 0) {
if (strcmp(ctl_dev->device, device + ucm_offset) == 0) {
*ctll = ctl_list;
if (!slave)
ctl_list->slave = 0;
@ -301,22 +306,26 @@ int uc_mgr_open_ctl(snd_use_case_mgr_t *uc_mgr,
/* insert to cache, if just name differs */
list_for_each(pos1, &uc_mgr->ctl_list) {
ctl_list = list_entry(pos1, struct ctl_list, list);
if (ctl_list->ucm_group != ucm_group)
continue;
if (strcmp(id, snd_ctl_card_info_get_id(ctl_list->ctl_info)) == 0) {
card = snd_card_get_index(id);
err = uc_mgr_ctl_add(uc_mgr, &ctl_list, ctl, card, info, device, slave);
err = uc_mgr_ctl_add(uc_mgr, &ctl_list, ctl, card, info, device + ucm_offset, slave);
if (err < 0)
goto __nomem;
snd_ctl_close(ctl);
ctl_list->ucm_group = ucm_group;
*ctll = ctl_list;
return 0;
}
}
ctl_list = NULL;
err = uc_mgr_ctl_add(uc_mgr, &ctl_list, ctl, -1, info, device, slave);
err = uc_mgr_ctl_add(uc_mgr, &ctl_list, ctl, -1, info, device + ucm_offset, slave);
if (err < 0)
goto __nomem;
ctl_list->ucm_group = ucm_group;
*ctll = ctl_list;
return 0;