X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob.cc;h=dde8cce62ad42379c999ccf2103f891afbca6b04;hb=ad1ef39eda58b3a919ea3b7084401a0439409ec6;hp=ccb75fa9332379ad27488da0e101ba786c150986;hpb=8e4a2e5ea578ac4f0f41edb6145d5c0040e33ec2;p=dcpomatic.git

diff --git a/src/lib/job.cc b/src/lib/job.cc
index ccb75fa93..dde8cce62 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -28,6 +28,7 @@
 #include "exceptions.h"
 #include "film.h"
 #include "log.h"
+#include "dcpomatic_log.h"
 #include "compose.hpp"
 #include <dcp/exceptions.h>
 #include <sub/exceptions.h>
@@ -46,9 +47,6 @@ using boost::shared_ptr;
 using boost::optional;
 using boost::function;
 
-#define LOG_ERROR_NC(...) if (_film) { _film->log()->log (__VA_ARGS__, LogEntry::TYPE_ERROR); }
-#define LOG_GENERAL(...) if (_film) { _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL); }
-
 /** @param film Associated film, or 0 */
 Job::Job (shared_ptr<const Film> film)
 	: _film (film)
@@ -174,6 +172,18 @@ Job::run_wrapper ()
 		set_progress (1);
 		set_state (FINISHED_ERROR);
 
+	} catch (dcp::DCPReadError& e) {
+
+		set_error (e.message(), e.detail().get_value_or(""));
+		set_progress (1);
+		set_state (FINISHED_ERROR);
+
+	} catch (KDMError& e) {
+
+		set_error (e.summary(), e.detail());
+		set_progress (1);
+		set_state (FINISHED_ERROR);
+
 	} catch (std::exception& e) {
 
 		set_error (
@@ -387,8 +397,6 @@ void
 Job::set_error (string s, string d)
 {
 	if (_film) {
-		LOG_ERROR_NC (s);
-		LOG_ERROR_NC (d);
 		_film->log()->log (String::compose ("Error in job: %1 (%2)", s, d), LogEntry::TYPE_ERROR);
 	}
 
@@ -507,13 +515,27 @@ Job::cancel ()
 	_thread = 0;
 }
 
-void
+/** @return true if the job was paused, false if it was not running */
+bool
 Job::pause_by_user ()
 {
-	if (running ()) {
-		set_state (PAUSED_BY_USER);
+	bool paused = false;
+	{
+		boost::mutex::scoped_lock lm (_state_mutex);
+		/* We can set _state here directly because we have a lock and we aren't
+		   setting the job to FINISHED_*
+		*/
+		if (_state == RUNNING) {
+			paused = true;
+			_state = PAUSED_BY_USER;
+		}
+	}
+
+	if (paused) {
 		_pause_changed.notify_all ();
 	}
+
+	return paused;
 }
 
 void
@@ -544,3 +566,17 @@ Job::when_finished (boost::signals2::connection& connection, function<void()> fi
 		connection = Finished.connect (finished);
 	}
 }
+
+optional<string>
+Job::message () const
+{
+	boost::mutex::scoped_lock lm (_state_mutex);
+	return _message;
+}
+
+void
+Job::set_message (string m)
+{
+	boost::mutex::scoped_lock lm (_state_mutex);
+	_message = m;
+}