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)
{
_loudness_range = f.optional_number_child<float> ("LoudnessRange");
_analysis_gain = f.optional_number_child<double> ("AnalysisGain");
- _samples_per_point = f.optional_number_child<int64_t> ("SamplesPerPoint");
- _sample_rate = f.optional_number_child<int64_t> ("SampleRate");
+ _samples_per_point = f.number_child<int64_t> ("SamplesPerPoint");
+ _sample_rate = f.number_child<int64_t> ("SampleRate");
}
void
root->add_child("AnalysisGain")->add_child_text (raw_convert<string> (_analysis_gain.get ()));
}
- if (_samples_per_point) {
- root->add_child("SamplesPerPoint")->add_child_text (raw_convert<string> (_samples_per_point.get()));
- }
-
- if (_sample_rate) {
- root->add_child("SampleRate")->add_child_text (raw_convert<string> (_sample_rate.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));
doc->write_to_file_formatted (filename.string ());
}