X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fanalyse_audio_job.h;h=864a6a7cd738442d8bd119418f7a6a866947ce28;hp=a218cb3400d563354b751101eeb349bf87f81b59;hb=ac34066d5e448d1984d11a180be74e31b6e13b5c;hpb=7b2054e2a73844450b5b55c5788c02af671812ce

diff --git a/src/lib/analyse_audio_job.h b/src/lib/analyse_audio_job.h
index a218cb340..864a6a7cd 100644
--- a/src/lib/analyse_audio_job.h
+++ b/src/lib/analyse_audio_job.h
@@ -1,59 +1,73 @@
 /*
-    Copyright (C) 2012-2014 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_analysis.h"
+#include "audio_point.h"
 #include "types.h"
 #include "dcpomatic_time.h"
+#include <leqm_nrt.h>
+#include <boost/scoped_ptr.hpp>
+
 
 class AudioBuffers;
-class AudioContent;
+class AudioAnalysis;
+class Playlist;
+class AudioPoint;
+class AudioFilterGraph;
+class Filter;
+
 
 /** @class AnalyseAudioJob
- *  @brief A job to analyse the audio of a piece of AudioContent and make a note of its
+ *  @brief A job to analyse the audio of a film and make a note of its
  *  broad peak and RMS levels.
  *
- *  After computing the peak and RMS levels over the length of the content, the job
- *  will write a file to Content::audio_analysis_path.
+ *  After computing the peak and RMS levels the job will write a file
+ *  to Film::audio_analysis_path.
  */
 class AnalyseAudioJob : public Job
 {
 public:
-	AnalyseAudioJob (boost::shared_ptr<const Film>, boost::shared_ptr<AudioContent>);
+	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 ();
 
-private:
-	void analyse (boost::shared_ptr<const AudioBuffers>);
+	boost::filesystem::path path () const {
+		return _path;
+	}
 
-	boost::weak_ptr<AudioContent> _content;
-	int64_t _done;
-	int64_t _samples_per_point;
-	std::vector<AudioPoint> _current;
+private:
+	AudioAnalyser _analyser;
 
-	boost::shared_ptr<AudioAnalysis> _analysis;
+	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;
 };
-