X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_analysis.cc;h=78e5741e59f5b2cc365b6b9054186016b34fa429;hb=a49c3824e1b88e37a58a05b9142008ccd192d3d3;hp=b58a3127d2d5a7af0d9dc8b53638100772b88453;hpb=f0192490565c72aa9838f40cbab56c4c0c60e522;p=dcpomatic.git

diff --git a/src/lib/audio_analysis.cc b/src/lib/audio_analysis.cc
index b58a3127d..78e5741e5 100644
--- a/src/lib/audio_analysis.cc
+++ b/src/lib/audio_analysis.cc
@@ -47,7 +47,7 @@ using boost::optional;
 using boost::dynamic_pointer_cast;
 using dcp::raw_convert;
 
-int const AudioAnalysis::_current_state_version = 2;
+int const AudioAnalysis::_current_state_version = 3;
 
 AudioAnalysis::AudioAnalysis (int channels)
 {
@@ -90,8 +90,8 @@ 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.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
@@ -158,13 +158,8 @@ AudioAnalysis::write (boost::filesystem::path filename)
 		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 ());
 }