Add frame counter to transcode progress (#111).

diff --git a/ChangeLog b/ChangeLog
index c51c6d6edf996ef63ac5f0c33a564e696f20d568..d808ddf3e703577b5f5561a590985234820bdd9c 100644 (file)
--- 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 eb1991297dbd8b1659fe40ba8943b26f74c6fd6f..f10078f3c2714984b15035d45b679954399f9c72 100644 (file)
--- 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 ();