X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Faudio_analysis.h;h=038059502b225f44de78208bd32913cfd722b631;hp=99a69edb4c26dfccccb77cd81c48e069301a436f;hb=da44da6f31f97d39ca91c35955e573e76371f2c2;hpb=fa5f3a8bf77209da27acc33cf144e2e4500a2600

diff --git a/src/lib/audio_analysis.h b/src/lib/audio_analysis.h
index 99a69edb4..038059502 100644
--- a/src/lib/audio_analysis.h
+++ b/src/lib/audio_analysis.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,9 +18,11 @@
 
 */
 
+
 #ifndef DCPOMATIC_AUDIO_ANALYSIS_H
 #define DCPOMATIC_AUDIO_ANALYSIS_H
 
+
 #include "dcpomatic_time.h"
 #include "audio_point.h"
 #include <libcxml/cxml.h>
@@ -28,13 +30,16 @@
 #include <boost/filesystem.hpp>
 #include <vector>
 
+
 namespace xmlpp {
 	class Element;
 }
 
+
 class Playlist;
 
-class AudioAnalysis : public boost::noncopyable
+
+class AudioAnalysis
 {
 public:
 	explicit AudioAnalysis (int c);
@@ -126,10 +131,10 @@ public:
 
 	void write (boost::filesystem::path);
 
-	float gain_correction (boost::shared_ptr<const Playlist> playlist);
+	float gain_correction (std::shared_ptr<const Playlist> playlist);
 
 private:
-	std::vector<std::vector<AudioPoint> > _data;
+	std::vector<std::vector<AudioPoint>> _data;
 	std::vector<PeakTime> _sample_peak;
 	std::vector<float> _true_peak;
 	boost::optional<float> _integrated_loudness;
@@ -140,10 +145,11 @@ private:
 	 *  happened.
 	 */
 	boost::optional<double> _analysis_gain;
-	int64_t _samples_per_point;
-	int _sample_rate;
+	int64_t _samples_per_point = 0;
+	int _sample_rate = 0;
 
 	static int const _current_state_version;
 };
 
+
 #endif