projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Possibly improve shuffler behaviour (use one for all content if any 3D is present).
[dcpomatic.git]
/
src
/
lib
/
audio_filter.cc
diff --git
a/src/lib/audio_filter.cc
b/src/lib/audio_filter.cc
index 281ac966831c8e80de73609a96a12132a763d67a..ed4657328374f63e0055c79431891f631fa7c9ed 100644
(file)
--- a/
src/lib/audio_filter.cc
+++ b/
src/lib/audio_filter.cc
@@
-21,6
+21,7
@@
#include "audio_filter.h"
#include "audio_buffers.h"
#include "audio_filter.h"
#include "audio_buffers.h"
+#include "maths_util.h"
#include "util.h"
#include <cmath>
#include "util.h"
#include <cmath>
@@
-30,11
+31,11
@@
using std::min;
using std::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
{
AudioFilter::sinc_blackman (float cutoff, bool invert) const
{
- float* ir = new float[_M + 1];
+ auto ir = std::vector<float>();
+ ir.reserve(_M + 1);
/* Impulse response */
/* Impulse response */
@@
-73,12
+74,6
@@
AudioFilter::sinc_blackman (float cutoff, bool invert) const
}
}
-AudioFilter::~AudioFilter ()
-{
- delete[] _ir;
-}
-
-
shared_ptr<AudioBuffers>
AudioFilter::run (shared_ptr<const AudioBuffers> in)
{
shared_ptr<AudioBuffers>
AudioFilter::run (shared_ptr<const AudioBuffers> in)
{
@@
-147,15
+142,11
@@
BandPassAudioFilter::BandPassAudioFilter (float transition_bandwidth, float lowe
auto lpf = sinc_blackman (lower, false);
auto 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.reserve (_M + 1);
for (int i = 0; i <= _M; ++i) {
_ir[i] = lpf[i] + hpf[i];
}
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];
/* We now have a band-stop, so invert for band-pass */
for (int i = 0; i <= _M; ++i) {
_ir[i] = -_ir[i];