acp: update to latest

This commit is contained in:
Wim Taymans 2021-01-05 10:08:31 +01:00
parent 962bf4d897
commit 62065ac263
13 changed files with 238 additions and 84 deletions

View file

@ -630,6 +630,7 @@ static void init_jacks(pa_card *impl)
void *state;
pa_alsa_path* path;
pa_alsa_jack* jack;
char buf[64];
impl->jacks = pa_hashmap_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
@ -673,9 +674,10 @@ static void init_jacks(pa_card *impl)
}
pa_alsa_mixer_use_for_poll(impl->ucm.mixers, jack->mixer_handle);
jack->melem = pa_alsa_mixer_find_card(jack->mixer_handle, jack->alsa_name, 0);
jack->melem = pa_alsa_mixer_find_card(jack->mixer_handle, &jack->alsa_id, 0);
if (!jack->melem) {
pa_log_warn("Jack '%s' seems to have disappeared.", jack->alsa_name);
pa_alsa_mixer_id_to_string(buf, sizeof(buf), &jack->alsa_id);
pa_log_warn("Jack '%s' seems to have disappeared.", buf);
pa_alsa_jack_set_has_control(jack, false);
continue;
}