X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fanalyse_audio_job.h;h=d9b90ec668acc5c0ad090ad6139fe7c9efa4f6a9;hb=d2bd0c628fd0616fe3b7dd02bd955b2c07ab48d5;hp=3d3900a5112b5f621e01a81a81b80c55a132271a;hpb=1629bd7df2150156109afbc7a16677cb29e82adf;p=dcpomatic.git

diff --git a/src/lib/analyse_audio_job.h b/src/lib/analyse_audio_job.h
index 3d3900a51..d9b90ec66 100644
--- a/src/lib/analyse_audio_job.h
+++ b/src/lib/analyse_audio_job.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 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
@@ -17,32 +17,53 @@
 
 */
 
+/** @file  src/lib/analyse_audio_job.h
+ *  @brief AnalyseAudioJob class.
+ */
+
 #include "job.h"
-#include "audio_analysis.h"
+#include "audio_point.h"
 #include "types.h"
 
 class AudioBuffers;
-class AudioContent;
+class AudioAnalysis;
+class Playlist;
+class AudioPoint;
 
+/** @class AnalyseAudioJob
+ *  @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 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;
 	void run ();
 
+	boost::shared_ptr<const Playlist> playlist () const {
+		return _playlist;
+	}
+
 private:
-	void audio (boost::shared_ptr<const AudioBuffers>, DCPTime);
+	void analyse (boost::shared_ptr<const AudioBuffers>);
+
+	boost::shared_ptr<const Playlist> _playlist;
 
-	boost::weak_ptr<AudioContent> _content;
-	AudioFrame _done;
+	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;
 };
-