Restore upmixer_a_test and fix resampler flushing.

[dcpomatic.git] / src / lib / resampler.cc

diff --git a/src/lib/resampler.cc b/src/lib/resampler.cc
index d08e7bc38e22f60eab6486d4c9626dc5562837f7..1a0c6073dcb6cc8278b74007d60b74f226069ba6 100644 (file)
--- a/src/lib/resampler.cc
+++ b/src/lib/resampler.cc
@@ -160,7 +160,7 @@ Resampler::run (shared_ptr<const AudioBuffers> in, Frame frame)
        return make_pair (resampled, out_frame);
 }
 
-shared_ptr<const AudioBuffers>
+pair<shared_ptr<const AudioBuffers>, Frame>
 Resampler::flush ()
 {
        shared_ptr<AudioBuffers> out (new AudioBuffers (_channels, 0));
@@ -198,5 +198,5 @@ Resampler::flush ()
        out->set_frames (out_offset);
 
        delete[] buffer;
-       return out;
+       return make_pair (out, _next_out.get ());
 }