Updated cs_CZ translation from Tomáš Begeni.

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

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 6e19854003ef207d724eb17520598738184863d8..12b9a2aa30b1bce0c188a7aa442d5722a7feddcd 100644 (file)
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -119,22 +119,15 @@ TranscodeJob::run ()
                        }
                }
 
-               struct timeval start;
-               gettimeofday (&start, 0);
                LOG_GENERAL_NC (N_("Transcode job starting"));
 
                DCPOMATIC_ASSERT (_encoder);
                _encoder->go ();
 
-               struct timeval finish;
-               gettimeofday (&finish, 0);
-
-               float fps = 0;
-               if (finish.tv_sec != start.tv_sec) {
-                       fps = _encoder->frames_done() / (finish.tv_sec - start.tv_sec);
-               }
+               set_progress (1);
+               set_state (FINISHED_OK);
 
-               LOG_GENERAL (N_("Transcode job completed successfully: %1 fps"), fps);
+               LOG_GENERAL(N_("Transcode job completed successfully: %1 fps"), dcp::locale_convert<string>(frames_per_second(), 2, true));
 
                if (dynamic_pointer_cast<DCPEncoder>(_encoder)) {
                        try {
@@ -144,16 +137,10 @@ 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 ();
 
-               set_progress (1);
-               set_state (FINISHED_OK);
-
        } catch (...) {
                _encoder.reset ();
                throw;
@@ -205,3 +192,15 @@ TranscodeJob::remaining_time () const
        /* Compute approximate proposed length here, as it's only here that we need it */
        return (_film->length().frames_round(_film->video_frame_rate()) - e->frames_done()) / *fps;
 }
+
+
+float
+TranscodeJob::frames_per_second() const
+{
+       if (_finish_time != _start_time) {
+               return _encoder->frames_done() / (_finish_time - _start_time);
+       } else {
+               return 0;
+       }
+}
+