X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_analysis.h;h=3684db96abdd97bfd48fa3693c3e2b46abcc5ecf;hb=25d968fdcf1abada4bd7bbcb8c72eeebda73b134;hp=0a5e6194dfccf13f396cd8e02f9f1e08715ed1a3;hpb=f0192490565c72aa9838f40cbab56c4c0c60e522;p=dcpomatic.git

diff --git a/src/lib/audio_analysis.h b/src/lib/audio_analysis.h
index 0a5e6194d..3684db96a 100644
--- a/src/lib/audio_analysis.h
+++ b/src/lib/audio_analysis.h
@@ -43,13 +43,13 @@ public:
 	void add_point (int c, AudioPoint const & p);
 
 	struct PeakTime {
-		PeakTime (float p, DCPTime t)
+		PeakTime (float p, dcpomatic::DCPTime t)
 			: peak (p)
 			, time (t)
 		{}
 
 		float peak;
-		DCPTime time;
+		dcpomatic::DCPTime time;
 	};
 
 	void set_sample_peak (std::vector<PeakTime> peak) {
@@ -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;
 };