X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob.cc;h=75a5505a95d82c1e4e738b802cb739bc16c0d40f;hb=cd29c4ed26fde9b9c07190f92205705b13c6bd73;hp=7aaac748c115a1d9e65144027e7eacf96f1d6640;hpb=b7ef3e79b9eb4f245556e69c68ee624c5b43e126;p=dcpomatic.git

diff --git a/src/lib/job.cc b/src/lib/job.cc
index 7aaac748c..75a5505a9 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -42,8 +43,10 @@ using boost::shared_ptr;
 using boost::optional;
 using boost::function;
 
-#define LOG_ERROR_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_ERROR);
+#define LOG_ERROR_NC(...) _film->log()->log (__VA_ARGS__, LogEntry::TYPE_ERROR);
+#define LOG_GENERAL(...) _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)
 	, _thread (0)
@@ -105,7 +108,10 @@ Job::run_wrapper ()
 
 		set_error (
 			String::compose (_("Could not open %1"), e.file().string()),
-			String::compose (_("DCP-o-matic could not open the file %1.  Perhaps it does not exist or is in an unexpected format."), e.file().string())
+			String::compose (
+				_("DCP-o-matic could not open the file %1.  Perhaps it does not exist or is in an unexpected format."),
+				boost::filesystem::absolute (e.file()).string()
+				)
 			);
 
 		set_progress (1);
@@ -116,7 +122,10 @@ Job::run_wrapper ()
 		if (e.code() == boost::system::errc::no_such_file_or_directory) {
 			set_error (
 				String::compose (_("Could not open %1"), e.path1().string ()),
-				String::compose (_("DCP-o-matic could not open the file %1.  Perhaps it does not exist or is in an unexpected format."), e.path1().string())
+				String::compose (
+					_("DCP-o-matic could not open the file %1.  Perhaps it does not exist or is in an unexpected format."),
+					boost::filesystem::absolute (e.path1()).string()
+					)
 				);
 		} else {
 			set_error (
@@ -294,6 +303,7 @@ Job::sub (string n)
 {
 	{
 		boost::mutex::scoped_lock lm (_progress_mutex);
+		LOG_GENERAL ("Sub-job %1 starting", n);
 		_sub_name = n;
 	}
 
@@ -321,10 +331,12 @@ Job::error_summary () const
 void
 Job::set_error (string s, string d)
 {
-	LOG_ERROR_NC (s);
-	LOG_ERROR_NC (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);
+	}
 
-	_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;