mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2026-03-08 05:33:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ucm: clarify set_defaults calls

Browse source 
- do full reset in snd_use_case_mgr_reload

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2022-11-15 17:25:59 +01:00
parent a0836e2af1
commit 8b64f22459
1 changed files with 25 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/ucm/main.c
View file

@ -998,13 +998,14 @@ static int add_auto_values(snd_use_case_mgr_t *uc_mgr)
/** /**
* \brief execute default commands * \brief execute default commands
* \param uc_mgr Use case manager * \param uc_mgr Use case manager
* \param force Force run
* \return zero on success, otherwise a negative error code * \return zero on success, otherwise a negative error code
*/ */
static int set_defaults(snd_use_case_mgr_t *uc_mgr) static int set_defaults(snd_use_case_mgr_t *uc_mgr, bool force)
{ {
int err; int err;
if (uc_mgr->default_list_executed) if (!force && uc_mgr->default_list_executed)
return 0; return 0;
err = execute_sequence(uc_mgr, NULL, &uc_mgr->default_list, err = execute_sequence(uc_mgr, NULL, &uc_mgr->default_list,
&uc_mgr->value_list, NULL, NULL); &uc_mgr->value_list, NULL, NULL);
@ -1351,7 +1352,7 @@ static int set_verb(snd_use_case_mgr_t *uc_mgr,
int err; int err;
if (enable) { if (enable) {
err = set_defaults(uc_mgr); err = set_defaults(uc_mgr, false);
if (err < 0) if (err < 0)
return err; return err;
seq = &verb->enable_list; seq = &verb->enable_list;
@ -1435,6 +1436,22 @@ static int set_device(snd_use_case_mgr_t *uc_mgr,
return err; return err;
} }
/**
* \brief Do the full reset
* \param uc_mgr Use case manager
* \return zero on success, otherwise a negative error code
*/
static int do_reset(snd_use_case_mgr_t *uc_mgr)
{
int err;
err = set_defaults(uc_mgr, true);
INIT_LIST_HEAD(&uc_mgr->active_modifiers);
INIT_LIST_HEAD(&uc_mgr->active_devices);
uc_mgr->active_verb = NULL;
return err;
}
/** /**
* \brief Parse open arguments * \brief Parse open arguments
* \param uc_mgr Use case manager * \param uc_mgr Use case manager
@ -1569,6 +1586,8 @@ int snd_use_case_mgr_reload(snd_use_case_mgr_t *uc_mgr)
pthread_mutex_lock(&uc_mgr->mutex); pthread_mutex_lock(&uc_mgr->mutex);
do_reset(uc_mgr);
uc_mgr_free_verb(uc_mgr); uc_mgr_free_verb(uc_mgr);
uc_mgr->default_list_executed = 0; uc_mgr->default_list_executed = 0;
@ -1633,8 +1652,7 @@ static int dismantle_use_case(snd_use_case_mgr_t *uc_mgr)
} }
uc_mgr->active_verb = NULL; uc_mgr->active_verb = NULL;
err = execute_sequence(uc_mgr, NULL, &uc_mgr->default_list, err = set_defaults(uc_mgr, true);
&uc_mgr->value_list, NULL, NULL);
return err; return err;
} }
@ -1649,11 +1667,7 @@ int snd_use_case_mgr_reset(snd_use_case_mgr_t *uc_mgr)
int err; int err;
pthread_mutex_lock(&uc_mgr->mutex); pthread_mutex_lock(&uc_mgr->mutex);
err = execute_sequence(uc_mgr, NULL, &uc_mgr->default_list, err = do_reset(uc_mgr);
&uc_mgr->value_list, NULL, NULL);
INIT_LIST_HEAD(&uc_mgr->active_modifiers);
INIT_LIST_HEAD(&uc_mgr->active_devices);
uc_mgr->active_verb = NULL;
pthread_mutex_unlock(&uc_mgr->mutex); pthread_mutex_unlock(&uc_mgr->mutex);
return err; return err;
} }
@ -2512,7 +2526,7 @@ static int set_defaults_user(snd_use_case_mgr_t *uc_mgr,
uc_error("error: wrong value for _defaults (%s)", value); uc_error("error: wrong value for _defaults (%s)", value);
return -EINVAL; return -EINVAL;
} }
return set_defaults(uc_mgr); return set_defaults(uc_mgr, false);
} }
static int handle_transition_verb(snd_use_case_mgr_t *uc_mgr, static int handle_transition_verb(snd_use_case_mgr_t *uc_mgr,