Hide some more FFmpeg warnings.

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

diff --git a/src/lib/resampler.h b/src/lib/resampler.h
index 9d620b96282ecba02139414fa5612a5d070d7d3e..5a3a7fa40406c8dca974fa61da7cb4c18a71b8f6 100644 (file)
--- a/src/lib/resampler.h
+++ b/src/lib/resampler.h
@@ -18,21 +18,26 @@
 
 */
 
+
 #include "types.h"
 #include <samplerate.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/utility.hpp>
+
 
 class AudioBuffers;
 
-class Resampler : public boost::noncopyable
+
+class Resampler
 {
 public:
        Resampler (int, int, int);
        ~Resampler ();
 
-       std::pair<boost::shared_ptr<const AudioBuffers>, Frame> run (boost::shared_ptr<const AudioBuffers>, Frame);
-       std::pair<boost::shared_ptr<const AudioBuffers>, Frame> flush ();
+       Resampler (Resampler const&) = delete;
+       Resampler& operator= (Resampler const&) = delete;
+
+       std::shared_ptr<const AudioBuffers> run (std::shared_ptr<const AudioBuffers>);
+       std::shared_ptr<const AudioBuffers> flush ();
+       void reset ();
        void set_fast ();
 
 private:
@@ -40,6 +45,4 @@ private:
        int _in_rate;
        int _out_rate;
        int _channels;
-       boost::optional<Frame> _next_in;
-       boost::optional<Frame> _next_out;
 };