X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_analysis.h;h=824472dda08c80daf1037a0f5635b5db7eefa556;hb=2d5b8cdde08044d323aa7193dfac6c9f8bca7131;hp=a8cfbdeca81a6132afa74004c2a36dc429b2e4db;hpb=1fadfdf60bb2c02086c2c9689ea44c73bed41571;p=dcpomatic.git

diff --git a/src/lib/audio_analysis.h b/src/lib/audio_analysis.h
index a8cfbdeca..824472dda 100644
--- a/src/lib/audio_analysis.h
+++ b/src/lib/audio_analysis.h
@@ -17,12 +17,12 @@
 
 */
 
-#ifndef DVDOMATIC_AUDIO_ANALYSIS_H
-#define DVDOMATIC_AUDIO_ANALYSIS_H
+#ifndef DCPOMATIC_AUDIO_ANALYSIS_H
+#define DCPOMATIC_AUDIO_ANALYSIS_H
 
-#include <iostream>
 #include <vector>
 #include <list>
+#include <boost/filesystem.hpp>
 
 class AudioPoint
 {
@@ -34,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];
@@ -46,11 +48,11 @@ private:
 	float _data[COUNT];
 };
 
-class AudioAnalysis
+class AudioAnalysis : public boost::noncopyable
 {
 public:
 	AudioAnalysis (int c);
-	AudioAnalysis (std::string);
+	AudioAnalysis (boost::filesystem::path);
 
 	void add_point (int c, AudioPoint const & p);
 	
@@ -58,9 +60,7 @@ public:
 	int points (int c) const;
 	int channels () const;
 
-	void write (std::string);
-
-	static float smooth (std::list<float> const &, AudioPoint::Type);
+	void write (boost::filesystem::path);
 
 private:
 	std::vector<std::vector<AudioPoint> > _data;