X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fjob.cc;h=cb2120de1ea492fb907f3a74d5653a3f007739eb;hp=f0d8fcbbc1d4554dc920924cfdae43bdb0f4c01a;hb=dd3ddb4359a9f8b7ce08ce92e0315dccc65bf40b;hpb=a5d004b0773f633401528392fc28e66d70e13ac8

diff --git a/src/lib/job.cc b/src/lib/job.cc
index f0d8fcbbc..cb2120de1 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.
 
@@ -44,7 +44,7 @@ using std::list;
 using std::cout;
 using std::shared_ptr;
 using boost::optional;
-using boost::function;
+using std::function;
 using namespace dcpomatic;
 
 /** @param film Associated film, or 0 */
@@ -95,6 +95,8 @@ Job::start ()
 void
 Job::run_wrapper ()
 {
+	start_of_thread (String::compose("Job-%1", json_name()));
+
 	try {
 
 		run ();
@@ -104,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.");
@@ -374,8 +376,7 @@ Job::set_progress (float p, bool force)
 		struct timeval now;
 		gettimeofday (&now, 0);
 		if (_last_progress_update && _last_progress_update->tv_sec > 0) {
-			double const elapsed = (now.tv_sec + now.tv_usec / 1000000.0)
-				- (_last_progress_update->tv_sec + _last_progress_update->tv_usec / 1000000.0);
+			double const elapsed = seconds(now) - seconds(*_last_progress_update);
 			if (elapsed < 0.5) {
 				return;
 			}
@@ -478,8 +479,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;