Update DCP encoder progress on all passe()es, not just when audio is emitted.

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

diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc
index c7ee180e11f0da9bec17c26b76c1cac7f7656c95..a4bc133f8d781c7509078d8953da7e11f2c841e5 100644 (file)
--- a/src/lib/dcp_encoder.cc
+++ b/src/lib/dcp_encoder.cc
@@ -107,7 +107,14 @@ DCPEncoder::go ()
                _writer.write(_player.get_subtitle_fonts());
        }
 
-       while (!_player.pass()) {}
+       int passes = 0;
+       while (!_player.pass()) {
+               if ((++passes % 8) == 0) {
+                       auto job = _job.lock();
+                       DCPOMATIC_ASSERT(job);
+                       job->set_progress(_player.progress());
+               }
+       }
 
        for (auto i: get_referenced_reel_assets(_film, _film->playlist())) {
                _writer.write(i);
@@ -128,10 +135,6 @@ void
 DCPEncoder::audio (shared_ptr<AudioBuffers> data, DCPTime time)
 {
        _writer.write(data, time);
-
-       auto job = _job.lock ();
-       DCPOMATIC_ASSERT (job);
-       job->set_progress (float(time.get()) / _film->length().get());
 }
 
 void