Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/audio_analysis.h b/src/lib/audio_analysis.h
index 9387ec896b67b92f072a3d31b0509a4373dc03e3..0d06e5973eca297bcf6d6e4f1240059ab2b68691 100644 (file)
--- a/src/lib/audio_analysis.h
+++ b/src/lib/audio_analysis.h
@@ -20,36 +20,18 @@
 #ifndef DCPOMATIC_AUDIO_ANALYSIS_H
 #define DCPOMATIC_AUDIO_ANALYSIS_H
 
-#include <vector>
-#include <list>
-#include <boost/filesystem.hpp>
-#include <boost/optional.hpp>
+#include "dcpomatic_time.h"
+#include "audio_point.h"
 #include <libcxml/cxml.h>
-#include "types.h"
+#include <boost/optional.hpp>
+#include <boost/filesystem.hpp>
+#include <vector>
 
-class AudioPoint
-{
-public:
-       enum Type {
-               PEAK,
-               RMS,
-               COUNT
-       };
-
-       AudioPoint ();
-       AudioPoint (cxml::ConstNodePtr node);
-       AudioPoint (AudioPoint const &);
-       AudioPoint& operator= (AudioPoint const &);
-
-       void as_xml (xmlpp::Element *) const;
-       
-       float& operator[] (int t) {
-               return _data[t];
-       }
+namespace xmlpp {
+       class Element;
+}
 
-private:
-       float _data[COUNT];
-};
+class Playlist;
 
 class AudioAnalysis : public boost::noncopyable
 {
@@ -62,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;
@@ -75,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