Remove duplicate Drive::description.

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

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 6aa31af978d1407b4c61bc2f4c8d5f0f8fb91b78..fb586b0825631da9e9a9efc79038103733735791 100644 (file)
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -42,6 +42,7 @@ using std::fixed;
 using std::setprecision;
 using std::cout;
 using boost::shared_ptr;
+using boost::optional;
 using boost::dynamic_pointer_cast;
 
 /** @param film Film to use */
@@ -51,6 +52,11 @@ TranscodeJob::TranscodeJob (shared_ptr<const Film> film)
 
 }
 
+TranscodeJob::~TranscodeJob ()
+{
+       stop_thread ();
+}
+
 string
 TranscodeJob::name () const
 {
@@ -79,8 +85,6 @@ TranscodeJob::run ()
 
                DCPOMATIC_ASSERT (_encoder);
                _encoder->go ();
-               set_progress (1);
-               set_state (FINISHED_OK);
 
                struct timeval finish;
                gettimeofday (&finish, 0);
@@ -96,14 +100,17 @@ TranscodeJob::run ()
                        Analytics::instance()->successful_dcp_encode();
                }
 
-               _encoder.reset ();
-
                /* XXX: this shouldn't be here */
-               if (_film->upload_after_make_dcp ()) {
+               if (_film->upload_after_make_dcp() && dynamic_pointer_cast<DCPEncoder>(_encoder)) {
                        shared_ptr<Job> job (new UploadJob (_film));
                        JobManager::instance()->add (job);
                }
 
+               _encoder.reset ();
+
+               set_progress (1);
+               set_state (FINISHED_OK);
+
        } catch (...) {
                _encoder.reset ();
                throw;
@@ -120,7 +127,8 @@ TranscodeJob::status () const
 
        char buffer[256];
        if (finished() || _encoder->finishing()) {
-               strncpy (buffer, Job::status().c_str(), 256);
+               strncpy (buffer, Job::status().c_str(), 255);
+               buffer[255] = '\0';
        } else {
                snprintf (
                        buffer, sizeof(buffer), "%s; %" PRId64 "/%" PRId64 " frames",
@@ -129,11 +137,11 @@ TranscodeJob::status () const
                        _film->length().frames_round (_film->video_frame_rate ())
                        );
 
-               float const fps = _encoder->current_rate ();
+               optional<float> const fps = _encoder->current_rate ();
                if (fps) {
                        char fps_buffer[64];
                        /// TRANSLATORS: fps here is an abbreviation for frames per second
-                       snprintf (fps_buffer, sizeof(fps_buffer), _("; %.1f fps"), fps);
+                       snprintf (fps_buffer, sizeof(fps_buffer), _("; %.1f fps"), *fps);
                        strncat (buffer, fps_buffer, strlen(buffer) - 1);
                }
        }
@@ -155,12 +163,12 @@ TranscodeJob::remaining_time () const
 
        /* We're encoding so guess based on the current encoding rate */
 
-       float fps = e->current_rate ();
+       optional<float> fps = e->current_rate ();
 
-       if (fps == 0) {
+       if (!fps) {
                return 0;
        }
 
        /* 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;
+       return (_film->length().frames_round(_film->video_frame_rate()) - e->frames_done()) / *fps;
 }