X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fjob.cc;h=a83249e798feba99abafc2a09f1393eb8cf5dc18;hp=763005b57ef8a7ee52d3f69e4114a003a7a248f5;hb=1befa3d286a5016e897f1a23cc60cd3d3b96e63a;hpb=63bce67bd548f4aff98e2a1963e1fd77a6412a15

diff --git a/src/lib/job.cc b/src/lib/job.cc
index 763005b57..a83249e79 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -46,11 +46,11 @@ using std::cout;
 using boost::shared_ptr;
 using boost::optional;
 using boost::function;
+using namespace dcpomatic;
 
 /** @param film Associated film, or 0 */
 Job::Job (shared_ptr<const Film> film)
 	: _film (film)
-	, _thread (0)
 	, _state (NEW)
 	, _start_time (0)
 	, _sub_start_time (0)
@@ -62,19 +62,25 @@ Job::Job (shared_ptr<const Film> film)
 
 Job::~Job ()
 {
-	if (_thread) {
-		_thread->interrupt ();
-		/* We can't use DCPOMATIC_ASSERT here as it may throw an exception */
-		if (_thread->joinable ()) {
-			try {
-				_thread->join ();
-			} catch (...) {
-				/* Too late to do anything about this */
-			}
-		}
+#ifdef DCPOMATIC_DEBUG
+	/* Any subclass should have called stop_thread in its destructor */
+	assert (!_thread.joinable());
+#endif
+}
+
+void
+Job::stop_thread ()
+{
+	if (!_thread.joinable()) {
+		return;
 	}
 
-	delete _thread;
+	_thread.interrupt ();
+	try {
+		_thread.join ();
+	} catch (...) {
+		/* Too late to do anything about this */
+	}
 }
 
 /** Start the job in a separate thread, returning immediately */
@@ -84,9 +90,9 @@ Job::start ()
 	set_state (RUNNING);
 	_start_time = time (0);
 	_sub_start_time = time (0);
-	_thread = new boost::thread (boost::bind (&Job::run_wrapper, this));
+	_thread = boost::thread (boost::bind(&Job::run_wrapper, this));
 #ifdef DCPOMATIC_LINUX
-	pthread_setname_np (_thread->native_handle(), "job-wrapper");
+	pthread_setname_np (_thread.native_handle(), "job-wrapper");
 #endif
 }
 
@@ -184,6 +190,12 @@ Job::run_wrapper ()
 		set_progress (1);
 		set_state (FINISHED_ERROR);
 
+	} catch (FileError& e) {
+
+		set_error (e.what(), e.what());
+		set_progress (1);
+		set_state (FINISHED_ERROR);
+
 	} catch (std::exception& e) {
 
 		set_error (
@@ -443,7 +455,7 @@ Job::status () const
 			if (now.date() != finish.date()) {
 				/// TRANSLATORS: the %1 in this string will be filled in with a day of the week
 				/// to say what day a job will finish.
-				day = String::compose (_(" on %1"), finish.date().day_of_week().as_long_string());
+				day = String::compose (_(" on %1"), day_of_week_to_string(finish.date().day_of_week()));
 			}
 			/// TRANSLATORS: "remaining; finishing at" here follows an amount of time that is remaining
 			/// on an operation; after it is an estimated wall-clock completion time.
@@ -501,7 +513,7 @@ Job::remaining_time () const
 void
 Job::cancel ()
 {
-	if (!_thread) {
+	if (!_thread.joinable()) {
 		return;
 	}
 
@@ -509,11 +521,8 @@ Job::cancel ()
 		resume ();
 	}
 
-	_thread->interrupt ();
-	DCPOMATIC_ASSERT (_thread->joinable ());
-	_thread->join ();
-	delete _thread;
-	_thread = 0;
+	_thread.interrupt ();
+	_thread.join ();
 }
 
 /** @return true if the job was paused, false if it was not running */