Cleanup: replace some list with vector.

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

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 68cd30e540df71787d43c63898b9b1532f437076..6b1563b9b85da2b30a37f4a09e3b2cbd47a255b6 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 ();
 
@@ -175,7 +172,7 @@ TranscodeJob::status () const
        auto status = String::compose(_("%1; %2/%3 frames"), Job::status(), _encoder->frames_done(), _film->length().frames_round(_film->video_frame_rate()));
        if (auto const fps = _encoder->current_rate()) {
                /// TRANSLATORS: fps here is an abbreviation for frames per second
-               status += String::compose(_("; %1 fps"), dcp::locale_convert<string>(*fps, 1));
+               status += String::compose(_("; %1 fps"), dcp::locale_convert<string>(*fps, 1, true));
        }
 
        return status;