/*
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/>.
*/
_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");
}
}
}
- 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) {
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;