X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_filter.cc;h=94994ba81036fd1fad2fa16785d37d76ec0d76bb;hb=ff639b3cf30afcc097bfd21d39c8d15f466cadd6;hp=3d3ecdfbb3deed7bfef315818646ffaf12e0dac3;hpb=ed60d1051a1b85da4f4b7ac2240c46fbb8d6ca60;p=dcpomatic.git

diff --git a/src/lib/audio_filter.cc b/src/lib/audio_filter.cc
index 3d3ecdfbb..94994ba81 100644
--- 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,19 +18,24 @@
 
 */
 
+
 #include "audio_filter.h"
 #include "audio_buffers.h"
+#include "maths_util.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 *
+std::vector<float>
 AudioFilter::sinc_blackman (float cutoff, bool invert) const
 {
-	float* ir = new float[_M + 1];
+	auto ir = std::vector<float>();
+	ir.resize(_M + 1);
 
 	/* Impulse response */
 
@@ -68,18 +73,14 @@ 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));
+		_tail = make_shared<AudioBuffers>(in->channels(), _M + 1);
 		_tail->make_silent ();
 	}
 
@@ -87,9 +88,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) {
@@ -113,12 +114,14 @@ AudioFilter::run (shared_ptr<const AudioBuffers> in)
 	return out;
 }
 
+
 void
 AudioFilter::flush ()
 {
 	_tail.reset ();
 }
 
+
 LowPassAudioFilter::LowPassAudioFilter (float transition_bandwidth, float cutoff)
 	: AudioFilter (transition_bandwidth)
 {
@@ -132,21 +135,18 @@ 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];
+	_ir.resize(_M + 1);
 	for (int i = 0; i <= _M; ++i) {
 		_ir[i] = lpf[i] + hpf[i];
 	}
 
-	delete[] lpf;
-	delete[] hpf;
-
 	/* We now have a band-stop, so invert for band-pass */
 	for (int i = 0; i <= _M; ++i) {
 		_ir[i] = -_ir[i];