[pulseaudio-commits] r1240 - in /trunk/src/pulsecore: sink-input.c sink-input.h

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Sun Aug 13 19:30:51 2006
New Revision: 1240

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=1240&root=pulseaudio&view=rev
Log:
remove pa_sink_input::variable_rate field since it has been folded into pa_sink_input::flags

Modified:
    trunk/src/pulsecore/sink-input.c
    trunk/src/pulsecore/sink-input.h

Modified: trunk/src/pulsecore/sink-input.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sink-input.c?rev=1240&root=pulseaudio&r1=1239&r2=1240&view=diff
==============================================================================
--- trunk/src/pulsecore/sink-input.c (original)
+++ trunk/src/pulsecore/sink-input.c Sun Aug 13 19:30:51 2006
@@ -532,7 +532,7 @@
         /* 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)) {
 

Modified: trunk/src/pulsecore/sink-input.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/sink-input.h?rev=1240&root=pulseaudio&r1=1239&r2=1240&view=diff
==============================================================================
--- trunk/src/pulsecore/sink-input.h (original)
+++ trunk/src/pulsecore/sink-input.h Sun Aug 13 19:30:51 2006
@@ -79,7 +79,6 @@
     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 */