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

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

Browse 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
This commit is contained in:
Arun Raghavan 2020-10-26 11:45:27 -04:00
parent 1d6bd6689f
commit a9c6d43b7c
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/pulsecore/sink.c
View file

@ -3973,6 +3973,10 @@ void pa_sink_move_streams_to_default_sink(pa_core *core, pa_sink *old_sink, bool
if (!i->sink) if (!i->sink)
continue; 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 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) if (pa_safe_streq(old_sink->name, i->preferred_sink) && default_sink_changed)
continue; continue;

4
src/pulsecore/source.c
View file

@ -3029,6 +3029,10 @@ void pa_source_move_streams_to_default_source(pa_core *core, pa_source *old_sour
if (!o->source) if (!o->source)
continue; 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 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) if (pa_safe_streq(old_source->name, o->preferred_source) && default_source_changed)
continue; continue;