C++11 tidying.

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

diff --git a/src/lib/audio_filter.cc b/src/lib/audio_filter.cc
index 44345fc9d11f4e817865a402266d2b2bedff1b41..281ac966831c8e80de73609a96a12132a763d67a 100644 (file)
--- a/src/lib/audio_filter.cc
+++ b/src/lib/audio_filter.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,12 +18,17 @@
 
 */
 
+
 #include "audio_filter.h"
 #include "audio_buffers.h"
+#include "util.h"
 #include <cmath>
 
+
+using std::make_shared;
 using std::min;
-using boost::shared_ptr;
+using std::shared_ptr;
+
 
 /** @return array of floats which the caller must destroy with delete[] */
 float *
@@ -67,15 +72,17 @@ AudioFilter::sinc_blackman (float cutoff, bool invert) const
        return ir;
 }
 
+
 AudioFilter::~AudioFilter ()
 {
        delete[] _ir;
 }
 
+
 shared_ptr<AudioBuffers>
 AudioFilter::run (shared_ptr<const AudioBuffers> in)
 {
-       shared_ptr<AudioBuffers> out (new AudioBuffers (in->channels(), in->frames()));
+       auto out = make_shared<AudioBuffers>(in->channels(), in->frames());
 
        if (!_tail) {
                _tail.reset (new AudioBuffers (in->channels(), _M + 1));
@@ -86,9 +93,9 @@ AudioFilter::run (shared_ptr<const AudioBuffers> in)
        int const frames = in->frames ();
 
        for (int i = 0; i < channels; ++i) {
-               float* tail_p = _tail->data (i);
-               float* in_p = in->data (i);
-               float* out_p = out->data (i);
+               auto tail_p = _tail->data (i);
+               auto in_p = in->data (i);
+               auto out_p = out->data (i);
                for (int j = 0; j < frames; ++j) {
                        float s = 0;
                        for (int k = 0; k <= _M; ++k) {
@@ -105,19 +112,21 @@ 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);
 
        return out;
 }
 
+
 void
 AudioFilter::flush ()
 {
        _tail.reset ();
 }
 
+
 LowPassAudioFilter::LowPassAudioFilter (float transition_bandwidth, float cutoff)
        : AudioFilter (transition_bandwidth)
 {
@@ -131,11 +140,12 @@ HighPassAudioFilter::HighPassAudioFilter (float transition_bandwidth, float cuto
        _ir = sinc_blackman (cutoff, true);
 }
 
+
 BandPassAudioFilter::BandPassAudioFilter (float transition_bandwidth, float lower, float higher)
        : AudioFilter (transition_bandwidth)
 {
-       float* lpf = sinc_blackman (lower, false);
-       float* hpf = sinc_blackman (higher, true);
+       auto lpf = sinc_blackman (lower, false);
+       auto hpf = sinc_blackman (higher, true);
 
        delete[] _ir;
        _ir = new float[_M + 1];