mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2026-02-23 01:40:21 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

sink: Remove input_to_master variable from sink structure

Browse source 
The variable is now unused.
This commit is contained in:
Georg Chini 2021-01-01 20:15:49 +01:00
parent 668a22e902
commit ed4074ae08
4 changed files with 11 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/pulsecore/sink-input.c
View file

@ -1785,19 +1785,10 @@ bool pa_sink_input_may_move(pa_sink_input *i) {
static bool find_filter_sink_input(pa_sink_input *target, pa_sink *s) {
unsigned PA_UNUSED i = 0;
/* During consolidation, we have to support s->input_to_master and
* s->vsink->input_to_master. The first will disappear after all
* virtual sinks use the new code. */
while (s && (s->input_to_master || (s->vsink && s->vsink->input_to_master))) {
if (s->vsink) {
if (s->vsink->input_to_master == target)
return true;
s = s->vsink->input_to_master->sink;
} else {
if (s->input_to_master == target)
return true;
s = s->input_to_master->sink;
}
while (s && (s->vsink && s->vsink->input_to_master)) {
if (s->vsink->input_to_master == target)
return true;
s = s->vsink->input_to_master->sink;
pa_assert(i++ < 100);
}
return false;
@ -1809,11 +1800,8 @@ static bool is_filter_sink_moving(pa_sink_input *i) {
if (!sink)
return false;
while (sink->input_to_master || (sink->vsink && sink->vsink->input_to_master)) {
if (sink->vsink)
sink = sink->vsink->input_to_master->sink;
else
sink = sink->input_to_master->sink;
while (sink->vsink && sink->vsink->input_to_master) {
sink = sink->vsink->input_to_master->sink;
if (!sink)
return true;