Bump audio analysis file version and cache drawn points in the audio plot.

2 files changed, 9 insertions, 14 deletions

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 ());
 }
diff --git a/src/lib/audio_analysis.h b/src/lib/audio_analysis.h
index 0a5e6194d..e5ee24d49 100644
--- a/src/lib/audio_analysis.h
+++ b/src/lib/audio_analysis.h
@@ -100,7 +100,7 @@ public:
 		_analysis_gain = gain;
 	}
 
-	boost::optional<int64_t> samples_per_point () const {
+	int64_t samples_per_point () const {
 		return _samples_per_point;
 	}
 
@@ -108,7 +108,7 @@ public:
 		_samples_per_point = spp;
 	}
 
-	boost::optional<int> sample_rate () const {
+	int sample_rate () const {
 		return _sample_rate;
 	}
 
@@ -131,8 +131,8 @@ private:
 	 *  happened.
 	 */
 	boost::optional<double> _analysis_gain;
-	boost::optional<int64_t> _samples_per_point;
-	boost::optional<int> _sample_rate;
+	int64_t _samples_per_point;
+	int _sample_rate;
 
 	static int const _current_state_version;
 };