Merge branch '1.0' into 1.0-generated-control

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

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index c9ec2053d46353a500cd6c4178af395a6c303906..fd69b08e7c58b5a353570433d5f53c937585ed48 100644 (file)
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -90,13 +90,8 @@ TranscodeJob::status () const
 
        s << Job::status ();
 
-       if (!finished ()) {
-               if (_transcoder->state() == Encoder::TRANSCODING) {
-                       s << "; " << fixed << setprecision (1) << fps << N_(" ") << _("frames per second");
-               } else {
-                       /* TRANSLATORS: this means `computing a hash' as in a digest of a block of data */
-                       s << "; " << _("hashing");
-               }
+       if (!finished () && !_transcoder->finishing ()) {
+               s << "; " << fixed << setprecision (1) << fps << " " << _("frames per second");
        }
        
        return s.str ();