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

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 55b4ef9b6..3502c3346 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-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,32 +18,38 @@
 
 */
 
+
 /** @file src/transcode_job.cc
  *  @brief A job which transcodes from one format to another.
  */
 
-#include "transcode_job.h"
+
+#include "analytics.h"
+#include "compose.hpp"
+#include "config.h"
 #include "dcp_encoder.h"
-#include "upload_job.h"
-#include "job_manager.h"
-#include "film.h"
+#include "dcpomatic_log.h"
 #include "encoder.h"
+#include "film.h"
+#include "job_manager.h"
 #include "log.h"
-#include "dcpomatic_log.h"
-#include "compose.hpp"
-#include "analytics.h"
-#include <iostream>
+#include "transcode_job.h"
+#include "upload_job.h"
 #include <iomanip>
+#include <iostream>
 
 #include "i18n.h"
 
-using std::string;
+
+using std::cout;
 using std::fixed;
+using std::make_shared;
 using std::setprecision;
-using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
+using std::string;
 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)
@@ -52,32 +58,34 @@ 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
 {
 	return String::compose (_("Transcoding %1"), _film->name());
 }
 
+
 string
 TranscodeJob::json_name () const
 {
 	return N_("transcode");
 }
 
+
 void
 TranscodeJob::set_encoder (shared_ptr<Encoder> e)
 {
 	_encoder = e;
 }
 
+
 void
 TranscodeJob::run ()
 {
@@ -88,8 +96,6 @@ TranscodeJob::run ()
 
 		DCPOMATIC_ASSERT (_encoder);
 		_encoder->go ();
-		set_progress (1);
-		set_state (FINISHED_OK);
 
 		struct timeval finish;
 		gettimeofday (&finish, 0);
@@ -106,19 +112,22 @@ TranscodeJob::run ()
 		}
 
 		/* XXX: this shouldn't be here */
-		if (_film->upload_after_make_dcp() && dynamic_pointer_cast<DCPEncoder>(_encoder)) {
-			shared_ptr<Job> job (new UploadJob (_film));
-			JobManager::instance()->add (job);
+		if (Config::instance()->upload_after_make_dcp() && dynamic_pointer_cast<DCPEncoder>(_encoder)) {
+			JobManager::instance()->add(make_shared<UploadJob>(_film));
 		}
 
 		_encoder.reset ();
 
+		set_progress (1);
+		set_state (FINISHED_OK);
+
 	} catch (...) {
 		_encoder.reset ();
 		throw;
 	}
 }
 
+
 string
 TranscodeJob::status () const
 {
@@ -151,12 +160,13 @@ TranscodeJob::status () const
 	return buffer;
 }
 
+
 /** @return Approximate remaining time in seconds */
 int
 TranscodeJob::remaining_time () const
 {
 	/* _encoder might be destroyed by the job-runner thread */
-	shared_ptr<Encoder> e = _encoder;
+	auto e = _encoder;
 
 	if (!e || e->finishing()) {
 		/* We aren't doing any actual encoding so just use the job's guess */
@@ -165,7 +175,7 @@ TranscodeJob::remaining_time () const
 
 	/* We're encoding so guess based on the current encoding rate */
 
-	optional<float> fps = e->current_rate ();
+	auto fps = e->current_rate ();
 
 	if (!fps) {
 		return 0;