X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fanalyse_audio_job.h;h=864a6a7cd738442d8bd119418f7a6a866947ce28;hb=969906f2dd6c5c144781861f53e2a0f6baefb9a3;hp=8f88b0fa143d42c88d68f678c809a5c906fe1f9a;hpb=ce624e59b9dee93195d2582f7264ab398ed0d99b;p=dcpomatic.git

diff --git a/src/lib/analyse_audio_job.h b/src/lib/analyse_audio_job.h
index 8f88b0fa1..864a6a7cd 100644
--- a/src/lib/analyse_audio_job.h
+++ b/src/lib/analyse_audio_job.h
@@ -18,10 +18,13 @@
 
 */
 
+
 /** @file  src/lib/analyse_audio_job.h
  *  @brief AnalyseAudioJob class.
  */
 
+
+#include "audio_analyser.h"
 #include "job.h"
 #include "audio_point.h"
 #include "types.h"
@@ -29,6 +32,7 @@
 #include <leqm_nrt.h>
 #include <boost/scoped_ptr.hpp>
 
+
 class AudioBuffers;
 class AudioAnalysis;
 class Playlist;
@@ -36,6 +40,7 @@ class AudioPoint;
 class AudioFilterGraph;
 class Filter;
 
+
 /** @class AnalyseAudioJob
  *  @brief A job to analyse the audio of a film and make a note of its
  *  broad peak and RMS levels.
@@ -46,7 +51,7 @@ class Filter;
 class AnalyseAudioJob : public Job
 {
 public:
-	AnalyseAudioJob (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist>, bool from_zero);
+	AnalyseAudioJob (std::shared_ptr<const Film>, std::shared_ptr<const Playlist>, bool from_zero);
 	~AnalyseAudioJob ();
 
 	std::string name () const;
@@ -58,27 +63,11 @@ public:
 	}
 
 private:
-	void analyse (boost::shared_ptr<const AudioBuffers>, dcpomatic::DCPTime time);
+	AudioAnalyser _analyser;
 
-	boost::shared_ptr<const Playlist> _playlist;
+	std::shared_ptr<const Playlist> _playlist;
 	/** playlist's audio analysis path when the job was created */
 	boost::filesystem::path _path;
-	dcpomatic::DCPTime _start;
-	bool _from_zero;
-
-	Frame _done;
-	Frame _samples_per_point;
-	AudioPoint* _current;
-
-	float* _sample_peak;
-	Frame* _sample_peak_frame;
-
-	boost::shared_ptr<AudioAnalysis> _analysis;
-
-	boost::shared_ptr<AudioFilterGraph> _ebur128;
-	std::vector<Filter const *> _filters;
-
-	boost::scoped_ptr<leqm_nrt::Calculator> _leqm;
 
 	static const int _num_points;
 };