Add a 'Make DKDM' dialogue box to simplify and (hopefully) clarify DKDM creation...

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

diff --git a/src/lib/audio_analysis.cc b/src/lib/audio_analysis.cc
index 16deacbd14582b4e85e32263bebc1b11514f2959..446fcccef1607323d7851dbffe98114cda5fb841 100644 (file)
--- a/src/lib/audio_analysis.cc
+++ b/src/lib/audio_analysis.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -46,8 +46,9 @@ using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
 using dcp::raw_convert;
+using namespace dcpomatic;
 
-int const AudioAnalysis::_current_state_version = 2;
+int const AudioAnalysis::_current_state_version = 3;
 
 AudioAnalysis::AudioAnalysis (int channels)
 {
@@ -90,6 +91,10 @@ AudioAnalysis::AudioAnalysis (boost::filesystem::path filename)
        _loudness_range = f.optional_number_child<float> ("LoudnessRange");
 
        _analysis_gain = f.optional_number_child<double> ("AnalysisGain");
+       _samples_per_point = f.number_child<int64_t> ("SamplesPerPoint");
+       _sample_rate = f.number_child<int64_t> ("SampleRate");
+
+       _leqm = f.optional_number_child<double>("Leqm");
 }
 
 void
@@ -156,6 +161,13 @@ AudioAnalysis::write (boost::filesystem::path filename)
                root->add_child("AnalysisGain")->add_child_text (raw_convert<string> (_analysis_gain.get ()));
        }
 
+       root->add_child("SamplesPerPoint")->add_child_text (raw_convert<string> (_samples_per_point));
+       root->add_child("SampleRate")->add_child_text (raw_convert<string> (_sample_rate));
+
+       if (_leqm) {
+               root->add_child("Leqm")->add_child_text(raw_convert<string>(*_leqm));
+       }
+
        doc->write_to_file_formatted (filename.string ());
 }
 
@@ -181,7 +193,7 @@ AudioAnalysis::overall_sample_peak () const
        DCPOMATIC_ASSERT (!_sample_peak.empty ());
 
        optional<PeakTime> pt;
-       int c;
+       int c = 0;
 
        for (size_t i = 0; i < _sample_peak.size(); ++i) {
                if (!pt || _sample_peak[i].peak > pt->peak) {
@@ -206,3 +218,4 @@ AudioAnalysis::overall_true_peak () const
 
        return p;
 }
+