Barely-functioning GL playback with new arrangement.

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

diff --git a/src/lib/audio_analysis.h b/src/lib/audio_analysis.h
index 9594534960a311aa2fdac83d2d6d1ca98e32d584..3684db96abdd97bfd48fa3693c3e2b46abcc5ecf 100644 (file)
--- a/src/lib/audio_analysis.h
+++ b/src/lib/audio_analysis.h
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -36,17 +37,26 @@ class Playlist;
 class AudioAnalysis : public boost::noncopyable
 {
 public:
-       AudioAnalysis (int c);
-       AudioAnalysis (boost::filesystem::path);
+       explicit AudioAnalysis (int c);
+       explicit AudioAnalysis (boost::filesystem::path);
 
        void add_point (int c, AudioPoint const & p);
 
-       void set_sample_peak (float peak, DCPTime time) {
+       struct PeakTime {
+               PeakTime (float p, dcpomatic::DCPTime t)
+                       : peak (p)
+                       , time (t)
+               {}
+
+               float peak;
+               dcpomatic::DCPTime time;
+       };
+
+       void set_sample_peak (std::vector<PeakTime> peak) {
                _sample_peak = peak;
-               _sample_peak_time = time;
        }
 
-       void set_true_peak (float peak) {
+       void set_true_peak (std::vector<float> peak) {
                _true_peak = peak;
        }
 
@@ -62,18 +72,18 @@ public:
        int points (int c) const;
        int channels () const;
 
-       boost::optional<float> sample_peak () const {
+       std::vector<PeakTime> sample_peak () const {
                return _sample_peak;
        }
 
-       boost::optional<DCPTime> sample_peak_time () const {
-               return _sample_peak_time;
-       }
+       std::pair<PeakTime, int> overall_sample_peak () const;
 
-       boost::optional<float> true_peak () const {
+       std::vector<float> true_peak () const {
                return _true_peak;
        }
 
+       boost::optional<float> overall_true_peak () const;
+
        boost::optional<float> integrated_loudness () const {
                return _integrated_loudness;
        }
@@ -90,15 +100,30 @@ public:
                _analysis_gain = gain;
        }
 
+       int64_t samples_per_point () const {
+               return _samples_per_point;
+       }
+
+       void set_samples_per_point (int64_t spp) {
+               _samples_per_point = spp;
+       }
+
+       int sample_rate () const {
+               return _sample_rate;
+       }
+
+       void set_sample_rate (int sr) {
+               _sample_rate = sr;
+       }
+
        void write (boost::filesystem::path);
 
        float gain_correction (boost::shared_ptr<const Playlist> playlist);
 
 private:
        std::vector<std::vector<AudioPoint> > _data;
-       boost::optional<float> _sample_peak;
-       boost::optional<DCPTime> _sample_peak_time;
-       boost::optional<float> _true_peak;
+       std::vector<PeakTime> _sample_peak;
+       std::vector<float> _true_peak;
        boost::optional<float> _integrated_loudness;
        boost::optional<float> _loudness_range;
        /** If this analysis was run on a single piece of
@@ -106,6 +131,10 @@ private:
         *  happened.
         */
        boost::optional<double> _analysis_gain;
+       int64_t _samples_per_point;
+       int _sample_rate;
+
+       static int const _current_state_version;
 };
 
 #endif