diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-03-01 11:36:17 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-04-19 23:04:32 +0100 |
| commit | dc78a40b0c7ce4569874fd1e77a86df907937d50 (patch) | |
| tree | 3167c3a9f047d3b5af1c5aefc7b8640f4adbf4d9 /src/lib/resampler.cc | |
| parent | 20fb703d5298c0376f1fe7c724cdc9625172e4d0 (diff) | |
Restore upmixer_a_test and fix resampler flushing.
Diffstat (limited to 'src/lib/resampler.cc')
| -rw-r--r-- | src/lib/resampler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/resampler.cc b/src/lib/resampler.cc index d08e7bc38..1a0c6073d 100644 --- 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 ()); } |