Destory TranscodeJob earlier, hopefully to fix #1570.

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

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index da7571b96db1219d63dbe7c6abfaf411535c528c..981816fd528f24edc19e071cf37526c88f37b714 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.
 
@@ -31,6 +31,7 @@
 #include "log.h"
 #include "dcpomatic_log.h"
 #include "compose.hpp"
+#include "analytics.h"
 #include <iostream>
 #include <iomanip>
 
@@ -41,6 +42,7 @@ using std::fixed;
 using std::setprecision;
 using std::cout;
 using boost::shared_ptr;
+using boost::dynamic_pointer_cast;
 
 /** @param film Film to use */
 TranscodeJob::TranscodeJob (shared_ptr<const Film> film)
@@ -49,6 +51,14 @@ TranscodeJob::TranscodeJob (shared_ptr<const Film> film)
 
 }
 
+TranscodeJob::~TranscodeJob ()
+{
+       /* We have to stop the job thread here as we're about to start tearing down
+          the Encoder, which is bad news if the job thread is still feeding it data.
+       */
+       stop_thread ();
+}
+
 string
 TranscodeJob::name () const
 {
@@ -89,14 +99,19 @@ TranscodeJob::run ()
                }
 
                LOG_GENERAL (N_("Transcode job completed successfully: %1 fps"), fps);
-               _encoder.reset ();
+
+               if (dynamic_pointer_cast<DCPEncoder>(_encoder)) {
+                       Analytics::instance()->successful_dcp_encode();
+               }
 
                /* 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 ();
+
        } catch (...) {
                _encoder.reset ();
                throw;
@@ -113,7 +128,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",