AnalyseAudioJob does not need an explicit playlist.

[dcpomatic.git] / src / lib / analyse_audio_job.h

diff --git a/src/lib/analyse_audio_job.h b/src/lib/analyse_audio_job.h
index bde9d0d403fae5723e48950adec02ff8eb676bd7..1794ab3dcae1b4f6f8755de341f761d237ead5bf 100644 (file)
--- 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
@@ -26,31 +26,33 @@
 #include "types.h"
 
 class AudioBuffers;
-class AudioContent;
 
 /** @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>);
 
        std::string name () const;
+       std::string json_name () const;
        void run ();
 
 private:
        void analyse (boost::shared_ptr<const AudioBuffers>);
 
-       boost::weak_ptr<AudioContent> _content;
        int64_t _done;
        int64_t _samples_per_point;
        std::vector<AudioPoint> _current;
 
+       float _overall_peak;
+       Frame _overall_peak_frame;
+
        boost::shared_ptr<AudioAnalysis> _analysis;
 
        static const int _num_points;