Patch from Aaron.

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

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 6e19854003ef207d724eb17520598738184863d8..96e93a50c8222e3ab1518d4db45e7a4d95aeb0ee 100644 (file)
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -134,7 +134,7 @@ TranscodeJob::run ()
                        fps = _encoder->frames_done() / (finish.tv_sec - start.tv_sec);
                }
 
-               LOG_GENERAL (N_("Transcode job completed successfully: %1 fps"), fps);
+               LOG_GENERAL (N_("Transcode job completed successfully: %1 fps"), dcp::locale_convert<string>(fps, 2, true));
 
                if (dynamic_pointer_cast<DCPEncoder>(_encoder)) {
                        try {
@@ -144,10 +144,7 @@ TranscodeJob::run ()
                        }
                }
 
-               /* XXX: this shouldn't be here */
-               if (Config::instance()->upload_after_make_dcp() && dynamic_pointer_cast<DCPEncoder>(_encoder)) {
-                       JobManager::instance()->add(make_shared<UploadJob>(_film));
-               }
+               post_transcode ();
 
                _encoder.reset ();
 
@@ -160,6 +157,14 @@ TranscodeJob::run ()
        }
 }
 
+void TranscodeJob::pause() {
+       _encoder->pause();
+}
+
+void TranscodeJob::resume() {
+       _encoder->resume();
+       Job::resume();
+}
 
 string
 TranscodeJob::status () const