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

spa: support the speakers (output) only case in report_jack_state()

Browse source 
The Realtek ALC4080 USB audio device (integrated in the
motherboards) can detect the presence on all I/O jacks.

If user connects only speakers, it's a valid case.

BugLink: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/2744
This commit is contained in:
Jaroslav Kysela 2022-10-29 20:22:06 +02:00
parent f383956b7b
commit a2278a5f70
1 changed files with 27 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -624,7 +624,7 @@ static int report_jack_state(snd_mixer_elem_t *melem, unsigned int mask)
pa_card *impl = snd_mixer_elem_get_callback_private(melem); pa_card *impl = snd_mixer_elem_get_callback_private(melem);
snd_hctl_elem_t *elem = snd_mixer_elem_get_private(melem); snd_hctl_elem_t *elem = snd_mixer_elem_get_private(melem);
snd_ctl_elem_value_t *elem_value; snd_ctl_elem_value_t *elem_value;
bool plugged_in; bool plugged_in, any_input_port_available;
void *state; void *state;
pa_alsa_jack *jack; pa_alsa_jack *jack;
struct temp_port_avail *tp, *tports; struct temp_port_avail *tp, *tports;
@ -735,6 +735,31 @@ static int report_jack_state(snd_mixer_elem_t *melem, unsigned int mask)
if (impl->card.active_profile_index != ACP_INVALID_INDEX) if (impl->card.active_profile_index != ACP_INVALID_INDEX)
active_available = impl->card.profiles[impl->card.active_profile_index]->available; active_available = impl->card.profiles[impl->card.active_profile_index]->available;
/* First round - detect, if we have any input port available.
If the hardware can report the state for all I/O jacks, only speakers
may be plugged in. */
any_input_port_available = false;
PA_HASHMAP_FOREACH(profile, impl->profiles, state) {
pa_device_port *port;
void *state2;
if (profile->profile.flags & ACP_PROFILE_OFF)
continue;
PA_HASHMAP_FOREACH(port, impl->ports, state2) {
if (!pa_hashmap_get(port->profiles, profile->profile.name))
continue;
if (port->port.direction == ACP_DIRECTION_CAPTURE &&
port->port.available != ACP_AVAILABLE_NO) {
any_input_port_available = true;
goto input_port_found;
}
}
}
input_port_found:
/* Second round */
PA_HASHMAP_FOREACH(profile, impl->profiles, state) { PA_HASHMAP_FOREACH(profile, impl->profiles, state) {
pa_device_port *port; pa_device_port *port;
void *state2; void *state2;
@ -768,7 +793,7 @@ static int report_jack_state(snd_mixer_elem_t *melem, unsigned int mask)
if (has_input_port && !has_output_port && found_available_input_port) if (has_input_port && !has_output_port && found_available_input_port)
available = ACP_AVAILABLE_YES; available = ACP_AVAILABLE_YES;
if (has_output_port && !has_input_port && found_available_output_port) if (has_output_port && (!has_input_port || !any_input_port_available) && found_available_output_port)
available = ACP_AVAILABLE_YES; available = ACP_AVAILABLE_YES;
if (has_output_port && has_input_port && found_available_output_port && found_available_input_port) if (has_output_port && has_input_port && found_available_output_port && found_available_input_port)
available = ACP_AVAILABLE_YES; available = ACP_AVAILABLE_YES;