projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
job.cc
diff --git
a/src/lib/job.cc
b/src/lib/job.cc
index 530ad979830495cbe9a43ecbb90c3bc6082457f7..31a10a44bd6af2343ca4ddfa525ed3b4e35226ad 100644
(file)
--- 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
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 <boost/thread.hpp>
#include <boost/filesystem.hpp>
-#include <
lib
dcp/exceptions.h>
+#include <dcp/exceptions.h>
#include "job.h"
#include "util.h"
#include "cross.h"
#include "ui_signaller.h"
#include "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"
#include "i18n.h"
@@
-66,8
+68,8
@@
Job::run_wrapper ()
run ();
run ();
- } catch (
lib
dcp::FileError& e) {
-
+ } catch (dcp::FileError& e) {
+
string m = String::compose (_("An error occurred whilst handling the file %1."), boost::filesystem::path (e.filename()).leaf());
try {
string m = String::compose (_("An error occurred whilst handling the file %1."), boost::filesystem::path (e.filename()).leaf());
try {
@@
-204,7
+206,7
@@
Job::set_state (State s)
}
}
}
}
-/** @return Time (in seconds) that this sub-job has been running */
+/** @return
DCP
Time (in seconds) that this sub-job has been running */
int
Job::elapsed_time () const
{
int
Job::elapsed_time () const
{
@@
-279,6
+281,7
@@
Job::error_summary () const
void
Job::set_error (string s, string d)
{
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;
boost::mutex::scoped_lock lm (_state_mutex);
_error_summary = s;
_error_details = d;