Move a load of disk writing code to src/lib/ext.cc.

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

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 7fe28d210873abd328b75b212da1154e915731a4..6d73a3673f665c86c1ccb2c15f38431f2c493316 100644 (file)
--- 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"
@@ -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 ();
 }
 
@@ -104,7 +102,7 @@ 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);
                }