Barely-functioning GL playback with new arrangement.

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

diff --git a/src/lib/audio_filter.cc b/src/lib/audio_filter.cc
index 4203d074c148be49a25ee610e19c1b3574ebf9bd..3d3ecdfbb3deed7bfef315818646ffaf12e0dac3 100644 (file)
--- a/src/lib/audio_filter.cc
+++ b/src/lib/audio_filter.cc
@@ -20,12 +20,11 @@
 
 #include "audio_filter.h"
 #include "audio_buffers.h"
-#include <boost/make_shared.hpp>
+#include "util.h"
 #include <cmath>
 
 using std::min;
 using boost::shared_ptr;
-using boost::make_shared;
 
 /** @return array of floats which the caller must destroy with delete[] */
 float *
@@ -77,7 +76,7 @@ AudioFilter::~AudioFilter ()
 shared_ptr<AudioBuffers>
 AudioFilter::run (shared_ptr<const AudioBuffers> in)
 {
-       shared_ptr<AudioBuffers> out = make_shared<AudioBuffers> (in->channels(), in->frames());
+       shared_ptr<AudioBuffers> out (new AudioBuffers (in->channels(), in->frames()));
 
        if (!_tail) {
                _tail.reset (new AudioBuffers (in->channels(), _M + 1));
@@ -107,7 +106,7 @@ AudioFilter::run (shared_ptr<const AudioBuffers> in)
 
        int const amount = min (in->frames(), _tail->frames());
        if (amount < _tail->frames ()) {
-               _tail->move (amount, 0, _tail->frames() - amount);
+               _tail->move (_tail->frames() - amount, amount, 0);
        }
        _tail->copy_from (in.get(), amount, in->frames() - amount, _tail->frames () - amount);