projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix erroneous content change message.
[dcpomatic.git]
/
src
/
lib
/
job.cc
diff --git
a/src/lib/job.cc
b/src/lib/job.cc
index a84b0dcb17905dcaa14d614e7f10e04c1d8aa533..43b5fb7e13f50d3672eac81434b0a9e2409f5ee6 100644
(file)
--- a/
src/lib/job.cc
+++ b/
src/lib/job.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-201
6
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
9
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-28,6
+28,7
@@
#include "exceptions.h"
#include "film.h"
#include "log.h"
#include "exceptions.h"
#include "film.h"
#include "log.h"
+#include "dcpomatic_log.h"
#include "compose.hpp"
#include <dcp/exceptions.h>
#include <sub/exceptions.h>
#include "compose.hpp"
#include <dcp/exceptions.h>
#include <sub/exceptions.h>
@@
-45,9
+46,7
@@
using std::cout;
using boost::shared_ptr;
using boost::optional;
using boost::function;
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); }
+using namespace dcpomatic;
/** @param film Associated film, or 0 */
Job::Job (shared_ptr<const Film> film)
/** @param film Associated film, or 0 */
Job::Job (shared_ptr<const Film> film)
@@
-63,6
+62,12
@@
Job::Job (shared_ptr<const Film> film)
}
Job::~Job ()
}
Job::~Job ()
+{
+ stop_thread ();
+}
+
+void
+Job::stop_thread ()
{
if (_thread) {
_thread->interrupt ();
{
if (_thread) {
_thread->interrupt ();
@@
-77,6
+82,7
@@
Job::~Job ()
}
delete _thread;
}
delete _thread;
+ _thread = 0;
}
/** Start the job in a separate thread, returning immediately */
}
/** Start the job in a separate thread, returning immediately */
@@
-174,6
+180,12
@@
Job::run_wrapper ()
set_progress (1);
set_state (FINISHED_ERROR);
set_progress (1);
set_state (FINISHED_ERROR);
+ } catch (dcp::MissingAssetError& e) {
+
+ set_error (e.message(), e.path().string());
+ set_progress (1);
+ set_state (FINISHED_ERROR);
+
} catch (dcp::DCPReadError& e) {
set_error (e.message(), e.detail().get_value_or(""));
} catch (dcp::DCPReadError& e) {
set_error (e.message(), e.detail().get_value_or(""));
@@
-186,6
+198,12
@@
Job::run_wrapper ()
set_progress (1);
set_state (FINISHED_ERROR);
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 (
} catch (std::exception& e) {
set_error (
@@
-290,6
+308,7
@@
Job::set_state (State s)
if (finished) {
emit (boost::bind (boost::ref (Finished)));
if (finished) {
emit (boost::bind (boost::ref (Finished)));
+ FinishedImmediate ();
}
}
}
}
@@
-399,8
+418,6
@@
void
Job::set_error (string s, string d)
{
if (_film) {
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);
}
_film->log()->log (String::compose ("Error in job: %1 (%2)", s, d), LogEntry::TYPE_ERROR);
}
@@
-446,7
+463,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.
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.
}
/// 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.