Hand-apply 2ee558ec90623b570360e8e55c918b5bb37f9aac from master; various snapping...

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

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 23a46d06dddcb7875a9247911d387028a0da802e..1a2202ad2f2b91b9914297c07c9852ff227b3cb7 100644 (file)
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -54,6 +54,12 @@ TranscodeJob::name () const
        return String::compose (_("Transcode %1"), _film->name());
 }
 
+string
+TranscodeJob::json_name () const
+{
+       return N_("transcode");
+}
+
 void
 TranscodeJob::run ()
 {
@@ -70,9 +76,6 @@ TranscodeJob::run ()
                _transcoder.reset ();
 
        } catch (...) {
-               set_progress (1);
-               set_state (FINISHED_ERROR);
-               LOG_ERROR_NC (N_("Transcode job failed or cancelled"));
                _transcoder.reset ();
                throw;
        }
@@ -95,7 +98,8 @@ TranscodeJob::status () const
        s << Job::status ();
 
        if (!finished () && !_transcoder->finishing ()) {
-               s << "; " << fixed << setprecision (1) << fps << " " << _("frames per second");
+               /// TRANSLATORS: fps here is an abbreviation for frames per second
+               s << "; " << fixed << setprecision (1) << fps << " " << _("fps");
        }
        
        return s.str ();