X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscode_job.cc;h=48a2c8114960daa64d69e725becc60ffdd3cbd5c;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=55b4ef9b69aeadc4e9aaf87e397d9bd50aa10cd8;hpb=2cdf3d9f461b12d0925cc54368105bbd177bbbb3;p=dcpomatic.git

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 55b4ef9b6..48a2c8114 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -22,6 +22,7 @@
  *  @brief A job which transcodes from one format to another.
  */
 
+#include "config.h"
 #include "transcode_job.h"
 #include "dcp_encoder.h"
 #include "upload_job.h"
@@ -41,9 +42,9 @@ using std::string;
 using std::fixed;
 using std::setprecision;
 using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
 
 /** @param film Film to use */
 TranscodeJob::TranscodeJob (shared_ptr<const Film> film)
@@ -54,9 +55,6 @@ 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 ();
 }
 
@@ -88,8 +86,6 @@ TranscodeJob::run ()
 
 		DCPOMATIC_ASSERT (_encoder);
 		_encoder->go ();
-		set_progress (1);
-		set_state (FINISHED_OK);
 
 		struct timeval finish;
 		gettimeofday (&finish, 0);
@@ -106,13 +102,16 @@ TranscodeJob::run ()
 		}
 
 		/* XXX: this shouldn't be here */
-		if (_film->upload_after_make_dcp() && dynamic_pointer_cast<DCPEncoder>(_encoder)) {
+		if (Config::instance()->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;