X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fanalyse_audio_job.h;h=f7cc3e2567ffa39dd82205f3a48d664c119efd24;hb=fa5f3a8bf77209da27acc33cf144e2e4500a2600;hp=ee20bedc4f32e943c7c8aaa5d55559cf7f7712a0;hpb=54038beb4437c027e584fc95110f6fd4dbf2207d;p=dcpomatic.git

diff --git a/src/lib/analyse_audio_job.h b/src/lib/analyse_audio_job.h
index ee20bedc4..f7cc3e256 100644
--- a/src/lib/analyse_audio_job.h
+++ b/src/lib/analyse_audio_job.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -25,6 +25,9 @@
 #include "job.h"
 #include "audio_point.h"
 #include "types.h"
+#include "dcpomatic_time.h"
+#include <leqm_nrt.h>
+#include <boost/scoped_ptr.hpp>
 
 class AudioBuffers;
 class AudioAnalysis;
@@ -43,21 +46,25 @@ class Filter;
 class AnalyseAudioJob : public Job
 {
 public:
-	AnalyseAudioJob (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist>);
+	AnalyseAudioJob (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist>, bool from_zero);
 	~AnalyseAudioJob ();
 
 	std::string name () const;
 	std::string json_name () const;
 	void run ();
 
-	boost::shared_ptr<const Playlist> playlist () const {
-		return _playlist;
+	boost::filesystem::path path () const {
+		return _path;
 	}
 
 private:
-	void analyse (boost::shared_ptr<const AudioBuffers>);
+	void analyse (boost::shared_ptr<const AudioBuffers>, dcpomatic::DCPTime time);
 
 	boost::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;
 
 	int64_t _done;
 	int64_t _samples_per_point;
@@ -71,5 +78,7 @@ private:
 	boost::shared_ptr<AudioFilterGraph> _ebur128;
 	std::vector<Filter const *> _filters;
 
+	boost::scoped_ptr<leqm_nrt::Calculator> _leqm;
+
 	static const int _num_points;
 };