Merge branch 'master' into subtitle-content

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

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index ce02fa57e7d302c0b7fc392a98f366bb38b639d9..87fd5daefca06d06ed1e2fee5cf6eb89237d4104 100644 (file)
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -38,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)
 {
        
@@ -64,12 +64,11 @@ TranscodeJob::run ()
 
                _film->log()->log (N_("Transcode job completed successfully"));
 
-       } catch (std::exception& e) {
-
+       } catch (...) {
                set_progress (1);
                set_state (FINISHED_ERROR);
-               _film->log()->log (String::compose (N_("Transcode job failed (%1)"), e.what()));
-
+               _film->log()->log (N_("Transcode job failed or cancelled"));
+               _transcoder.reset ();
                throw;
        }
 }
@@ -78,7 +77,7 @@ string
 TranscodeJob::status () const
 {
        if (!_transcoder) {
-               return _("0%");
+               return Job::status ();
        }
 
        float const fps = _transcoder->current_encoding_rate ();
@@ -90,8 +89,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 ();