X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob.cc;h=31a10a44bd6af2343ca4ddfa525ed3b4e35226ad;hb=cc27c2716f755305d67f1e1ba828ecf37f8405dd;hp=ce97ba2b2f13c6e2de3a8b69346fd752893995db;hpb=c28b3d6f168607aca9995282b96647eb64a26dc9;p=dcpomatic.git

diff --git a/src/lib/job.cc b/src/lib/job.cc
index ce97ba2b2..31a10a44b 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -23,12 +23,14 @@
 
 #include <boost/thread.hpp>
 #include <boost/filesystem.hpp>
-#include <libdcp/exceptions.h>
+#include <dcp/exceptions.h>
 #include "job.h"
 #include "util.h"
 #include "cross.h"
 #include "ui_signaller.h"
 #include "exceptions.h"
+#include "film.h"
+#include "log.h"
 
 #include "i18n.h"
 
@@ -67,7 +69,7 @@ Job::run_wrapper ()
 		run ();
 
 	} catch (dcp::FileError& e) {
-		
+
 		string m = String::compose (_("An error occurred whilst handling the file %1."), boost::filesystem::path (e.filename()).leaf());
 
 		try {
@@ -108,7 +110,7 @@ Job::run_wrapper ()
 
 		set_error (
 			e.what (),
-			_("It is not known what caused this error.  The best idea is to report the problem to the DCP-o-matic mailing list (carl@dcpomatic.com)")
+			_("It is not known what caused this error.  Please report the problem to the DCP-o-matic author (carl@dcpomatic.com).")
 			);
 
 		set_progress (1);
@@ -118,7 +120,7 @@ Job::run_wrapper ()
 
 		set_error (
 			_("Unknown error"),
-			_("It is not known what caused this error.  The best idea is to report the problem to the DCP-o-matic mailing list (carl@dcpomatic.com)")
+			_("It is not known what caused this error.  Please report the problem to the DCP-o-matic author (carl@dcpomatic.com).")
 			);
 
 		set_progress (1);
@@ -187,7 +189,7 @@ void
 Job::set_state (State s)
 {
 	bool finished = false;
-	
+
 	{
 		boost::mutex::scoped_lock lm (_state_mutex);
 		_state = s;
@@ -201,7 +203,7 @@ Job::set_state (State s)
 
 	if (finished && ui_signaller) {
 		ui_signaller->emit (boost::bind (boost::ref (Finished)));
-	}
+	}	
 }
 
 /** @return DCPTime (in seconds) that this sub-job has been running */
@@ -239,7 +241,7 @@ Job::set_progress (float p, bool force)
 	}
 }
 
-/** @return fractional progress of this sub-job, or -1 if not known */
+/** @return fractional progress of the current sub-job, or -1 if not known */
 float
 Job::progress () const
 {
@@ -279,6 +281,7 @@ Job::error_summary () const
 void
 Job::set_error (string s, string d)
 {
+	_film->log()->log (String::compose ("Error in job: %1 (%2)", s, d), Log::TYPE_ERROR);
 	boost::mutex::scoped_lock lm (_state_mutex);
 	_error_summary = s;
 	_error_details = d;