sink, source: Skip filter streams while changing default sink/source

Streams connecting filter devices to their target devices shouldn't move
because of default settings (they are intended to be filtering the
specific device that are attached to).

Fixes: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/issues/1015

diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
index 56a3ce433e2635352d1ec8a60626ac65c1f100c2..e89b59655a958f7a82ac516ca358ca211bd0e076 100644 (file)
--- a/src/pulsecore/sink.c
+++ b/src/pulsecore/sink.c
@@ -3973,6 +3973,10 @@ void pa_sink_move_streams_to_default_sink(pa_core *core, pa_sink *old_sink, bool
         if (!i->sink)
             continue;
 
+        /* Don't move sink-inputs which connect filter sinks to their target sinks */
+        if (i->origin_sink)
+            continue;
+
         /* If default_sink_changed is false, the old sink became unavailable, so all streams must be moved. */
         if (pa_safe_streq(old_sink->name, i->preferred_sink) && default_sink_changed)
             continue;

diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c
index 705c939064b7c7cfe3ce2dde3378e099c1b1850d..efc36408347ea58030536c7dc937cf92f50ff0be 100644 (file)
--- a/src/pulsecore/source.c
+++ b/src/pulsecore/source.c
@@ -3029,6 +3029,10 @@ void pa_source_move_streams_to_default_source(pa_core *core, pa_source *old_sour
         if (!o->source)
             continue;
 
+        /* Don't move source-outputs which connect sources to filter sources */
+        if (o->destination_source)
+            continue;
+
         /* If default_source_changed is false, the old source became unavailable, so all streams must be moved. */
         if (pa_safe_streq(old_source->name, o->preferred_source) && default_source_changed)
             continue;