Merge branch 'master' into 2.0

[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 dc1e073ee15a031552dc3975572ad2c8d9f97b2b..0a0be8fa055e48caad18252b4f84b54ff2107de8 100644 (file)
--- a/src/lib/analyse_audio_job.h
+++ b/src/lib/analyse_audio_job.h
@@ -19,20 +19,25 @@
 
 #include "job.h"
 #include "audio_analysis.h"
+#include "types.h"
+#include "dcpomatic_time.h"
 
 class AudioBuffers;
+class AudioContent;
 
 class AnalyseAudioJob : public Job
 {
 public:
-       AnalyseAudioJob (boost::shared_ptr<Film> f);
+       AnalyseAudioJob (boost::shared_ptr<const Film>, boost::shared_ptr<AudioContent>);
 
        std::string name () const;
+       std::string json_name () const;
        void run ();
 
 private:
-       void audio (boost::shared_ptr<AudioBuffers>);
+       void audio (boost::shared_ptr<const AudioBuffers>, DCPTime);
 
+       boost::weak_ptr<AudioContent> _content;
        int64_t _done;
        int64_t _samples_per_point;
        std::vector<AudioPoint> _current;