X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_analysis.cc;h=1863e38eeae85bf633c79151dc335fd4e3d9be09;hb=97c1bc360f912d66d3fc0430b331214e4da79644;hp=10e02232292c30f9dbf17975f49a8c0e88d388d4;hpb=b0834f33e972a6e7b0d234d09e420007943a136d;p=dcpomatic.git

diff --git a/src/lib/audio_analysis.cc b/src/lib/audio_analysis.cc
index 10e022322..1863e38ee 100644
--- a/src/lib/audio_analysis.cc
+++ b/src/lib/audio_analysis.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 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/>.
 
 */
 
@@ -62,8 +63,22 @@ AudioAnalysis::AudioAnalysis (boost::filesystem::path filename)
 		_data.push_back (channel);
 	}
 
-	_peak = f.number_child<float> ("Peak");
-	_peak_time = DCPTime (f.number_child<DCPTime::Type> ("PeakTime"));
+	_sample_peak = f.optional_number_child<float> ("Peak");
+	if (!_sample_peak) {
+		/* New key */
+		_sample_peak = f.optional_number_child<float> ("SamplePeak");
+	}
+
+	if (f.optional_number_child<DCPTime::Type> ("PeakTime")) {
+		_sample_peak_time = DCPTime (f.number_child<DCPTime::Type> ("PeakTime"));
+	} else if (f.optional_number_child<DCPTime::Type> ("SamplePeakTime")) {
+		_sample_peak_time = DCPTime (f.number_child<DCPTime::Type> ("SamplePeakTime"));
+	}
+
+	_true_peak = f.optional_number_child<float> ("TruePeak");
+	_integrated_loudness = f.optional_number_child<float> ("IntegratedLoudness");
+	_loudness_range = f.optional_number_child<float> ("LoudnessRange");
+
 	_analysis_gain = f.optional_number_child<double> ("AnalysisGain");
 }
 
@@ -107,9 +122,21 @@ AudioAnalysis::write (boost::filesystem::path filename)
 		}
 	}
 
-	if (_peak) {
-		root->add_child("Peak")->add_child_text (raw_convert<string> (_peak.get ()));
-		root->add_child("PeakTime")->add_child_text (raw_convert<string> (_peak_time.get().get ()));
+	if (_sample_peak) {
+		root->add_child("SamplePeak")->add_child_text (raw_convert<string> (_sample_peak.get ()));
+		root->add_child("SamplePeakTime")->add_child_text (raw_convert<string> (_sample_peak_time.get().get ()));
+	}
+
+	if (_true_peak) {
+		root->add_child("TruePeak")->add_child_text (raw_convert<string> (_true_peak.get ()));
+	}
+
+	if (_integrated_loudness) {
+		root->add_child("IntegratedLoudness")->add_child_text (raw_convert<string> (_integrated_loudness.get ()));
+	}
+
+	if (_loudness_range) {
+		root->add_child("LoudnessRange")->add_child_text (raw_convert<string> (_loudness_range.get ()));
 	}
 
 	if (_analysis_gain) {
@@ -127,9 +154,8 @@ AudioAnalysis::gain_correction (shared_ptr<const Playlist> playlist)
 		   we know that content's gain when the analysis was run.  Hence we can work out
 		   what correction is now needed to make it look `right'.
 		*/
-		shared_ptr<const AudioContent> ac = dynamic_pointer_cast<const AudioContent> (playlist->content().front ());
-		DCPOMATIC_ASSERT (ac);
-		return ac->audio_gain() - analysis_gain().get ();
+		DCPOMATIC_ASSERT (playlist->content().front()->audio);
+		return playlist->content().front()->audio->gain() - analysis_gain().get ();
 	}
 
 	return 0.0f;