Rename TYPE_DEBUG_PLAYER to TYPE_DEBUG_VIDEO_VIEW.

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

diff --git a/src/lib/audio_analysis.h b/src/lib/audio_analysis.h
index 0a5e6194dfccf13f396cd8e02f9f1e08715ed1a3..99a69edb4c26dfccccb77cd81c48e069301a436f 100644 (file)
--- a/src/lib/audio_analysis.h
+++ b/src/lib/audio_analysis.h
@@ -43,13 +43,13 @@ public:
        void add_point (int c, AudioPoint const & p);
 
        struct PeakTime {
-               PeakTime (float p, DCPTime t)
+               PeakTime (float p, dcpomatic::DCPTime t)
                        : peak (p)
                        , time (t)
                {}
 
                float peak;
-               DCPTime time;
+               dcpomatic::DCPTime time;
        };
 
        void set_sample_peak (std::vector<PeakTime> peak) {
@@ -100,7 +100,7 @@ public:
                _analysis_gain = gain;
        }
 
-       boost::optional<int64_t> samples_per_point () const {
+       int64_t samples_per_point () const {
                return _samples_per_point;
        }
 
@@ -108,7 +108,7 @@ public:
                _samples_per_point = spp;
        }
 
-       boost::optional<int> sample_rate () const {
+       int sample_rate () const {
                return _sample_rate;
        }
 
@@ -116,6 +116,14 @@ public:
                _sample_rate = sr;
        }
 
+       void set_leqm (double leqm) {
+               _leqm = leqm;
+       }
+
+       boost::optional<double> leqm () const {
+               return _leqm;
+       }
+
        void write (boost::filesystem::path);
 
        float gain_correction (boost::shared_ptr<const Playlist> playlist);
@@ -126,13 +134,14 @@ private:
        std::vector<float> _true_peak;
        boost::optional<float> _integrated_loudness;
        boost::optional<float> _loudness_range;
+       boost::optional<double> _leqm;
        /** 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;
-       boost::optional<int64_t> _samples_per_point;
-       boost::optional<int> _sample_rate;
+       int64_t _samples_per_point;
+       int _sample_rate;
 
        static int const _current_state_version;
 };