X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob.cc;h=52558046ae8ec66ecd580194bf3f51558efd504e;hb=38e89b25f6042d7a9dc023bbdeff98b09cbdd26f;hp=a4ea9ec6f033d04d65302186dfe268572a49972b;hpb=778a8b0e19715ed98969ce84cdf4859e1e0e7e52;p=dcpomatic.git

diff --git a/src/lib/job.cc b/src/lib/job.cc
index a4ea9ec6f..52558046a 100644
--- a/src/lib/job.cc
+++ b/src/lib/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.
 
@@ -34,7 +34,6 @@
 #include <sub/exceptions.h>
 #include <boost/thread.hpp>
 #include <boost/filesystem.hpp>
-#include <boost/foreach.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <iostream>
 
@@ -43,9 +42,9 @@
 using std::string;
 using std::list;
 using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
-using boost::function;
+using std::function;
 using namespace dcpomatic;
 
 /** @param film Associated film, or 0 */
@@ -71,16 +70,12 @@ Job::~Job ()
 void
 Job::stop_thread ()
 {
-	if (!_thread.joinable()) {
-		return;
-	}
+	boost::this_thread::disable_interruption dis;
 
 	_thread.interrupt ();
 	try {
 		_thread.join ();
-	} catch (...) {
-		/* Too late to do anything about this */
-	}
+	} catch (...) {}
 }
 
 /** Start the job in a separate thread, returning immediately */
@@ -100,6 +95,8 @@ Job::start ()
 void
 Job::run_wrapper ()
 {
+	start_of_thread (String::compose("Job-%1", json_name()));
+
 	try {
 
 		run ();
@@ -109,7 +106,7 @@ Job::run_wrapper ()
 		string m = String::compose (_("An error occurred whilst handling the file %1."), boost::filesystem::path (e.filename()).leaf());
 
 		try {
-			boost::filesystem::space_info const s = boost::filesystem::space (e.filename());
+			auto const s = boost::filesystem::space (e.filename());
 			if (s.available < pow (1024, 3)) {
 				m += N_("\n\n");
 				m += _("The drive that the film is stored on is low in disc space.  Free some more space and try again.");
@@ -200,7 +197,7 @@ Job::run_wrapper ()
 	} catch (sub::SubripError& e) {
 
 		string extra = "Error is near:\n";
-		BOOST_FOREACH (string i, e.context()) {
+		for (auto i: e.context()) {
 			extra += i + "\n";
 		}
 
@@ -214,7 +211,7 @@ Job::run_wrapper ()
 		set_progress (1);
 		set_state (FINISHED_ERROR);
 
-	} catch (dcp::DCPReadError& e) {
+	} catch (dcp::ReadError& e) {
 
 		set_error (e.message(), e.detail().get_value_or(""));
 		set_progress (1);
@@ -483,8 +480,8 @@ Job::status () const
 		s += buffer;
 
 		if (t > 10 && r > 0) {
-			boost::posix_time::ptime now = boost::posix_time::second_clock::local_time();
-			boost::posix_time::ptime finish = now + boost::posix_time::seconds(r);
+			auto now = boost::posix_time::second_clock::local_time();
+			auto finish = now + boost::posix_time::seconds(r);
 			char finish_string[16];
 			snprintf (finish_string, sizeof(finish_string), "%02d:%02d", int(finish.time_of_day().hours()), int(finish.time_of_day().minutes()));
 			string day;