summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--src/lib/transcode_job.cc4
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c51c6d6ed..d808ddf3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2015-09-03 c.hetherington <cth@carlh.net>
+ * Add frame counter to progress
+ when transcoding (#111).
+
* Add button to export certificates
from the configuration (#668).
diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index eb1991297..f10078f3c 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -100,7 +100,9 @@ TranscodeJob::status () const
if (!finished () && !_transcoder->finishing ()) {
/// TRANSLATORS: fps here is an abbreviation for frames per second
- s << "; " << fixed << setprecision (1) << fps << " " << _("fps");
+ s << "; " << _transcoder->video_frames_out() << "/"
+ << _film->length().frames_round (_film->video_frame_rate ()) << " " << _("frames") << "; "
+ << fixed << setprecision (1) << fps << " " << _("fps");
}
return s.str ();