X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fanalyse_audio_job.h;h=f8311da4724c2b3304be13a9bcc4dd3792a0421b;hb=182b9d2e2feb6545592868606aaf0f0146095481;hp=65282b1926ee349617fcc2bae57f88775c4c4f49;hpb=419afb743ad2aaf1ea301356ac09f9a26ee15567;p=dcpomatic.git

diff --git a/src/lib/analyse_audio_job.h b/src/lib/analyse_audio_job.h
index 65282b192..f8311da47 100644
--- a/src/lib/analyse_audio_job.h
+++ b/src/lib/analyse_audio_job.h
@@ -1,29 +1,37 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+
 /** @file  src/lib/analyse_audio_job.h
  *  @brief AnalyseAudioJob class.
  */
 
+
+#include "audio_analyser.h"
 #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;
@@ -32,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.
@@ -42,33 +51,26 @@ class Filter;
 class AnalyseAudioJob : public Job
 {
 public:
-	AnalyseAudioJob (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist>);
+	AnalyseAudioJob (std::shared_ptr<const Film>, std::shared_ptr<const Playlist>, bool from_zero);
 	~AnalyseAudioJob ();
 
-	std::string name () const;
-	std::string json_name () const;
-	void run ();
+	std::string name () const override;
+	std::string json_name () const override;
+	void run () override;
+	bool enable_notify () const override {
+		return true;
+	}
 
-	boost::shared_ptr<const Playlist> playlist () const {
-		return _playlist;
+	boost::filesystem::path path () const {
+		return _path;
 	}
 
 private:
-	void analyse (boost::shared_ptr<const AudioBuffers>);
-
-	boost::shared_ptr<const Playlist> _playlist;
-
-	int64_t _done;
-	int64_t _samples_per_point;
-	AudioPoint* _current;
-
-	float _sample_peak;
-	Frame _sample_peak_frame;
-
-	boost::shared_ptr<AudioAnalysis> _analysis;
+	AudioAnalyser _analyser;
 
-	boost::shared_ptr<AudioFilterGraph> _ebur128;
-	std::vector<Filter const *> _filters;
+	std::shared_ptr<const Playlist> _playlist;
+	/** playlist's audio analysis path when the job was created */
+	boost::filesystem::path _path;
 
 	static const int _num_points;
 };