Fix problems with FFmpeg files that have all-zero stream IDs.

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

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index a0a9454b7a1b59c959ed85730ce37961f40808bd..fd69b08e7c58b5a353570433d5f53c937585ed48 100644 (file)
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -25,10 +25,8 @@
 #include <iomanip>
 #include "transcode_job.h"
 #include "film.h"
-#include "format.h"
 #include "transcoder.h"
 #include "log.h"
-#include "encoder.h"
 
 #include "i18n.h"
 
@@ -40,7 +38,7 @@ using boost::shared_ptr;
 
 /** @param s Film to use.
  */
-TranscodeJob::TranscodeJob (shared_ptr<Film> f)
+TranscodeJob::TranscodeJob (shared_ptr<const Film> f)
        : Job (f)
 {
        
@@ -58,7 +56,6 @@ TranscodeJob::run ()
        try {
 
                _film->log()->log (N_("Transcode job starting"));
-               _film->log()->log (String::compose (N_("Audio delay is %1ms"), _film->audio_delay()));
 
                _transcoder.reset (new Transcoder (_film, shared_from_this ()));
                _transcoder->go ();
@@ -93,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 ();