C++11 tidying.

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

diff --git a/src/lib/audio_filter.h b/src/lib/audio_filter.h
index 9dfcec58bbe589d9325cf9ef45b5cfc3af206e72..922cc5fdb483fdec278721becf8f4528776600dd 100644 (file)
--- a/src/lib/audio_filter.h
+++ b/src/lib/audio_filter.h
@@ -1,33 +1,41 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include <vector>
-#include <boost/shared_ptr.hpp>
+#ifndef DCPOMATIC_AUDIO_FILTER_H
+#define DCPOMATIC_AUDIO_FILTER_H
+
+
+#include <memory>
+
 
 class AudioBuffers;
-class audio_filter_impulse_kernel_test;
-class audio_filter_impulse_input_test;
+struct audio_filter_impulse_input_test;
+
 
+/** An audio filter which can take AudioBuffers and apply some filtering operation,
+ *  returning filtered samples
+ */
 class AudioFilter
 {
 public:
-       AudioFilter (float transition_bandwidth)
+       explicit AudioFilter (float transition_bandwidth)
        {
                _M = 4 / transition_bandwidth;
                if (_M % 2) {
@@ -35,19 +43,24 @@ public:
                }
        }
 
-       boost::shared_ptr<AudioBuffers> run (boost::shared_ptr<AudioBuffers> in);
+       virtual ~AudioFilter ();
+
+       std::shared_ptr<AudioBuffers> run (std::shared_ptr<const AudioBuffers> in);
+
+       void flush ();
 
 protected:
-       friend class audio_filter_impulse_kernel_test;
-       friend class audio_filter_impulse_input_test;
+       friend struct audio_filter_impulse_kernel_test;
+       friend struct audio_filter_impulse_input_test;
 
-       std::vector<float> sinc_blackman (float cutoff, bool invert) const;
+       float* sinc_blackman (float cutoff, bool invert) const;
 
-       std::vector<float> _ir;
+       float* _ir = nullptr;
        int _M;
-       boost::shared_ptr<AudioBuffers> _tail;
+       std::shared_ptr<AudioBuffers> _tail;
 };
 
+
 class LowPassAudioFilter : public AudioFilter
 {
 public:
@@ -58,6 +71,7 @@ public:
        LowPassAudioFilter (float transition_bandwidth, float cutoff);
 };
 
+
 class HighPassAudioFilter : public AudioFilter
 {
 public:
@@ -68,6 +82,7 @@ public:
        HighPassAudioFilter (float transition_bandwidth, float cutoff);
 };
 
+
 class BandPassAudioFilter : public AudioFilter
 {
 public:
@@ -78,3 +93,6 @@ public:
         */
        BandPassAudioFilter (float transition_bandwidth, float lower, float higher);
 };
+
+
+#endif