From 72cf2118df6a3cb0515bcb426e2dc57c781fa2b1 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 13 Aug 2006 17:30:51 +0000 Subject: remove pa_sink_input::variable_rate field since it has been folded into pa_sink_input::flags git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1240 fefdeb5f-60dc-0310-8127-8f9354f1896f --- src/pulsecore/sink-input.c | 2 +- src/pulsecore/sink-input.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'src/pulsecore') diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c index ff5213e1..21050d22 100644 --- a/src/pulsecore/sink-input.c +++ b/src/pulsecore/sink-input.c @@ -532,7 +532,7 @@ int pa_sink_input_move_to(pa_sink_input *i, pa_sink *dest, int immediately) { /* Try to reuse the old resampler if possible */ new_resampler = i->resampler; - else if (i->variable_rate || + else if ((i->flags & PA_SINK_INPUT_VARIABLE_RATE) || !pa_sample_spec_equal(&i->sample_spec, &dest->sample_spec) || !pa_channel_map_equal(&i->channel_map, &dest->channel_map)) { diff --git a/src/pulsecore/sink-input.h b/src/pulsecore/sink-input.h index 243978fe..da0c2662 100644 --- a/src/pulsecore/sink-input.h +++ b/src/pulsecore/sink-input.h @@ -79,7 +79,6 @@ struct pa_sink_input { pa_memchunk resampled_chunk; pa_resampler *resampler; /* may be NULL */ - int variable_rate; pa_resample_method_t resample_method; pa_memblock *silence_memblock; /* may be NULL */ -- cgit