mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

core, device-port: check availability when choosing the default device

Browse source 
It doesn't make sense to use a sink or source whose active port is
unavailable, so let's take this into account when choosing the default
sink and source.
This commit is contained in:
Tanu Kaskinen 2017-02-16 12:09:39 +02:00
parent 6b34896130
commit 1c477fcb67
2 changed files with 24 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/pulsecore/core.c
View file

@ -266,6 +266,14 @@ static int compare_sinks(pa_sink *a, pa_sink *b) {
core = a->core;
/* Available sinks always beat unavailable sinks. */
if (a->active_port && a->active_port->available == PA_AVAILABLE_NO
&& (!b->active_port || b->active_port->available != PA_AVAILABLE_NO))
return -1;
if (b->active_port && b->active_port->available == PA_AVAILABLE_NO
&& (!a->active_port || a->active_port->available != PA_AVAILABLE_NO))
return 1;
/* The configured default sink is preferred over any other sink. */
if (b == core->configured_default_sink)
return -1;
@ -332,6 +340,14 @@ static int compare_sources(pa_source *a, pa_source *b) {
core = a->core;
/* Available sources always beat unavailable sources. */
if (a->active_port && a->active_port->available == PA_AVAILABLE_NO
&& (!b->active_port || b->active_port->available != PA_AVAILABLE_NO))
return -1;
if (b->active_port && b->active_port->available == PA_AVAILABLE_NO
&& (!a->active_port || a->active_port->available != PA_AVAILABLE_NO))
return 1;
/* The configured default source is preferred over any other source. */
if (b == core->configured_default_source)
return -1;

8
src/pulsecore/device-port.c
View file

@ -93,6 +93,14 @@ void pa_device_port_set_available(pa_device_port *p, pa_available_t status) {
* be created before port objects, and then p->card could be non-NULL for
* the whole lifecycle of pa_device_port. */
if (p->card) {
/* A sink or source whose active port is unavailable can't be the
* default sink/source, so port availability changes may affect the
* default sink/source choice. */
if (p->direction == PA_DIRECTION_OUTPUT)
pa_core_update_default_sink(p->core);
else
pa_core_update_default_source(p->core);
pa_subscription_post(p->core, PA_SUBSCRIPTION_EVENT_CARD|PA_SUBSCRIPTION_EVENT_CHANGE, p->card->index);
pa_hook_fire(&p->core->hooks[PA_CORE_HOOK_PORT_AVAILABLE_CHANGED], p);
}