X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fanalyse_audio_job.h;h=4273c19ed08a87f71773e2da63c370ee58e62ca0;hb=6904ca547ce503c9ea06b4def9b9a716068e493c;hp=4d657951b7123d57d21438c50ee273f9c807d178;hpb=04533b9cf34ce8089113015715083ee9c5b2b001;p=dcpomatic.git

diff --git a/src/lib/analyse_audio_job.h b/src/lib/analyse_audio_job.h
index 4d657951b..4273c19ed 100644
--- a/src/lib/analyse_audio_job.h
+++ b/src/lib/analyse_audio_job.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -22,24 +22,24 @@
  */
 
 #include "job.h"
-#include "audio_analysis.h"
 #include "types.h"
-#include "dcpomatic_time.h"
 
 class AudioBuffers;
-class AudioContent;
+class AudioAnalysis;
+class Playlist;
 
 /** @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 (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist>);
+	~AnalyseAudioJob ();
 
 	std::string name () const;
 	std::string json_name () const;
@@ -48,13 +48,16 @@ public:
 private:
 	void analyse (boost::shared_ptr<const AudioBuffers>);
 
-	boost::weak_ptr<AudioContent> _content;
+	boost::shared_ptr<const Playlist> _playlist;
+
 	int64_t _done;
 	int64_t _samples_per_point;
-	std::vector<AudioPoint> _current;
+	AudioPoint* _current;
+
+	float _overall_peak;
+	Frame _overall_peak_frame;
 
 	boost::shared_ptr<AudioAnalysis> _analysis;
 
 	static const int _num_points;
 };
-