X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Faudio_analysis.h;h=0d06e5973eca297bcf6d6e4f1240059ab2b68691;hp=1872c57ad3c2207060c41d54378305c735492a4c;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hpb=fc96a4b3d6985f28db6bc0e9418e98cc5bec87e3

diff --git a/src/lib/audio_analysis.h b/src/lib/audio_analysis.h
index 1872c57ad..0d06e5973 100644
--- a/src/lib/audio_analysis.h
+++ b/src/lib/audio_analysis.h
@@ -17,53 +17,22 @@
 
 */
 
-/** @file  src/lib/audio_analysis.h
- *  @brief AudioAnalysis and AudioPoint classes.
- */
-
 #ifndef DCPOMATIC_AUDIO_ANALYSIS_H
 #define DCPOMATIC_AUDIO_ANALYSIS_H
 
-#include "types.h"
-#include <boost/filesystem.hpp>
+#include "dcpomatic_time.h"
+#include "audio_point.h"
+#include <libcxml/cxml.h>
 #include <boost/optional.hpp>
+#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:
-	enum Type {
-		PEAK,
-		RMS,
-		COUNT
-	};
-
-	AudioPoint ();
-	AudioPoint (FILE *);
-	AudioPoint (AudioPoint const &);
-	AudioPoint& operator= (AudioPoint const &);
-
-	void write (FILE *) const;
-	
-	float& operator[] (int t) {
-		return _data[t];
-	}
+namespace xmlpp {
+	class Element;
+}
 
-private:
-	float _data[COUNT];
-};
+class Playlist;
 
-/** @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:
@@ -75,7 +44,7 @@ public:
 		_peak = peak;
 		_peak_time = time;
 	}
-	
+
 	AudioPoint get_point (int c, int p) const;
 	int points (int c) const;
 	int channels () const;
@@ -88,12 +57,27 @@ public:
 		return _peak_time;
 	}
 
+	boost::optional<double> analysis_gain () const {
+		return _analysis_gain;
+	}
+
+	void set_analysis_gain (double gain) {
+		_analysis_gain = gain;
+	}
+
 	void write (boost::filesystem::path);
 
+	float gain_correction (boost::shared_ptr<const Playlist> playlist);
+
 private:
 	std::vector<std::vector<AudioPoint> > _data;
 	boost::optional<float> _peak;
 	boost::optional<DCPTime> _peak_time;
+	/** If this analysis was run on a single piece of
+	 *  content we store its gain in dB when the analysis
+	 *  happened.
+	 */
+	boost::optional<double> _analysis_gain;
 };
 
 #endif