Re-add missing audio mapping in butler for preview.

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

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index 9fce354df81d13054c5bc1efea2240c0db267a5a..1378b66a433fc0fa5a531d4db682f4f26ea3de31 100644 (file)
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -66,6 +66,11 @@ AnalyseAudioJob::AnalyseAudioJob (shared_ptr<const Film> film, shared_ptr<const
        _filters.push_back (new Filter ("ebur128", "ebur128", "audio", "ebur128=peak=true"));
        _ebur128->setup (_filters);
 #endif
+
+       for (int i = 0; i < film->audio_channels(); ++i) {
+               _sample_peak[i] = 0;
+               _sample_peak_frame[i] = 0;
+       }
 }
 
 AnalyseAudioJob::~AnalyseAudioJob ()
@@ -97,6 +102,7 @@ AnalyseAudioJob::run ()
        player->set_ignore_video ();
        player->set_fast ();
        player->set_play_referenced ();
+       player->Audio.connect (bind (&AnalyseAudioJob::analyse, this, _1, _2));
 
        DCPTime const start = _playlist->start().get_value_or (DCPTime ());
        DCPTime const length = _playlist->length ();
@@ -117,17 +123,7 @@ AnalyseAudioJob::run ()
 
        if (has_any_audio) {
                _done = 0;
-               DCPTime const block = DCPTime::from_seconds (1.0 / 8);
-               for (DCPTime t = start; t < length; t += block) {
-                       shared_ptr<const AudioBuffers> audio = player->get_audio (t, block, false);
-#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
-                       if (Config::instance()->analyse_ebur128 ()) {
-                               _ebur128->process (audio);
-                       }
-#endif
-                       analyse (audio);
-                       set_progress ((t.seconds() - start.seconds()) / (length.seconds() - start.seconds()));
-               }
+               while (!player->pass ()) {}
        }
 
        vector<AudioAnalysis::PeakTime> sample_peak;
@@ -167,8 +163,14 @@ AnalyseAudioJob::run ()
 }
 
 void
-AnalyseAudioJob::analyse (shared_ptr<const AudioBuffers> b)
+AnalyseAudioJob::analyse (shared_ptr<const AudioBuffers> b, DCPTime time)
 {
+#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
+       if (Config::instance()->analyse_ebur128 ()) {
+               _ebur128->process (b);
+       }
+#endif
+
        int const frames = b->frames ();
        int const channels = b->channels ();
 
@@ -199,4 +201,8 @@ AnalyseAudioJob::analyse (shared_ptr<const AudioBuffers> b)
        }
 
        _done += frames;
+
+       DCPTime const start = _playlist->start().get_value_or (DCPTime ());
+       DCPTime const length = _playlist->length ();
+       set_progress ((time.seconds() - start.seconds()) / (length.seconds() - start.seconds()));
 }