From cccf38a8c058ee45b4e2ea0d453a29c793ca274d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 29 May 2016 00:58:36 +0100 Subject: Move transcode progress updating. Do this in the transcoder rather than the writer so that it updates even if video is being referenced. --- src/lib/transcoder.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/lib/transcoder.cc') diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc index eb787dee8..8afd64709 100644 --- a/src/lib/transcoder.cc +++ b/src/lib/transcoder.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2016 Carl Hetherington This file is part of DCP-o-matic. @@ -40,6 +40,8 @@ #include #include +#include "i18n.h" + using std::string; using std::cout; using std::list; @@ -53,6 +55,7 @@ using boost::dynamic_pointer_cast; */ Transcoder::Transcoder (shared_ptr film, shared_ptr j) : _film (film) + , _job (j) , _player (new Player (film, film->playlist ())) , _writer (new Writer (film, j)) , _encoder (new Encoder (film, _writer)) @@ -67,6 +70,8 @@ Transcoder::go () _writer->start (); _encoder->begin (); + _job->sub (_("Encoding picture and sound")); + DCPTime const frame = DCPTime::from_frames (1, _film->video_frame_rate ()); DCPTime const length = _film->length (); @@ -93,6 +98,8 @@ Transcoder::go () if (non_burnt_subtitles) { _writer->write (_player->get_subtitles (t, frame, true, false, true)); } + + _job->set_progress (float(t.get()) / length.get()); } BOOST_FOREACH (ReferencedReelAsset i, _player->get_reel_assets ()) { -- cgit v1.2.3