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

ucm: Handle repeat device and modifier enables/disables

Browse source 
Currently, enabling a device twice can cause it to be added to
snd_use_case_mgr_t->active_devices twice, causing the list to become a
loop and subsequent uses to result in an infinite loop.

This patch makes sure we don't enable/disable a device twice, and avoid
doing the same for modifiers.

Signed-off-by: Arun Raghavan <arun.raghavan@collabora.co.uk>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Arun Raghavan 2012-05-23 18:16:33 +05:30 • committed by Takashi Iwai
parent e4d9c34830
commit e8923f2e75
1 changed files with 34 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

62
src/ucm/main.c
View file

@ -565,6 +565,34 @@ static struct use_case_modifier *
return NULL; return NULL;
} }
long device_status(snd_use_case_mgr_t *uc_mgr,
const char *device_name)
{
struct use_case_device *dev;
struct list_head *pos;
list_for_each(pos, &uc_mgr->active_devices) {
dev = list_entry(pos, struct use_case_device, active_list);
if (strcmp(dev->name, device_name) == 0)
return 1;
}
return 0;
}
long modifier_status(snd_use_case_mgr_t *uc_mgr,
const char *modifier_name)
{
struct use_case_modifier *mod;
struct list_head *pos;
list_for_each(pos, &uc_mgr->active_modifiers) {
mod = list_entry(pos, struct use_case_modifier, active_list);
if (strcmp(mod->name, modifier_name) == 0)
return 1;
}
return 0;
}
/** /**
* \brief Set verb * \brief Set verb
* \param uc_mgr Use case manager * \param uc_mgr Use case manager
@ -607,6 +635,9 @@ static int set_modifier(snd_use_case_mgr_t *uc_mgr,
struct list_head *seq; struct list_head *seq;
int err; int err;
if (modifier_status(uc_mgr, modifier->name) == enable)
return 0;
if (enable) { if (enable) {
seq = &modifier->enable_list; seq = &modifier->enable_list;
} else { } else {
@ -638,6 +669,9 @@ static int set_device(snd_use_case_mgr_t *uc_mgr,
struct list_head *seq; struct list_head *seq;
int err; int err;
if (device_status(uc_mgr, device->name) == enable)
return 0;
if (enable) { if (enable) {
seq = &device->enable_list; seq = &device->enable_list;
} else { } else {
@ -1316,34 +1350,6 @@ int snd_use_case_get(snd_use_case_mgr_t *uc_mgr,
return err; return err;
} }
long device_status(snd_use_case_mgr_t *uc_mgr,
const char *device_name)
{
struct use_case_device *dev;
struct list_head *pos;
list_for_each(pos, &uc_mgr->active_devices) {
dev = list_entry(pos, struct use_case_device, active_list);
if (strcmp(dev->name, device_name) == 0)
return 1;
}
return 0;
}
long modifier_status(snd_use_case_mgr_t *uc_mgr,
const char *modifier_name)
{
struct use_case_modifier *mod;
struct list_head *pos;
list_for_each(pos, &uc_mgr->active_modifiers) {
mod = list_entry(pos, struct use_case_modifier, active_list);
if (strcmp(mod->name, modifier_name) == 0)
return 1;
}
return 0;
}
/** /**
* \brief Get current - integer * \brief Get current - integer