Use dcp::file_to_string().

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

diff --git a/src/lib/audio_analysis.h b/src/lib/audio_analysis.h
index 0a5e6194dfccf13f396cd8e02f9f1e08715ed1a3..038059502b225f44de78208bd32913cfd722b631 100644 (file)
--- a/src/lib/audio_analysis.h
+++ b/src/lib/audio_analysis.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,9 +18,11 @@
 
 */
 
+
 #ifndef DCPOMATIC_AUDIO_ANALYSIS_H
 #define DCPOMATIC_AUDIO_ANALYSIS_H
 
+
 #include "dcpomatic_time.h"
 #include "audio_point.h"
 #include <libcxml/cxml.h>
@@ -28,13 +30,16 @@
 #include <boost/filesystem.hpp>
 #include <vector>
 
+
 namespace xmlpp {
        class Element;
 }
 
+
 class Playlist;
 
-class AudioAnalysis : public boost::noncopyable
+
+class AudioAnalysis
 {
 public:
        explicit AudioAnalysis (int c);
@@ -43,13 +48,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 +105,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 +113,7 @@ public:
                _samples_per_point = spp;
        }
 
-       boost::optional<int> sample_rate () const {
+       int sample_rate () const {
                return _sample_rate;
        }
 
@@ -116,25 +121,35 @@ 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);
+       float gain_correction (std::shared_ptr<const Playlist> playlist);
 
 private:
-       std::vector<std::vector<AudioPoint> > _data;
+       std::vector<std::vector<AudioPoint>> _data;
        std::vector<PeakTime> _sample_peak;
        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 = 0;
+       int _sample_rate = 0;
 
        static int const _current_state_version;
 };
 
+
 #endif