Do lots of the player processing with less copying.

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

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index f0faf7c637205ba3f46b2aa05b35af9946970f2e..fd69b08e7c58b5a353570433d5f53c937585ed48 100644 (file)
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -90,8 +90,8 @@ TranscodeJob::status () const
 
        s << Job::status ();
 
-       if (!finished ()) {
-               s << N_("; ") << fixed << setprecision (1) << fps << N_(" ") << _("frames per second");
+       if (!finished () && !_transcoder->finishing ()) {
+               s << "; " << fixed << setprecision (1) << fps << " " << _("frames per second");
        }
        
        return s.str ();
@@ -111,6 +111,6 @@ TranscodeJob::remaining_time () const
        }
 
        /* Compute approximate proposed length here, as it's only here that we need it */
-       OutputVideoFrame const left = _film->time_to_video_frames (_film->length_with_loop ()) - _transcoder->video_frames_out();
+       OutputVideoFrame const left = _film->time_to_video_frames (_film->length ()) - _transcoder->video_frames_out();
        return left / fps;
 }