mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-16 08:56:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

acp: only emit profile change for current profile

Browse source 
When a port is plugged/unplugged, first update all the profile states
and then emit a profile change only for the current profile. This way
the device can look at all the updated profiles to select the best one.
This commit is contained in:
Wim Taymans 2020-10-01 13:13:02 +02:00
parent 38276d126c
commit e394c5145a
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
spa/plugins/alsa/acp/acp.c
View file

@ -288,19 +288,18 @@ static pa_available_t calc_port_state(pa_device_port *p, pa_card *impl)
} }
static void profile_set_available(pa_card *impl, uint32_t index, static void profile_set_available(pa_card *impl, uint32_t index,
enum acp_available status) enum acp_available status, bool emit)
{ {
struct acp_card_profile *p = impl->card.profiles[index]; struct acp_card_profile *p = impl->card.profiles[index];
enum acp_available old = p->available; enum acp_available old = p->available;
pa_log_debug("Setting profile %s to availability status %d", if (old != status)
p->name, status); pa_log_info("Profile %s available %s->%s", p->name,
if (old == status) acp_available_str(old), acp_available_str(status));
return;
p->available = status; p->available = status;
if (impl && impl->events && impl->events->profile_available) if (emit && impl && impl->events && impl->events->profile_available)
impl->events->profile_available(impl->user_data, index, impl->events->profile_available(impl->user_data, index,
old, status); old, status);
} }
@ -435,6 +434,9 @@ static int report_jack_state(snd_mixer_elem_t *melem, unsigned int mask)
bool found_available_output_port = false; bool found_available_output_port = false;
enum acp_available available = ACP_AVAILABLE_UNKNOWN; enum acp_available available = ACP_AVAILABLE_UNKNOWN;
if (profile->profile.flags & ACP_PROFILE_OFF)
continue;
PA_HASHMAP_FOREACH(port, impl->ports, state2) { PA_HASHMAP_FOREACH(port, impl->ports, state2) {
if (!pa_hashmap_get(port->profiles, profile->profile.name)) if (!pa_hashmap_get(port->profiles, profile->profile.name))
continue; continue;
@ -467,11 +469,11 @@ static int report_jack_state(snd_mixer_elem_t *melem, unsigned int mask)
if (profile->profile.index == impl->card.active_profile_index) if (profile->profile.index == impl->card.active_profile_index)
active_available = available; active_available = available;
else else
profile_set_available(impl, profile->profile.index, available); profile_set_available(impl, profile->profile.index, available, false);
} }
if (impl->card.active_profile_index != ACP_INVALID_INDEX) if (impl->card.active_profile_index != ACP_INVALID_INDEX)
profile_set_available(impl, impl->card.active_profile_index, active_available); profile_set_available(impl, impl->card.active_profile_index, active_available, true);
return 0; return 0;
} }