mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-23 06:59:53 -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

10
src/modules/module-filter-apply.c
View file

@ -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)) { if (pa_streq(module_name, si->sink->module->name)) {
/* Make sure we're not routing to another instance of /* Make sure we're not routing to another instance of
* the same filter. */ * the same filter. */
if (si->sink->vsink) filter->sink_master = si->sink->vsink->input_to_master->sink;
filter->sink_master = si->sink->vsink->input_to_master->sink;
else
filter->sink_master = si->sink->input_to_master->sink;
} else { } else {
filter->sink_master = si->sink; 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) { if (sink->module == m) {
pa_assert(pa_sink_is_filter(sink)); pa_assert(pa_sink_is_filter(sink));
if (sink->vsink) fltr = filter_new(name, parameters, sink->vsink->input_to_master->sink, NULL);
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->module_index = m->index; fltr->module_index = m->index;
fltr->sink = sink; fltr->sink = sink;

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

15
src/pulsecore/sink.c
View file

@ -286,7 +286,6 @@ pa_sink* pa_sink_new(
s->inputs = pa_idxset_new(NULL, NULL); s->inputs = pa_idxset_new(NULL, NULL);
s->n_corked = 0; s->n_corked = 0;
s->input_to_master = NULL;
s->vsink = NULL; s->vsink = NULL;
s->reference_volume = s->real_volume = data->volume; 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 *pa_sink_get_master(pa_sink *s) {
pa_sink_assert_ref(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)) { while (s && (s->flags & PA_SINK_SHARE_VOLUME_WITH_MASTER)) {
if (PA_UNLIKELY(s->vsink && !s->vsink->input_to_master)) if (PA_UNLIKELY(!s->vsink || (s->vsink && !s->vsink->input_to_master)))
return NULL;
if (PA_UNLIKELY(!s->vsink && !s->input_to_master))
return NULL; return NULL;
if (s->input_to_master) s = s->vsink->input_to_master->sink;
s = s->input_to_master->sink;
else
s = s->vsink->input_to_master->sink;
} }
return s; return s;
@ -1715,7 +1706,7 @@ pa_sink *pa_sink_get_master(pa_sink *s) {
bool pa_sink_is_filter(pa_sink *s) { bool pa_sink_is_filter(pa_sink *s) {
pa_sink_assert_ref(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 */ /* Called from main context */

1
src/pulsecore/sink.h
View file

@ -173,7 +173,6 @@ struct pa_sink {
unsigned n_corked; unsigned n_corked;
pa_source *monitor_source; pa_source *monitor_source;
pa_vsink *vsink; /* non-NULL only for filter sinks */ 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 */ pa_volume_t base_volume; /* shall be constant */
unsigned n_volume_steps; /* shall be constant */ unsigned n_volume_steps; /* shall be constant */