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 ec6905105934cf5cc78b3a48d736a98806c51001..0d06e5973eca297bcf6d6e4f1240059ab2b68691 100644 (file)
--- 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-2015 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
@@ -20,48 +20,64 @@
 #ifndef DCPOMATIC_AUDIO_ANALYSIS_H
 #define DCPOMATIC_AUDIO_ANALYSIS_H
 
-#include <iostream>
+#include "dcpomatic_time.h"
+#include "audio_point.h"
+#include <libcxml/cxml.h>
+#include <boost/optional.hpp>
+#include <boost/filesystem.hpp>
 #include <vector>
-#include <list>
 
-class AudioPoint
-{
-public:
-       enum Type {
-               PEAK,
-               RMS,
-               COUNT
-       };
-
-       AudioPoint ();
-       AudioPoint (std::istream &);
-
-       void write (std::ostream &) const;
-       
-       float& operator[] (int t) {
-               return _data[t];
-       }
+namespace xmlpp {
+       class Element;
+}
 
-private:
-       float _data[COUNT];
-};
+class Playlist;
 
-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);
-       
+       void set_peak (float peak, DCPTime time) {
+               _peak = peak;
+               _peak_time = time;
+       }
+
        AudioPoint get_point (int c, int p) const;
        int points (int c) const;
        int channels () const;
 
-       void write (std::string);
+       boost::optional<float> peak () const {
+               return _peak;
+       }
+
+       boost::optional<DCPTime> peak_time () const {
+               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