summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2017-05-07 12:12:39 +0300
committerTanu Kaskinen <tanuk@iki.fi>2017-05-17 23:05:04 +0300
commit4c6843f02067bed2a299bed1651d00832e2afea0 (patch)
tree2ac855aa6b64a5b53e87e95144dfa034505a8037
parent61860e7cebd55b6bf95169cd5c65f31316bcebdc (diff)
downloadpulseaudio-4c6843f02067bed2a299bed1651d00832e2afea0.tar.gz
sink, source: update the default sink/source on port switches
When sinks are compared during the default sink selection, the active port's availability is inspected. Therefore, the default sink should be updated when the active port changes, because the new port may have different availability status than the old port. For example, let's say that a laptop has an analog sink with a speaker and a headphone port, and headphones are initially plugged in, so both ports can be used[1]. The headphone port is initially the active port. There's also a null sink in the system. When the headphones are unplugged, the headphone port becomes unavailable, and the null sink becomes the new default sink. Then module-switch-on-port-available changes the analog sink port to speakers. Now the default sink should change back to the analog sink, but that doesn't happen without this patch. [1] Actually we currently mark speakers as unavailable when headphones are plugged in, but that's not strictly necessary. My example relies on both ports being available initially, so the bug can't be reproduced with the current mixer configuration.
-rw-r--r--src/pulsecore/sink.c3
-rw-r--r--src/pulsecore/source.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
index 71121ca0b..43dad516a 100644
--- a/src/pulsecore/sink.c
+++ b/src/pulsecore/sink.c
@@ -3375,6 +3375,9 @@ int pa_sink_set_port(pa_sink *s, const char *name, bool save) {
pa_sink_set_port_latency_offset(s, s->active_port->latency_offset);
+ /* The active port affects the default sink selection. */
+ pa_core_update_default_sink(s->core);
+
pa_hook_fire(&s->core->hooks[PA_CORE_HOOK_SINK_PORT_CHANGED], s);
return 0;
diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c
index 15b1eecda..cfbc62688 100644
--- a/src/pulsecore/source.c
+++ b/src/pulsecore/source.c
@@ -2650,6 +2650,9 @@ int pa_source_set_port(pa_source *s, const char *name, bool save) {
s->active_port = port;
s->save_port = save;
+ /* The active port affects the default source selection. */
+ pa_core_update_default_source(s->core);
+
pa_source_set_port_latency_offset(s, s->active_port->latency_offset);
pa_hook_fire(&s->core->hooks[PA_CORE_HOOK_SOURCE_PORT_CHANGED], s);