diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-05-29 00:58:36 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-29 00:59:58 +0100 |
| commit | cccf38a8c058ee45b4e2ea0d453a29c793ca274d (patch) | |
| tree | a5931ce7e89ffd64dd04e6cdd997a912e0ba32ba /src/lib/writer.cc | |
| parent | 2495aa7fb0867609245664375dccd0234235102d (diff) | |
Move transcode progress updating.
Do this in the transcoder rather than the writer so that it updates
even if video is being referenced.
Diffstat (limited to 'src/lib/writer.cc')
| -rw-r--r-- | src/lib/writer.cc | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 8c01afe7c..4a99b0793 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -96,8 +96,6 @@ Writer::Writer (shared_ptr<const Film> film, weak_ptr<Job> j) if (_film->is_signed() && !Config::instance()->signer_chain()->valid ()) { throw InvalidSignerError (); } - - job->sub (_("Encoding image data")); } void @@ -360,19 +358,6 @@ try } lock.lock (); - - shared_ptr<Job> job = _job.lock (); - DCPOMATIC_ASSERT (job); - int64_t total = _film->length().frames_round (_film->video_frame_rate ()); - if (_film->three_d ()) { - /* _full_written and so on are incremented for each eye, so we need to double the total - frames to get the correct progress. - */ - total *= 2; - } - if (total) { - job->set_progress (float (_full_written + _fake_written + _repeat_written) / total); - } } while (_queued_full_in_memory > _maximum_frames_in_memory) { |