From ed4074ae08ad1315e8beeb407d70dccbdfba38ce Mon Sep 17 00:00:00 2001
From: Georg Chini <georg@chini.tk>
Date: Fri, 1 Jan 2021 20:15:49 +0100
Subject: [PATCH] sink: Remove input_to_master variable from sink structure

The variable is now unused.
---
 src/modules/module-filter-apply.c | 10 ++--------
 src/pulsecore/sink-input.c        | 24 ++++++------------------
 src/pulsecore/sink.c              | 15 +++------------
 src/pulsecore/sink.h              |  1 -
 4 files changed, 11 insertions(+), 39 deletions(-)

diff --git a/src/modules/module-filter-apply.c b/src/modules/module-filter-apply.c
index bd4a9d176..f6c6929c7 100644
--- a/src/modules/module-filter-apply.c
+++ b/src/modules/module-filter-apply.c
@@ -293,10 +293,7 @@ static bool find_paired_master(struct userdata *u, struct filter *filter, pa_obj
                     if (pa_streq(module_name, si->sink->module->name)) {
                         /* Make sure we're not routing to another instance of
                          * the same filter. */
-                        if (si->sink->vsink)
-                            filter->sink_master = si->sink->vsink->input_to_master->sink;
-                        else
-                            filter->sink_master = si->sink->input_to_master->sink;
+                        filter->sink_master = si->sink->vsink->input_to_master->sink;
                     } else {
                         filter->sink_master = si->sink;
                     }
@@ -464,10 +461,7 @@ static void find_filters_for_module(struct userdata *u, pa_module *m, const char
         if (sink->module == m) {
             pa_assert(pa_sink_is_filter(sink));
 
-            if (sink->vsink)
-               fltr = filter_new(name, parameters, sink->vsink->input_to_master->sink, NULL);
-            else
-               fltr = filter_new(name, parameters, sink->input_to_master->sink, NULL);
+            fltr = filter_new(name, parameters, sink->vsink->input_to_master->sink, NULL);
             fltr->module_index = m->index;
             fltr->sink = sink;
 
diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c
index c780d7b37..9824719c5 100644
--- a/src/pulsecore/sink-input.c
+++ b/src/pulsecore/sink-input.c
@@ -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;
diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
index e87a16a04..072f87aeb 100644
--- a/src/pulsecore/sink.c
+++ b/src/pulsecore/sink.c
@@ -286,7 +286,6 @@ pa_sink* pa_sink_new(
 
     s->inputs = pa_idxset_new(NULL, NULL);
     s->n_corked = 0;
-    s->input_to_master = NULL;
     s->vsink = NULL;
 
     s->reference_volume = s->real_volume = data->volume;
@@ -1693,19 +1692,11 @@ bool pa_sink_has_filter_attached(pa_sink *s) {
 pa_sink *pa_sink_get_master(pa_sink *s) {
     pa_sink_assert_ref(s);
 
-    /* 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->flags & PA_SINK_SHARE_VOLUME_WITH_MASTER)) {
-        if (PA_UNLIKELY(s->vsink && !s->vsink->input_to_master))
-            return NULL;
-        if (PA_UNLIKELY(!s->vsink && !s->input_to_master))
+        if (PA_UNLIKELY(!s->vsink || (s->vsink && !s->vsink->input_to_master)))
             return NULL;
 
-        if (s->input_to_master)
-            s = s->input_to_master->sink;
-        else
-            s = s->vsink->input_to_master->sink;
+        s = s->vsink->input_to_master->sink;
     }
 
     return s;
@@ -1715,7 +1706,7 @@ pa_sink *pa_sink_get_master(pa_sink *s) {
 bool pa_sink_is_filter(pa_sink *s) {
     pa_sink_assert_ref(s);
 
-    return ((s->vsink != NULL) || (s->input_to_master != NULL));
+    return ((s->vsink != NULL) && (s->vsink->input_to_master != NULL));
 }
 
 /* Called from main context */
diff --git a/src/pulsecore/sink.h b/src/pulsecore/sink.h
index f4db8158d..1cc44fefc 100644
--- a/src/pulsecore/sink.h
+++ b/src/pulsecore/sink.h
@@ -173,7 +173,6 @@ struct pa_sink {
     unsigned n_corked;
     pa_source *monitor_source;
     pa_vsink *vsink;                        /* non-NULL only for filter sinks */
-    pa_sink_input *input_to_master;         /* non-NULL only for filter sinks */
 
     pa_volume_t base_volume; /* shall be constant */
     unsigned n_volume_steps; /* shall be constant */