pot/pot-merge.

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

diff --git a/src/lib/audio_analysis.h b/src/lib/audio_analysis.h
index d57eba90a3184200a18619bcb0ac4b0727998038..824472dda08c80daf1037a0f5635b5db7eefa556 100644 (file)
--- a/src/lib/audio_analysis.h
+++ b/src/lib/audio_analysis.h
@@ -20,7 +20,6 @@
 #ifndef DCPOMATIC_AUDIO_ANALYSIS_H
 #define DCPOMATIC_AUDIO_ANALYSIS_H
 
-#include <iostream>
 #include <vector>
 #include <list>
 #include <boost/filesystem.hpp>
@@ -35,9 +34,11 @@ public:
        };
 
        AudioPoint ();
-       AudioPoint (std::istream &);
+       AudioPoint (FILE *);
+       AudioPoint (AudioPoint const &);
+       AudioPoint& operator= (AudioPoint const &);
 
-       void write (std::ostream &) const;
+       void write (FILE *) const;
        
        float& operator[] (int t) {
                return _data[t];
@@ -47,7 +48,7 @@ private:
        float _data[COUNT];
 };
 
-class AudioAnalysis
+class AudioAnalysis : public boost::noncopyable
 {
 public:
        AudioAnalysis (int c);