X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_analysis.h;h=865d647816e00ebcb6a8dac6c617db936ddd2329;hb=78dd04db5ee5d1aa5fc915f04dc71cb53d33d059;hp=1c668b9c223daa54cbfc91e2bdadc93066148462;hpb=cf1e212c30ec7419b96388e4f78b44cb55bf34c5;p=dcpomatic.git

diff --git a/src/lib/audio_analysis.h b/src/lib/audio_analysis.h
index 1c668b9c2..865d64781 100644
--- a/src/lib/audio_analysis.h
+++ b/src/lib/audio_analysis.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,12 +17,19 @@
 
 */
 
-#ifndef DVDOMATIC_AUDIO_ANALYSIS_H
-#define DVDOMATIC_AUDIO_ANALYSIS_H
+/** @file  src/lib/audio_analysis.h
+ *  @brief AudioAnalysis and AudioPoint classes.
+ */
 
-#include <iostream>
+#ifndef DCPOMATIC_AUDIO_ANALYSIS_H
+#define DCPOMATIC_AUDIO_ANALYSIS_H
+
+#include <boost/filesystem.hpp>
 #include <vector>
 
+/** @class AudioPoint
+ *  @brief A single point of an audio analysis for one portion of one channel.
+ */
 class AudioPoint
 {
 public:
@@ -33,10 +40,13 @@ public:
 	};
 
 	AudioPoint ();
+	AudioPoint (FILE *);
+	AudioPoint (AudioPoint const &);
+	AudioPoint& operator= (AudioPoint const &);
 
-	void write (std::ostream &) const;
+	void write (FILE *) const;
 	
-	float& operator[] (Type t) {
+	float& operator[] (int t) {
 		return _data[t];
 	}
 
@@ -44,13 +54,27 @@ private:
 	float _data[COUNT];
 };
 
-class AudioAnalysis
+/** @class AudioAnalysis
+ *  @brief An analysis of the audio data in a piece of AudioContent.
+ *
+ *  This is a set of AudioPoints for each channel.  The AudioPoints
+ *  each represent some measurement of the audio over a portion of the
+ *  content.  For example each AudioPoint may give the RMS level of
+ *  a 1-minute portion of the audio.
+ */
+class AudioAnalysis : public boost::noncopyable
 {
 public:
 	AudioAnalysis (int c);
+	AudioAnalysis (boost::filesystem::path);
 
 	void add_point (int c, AudioPoint const & p);
-	void write (std::string);
+	
+	AudioPoint get_point (int c, int p) const;
+	int points (int c) const;
+	int channels () const;
+
+	void write (boost::filesystem::path);
 
 private:
 	std::vector<std::vector<AudioPoint> > _data;