#include "exceptions.h"
#include "film.h"
#include "log.h"
+#include "dcpomatic_log.h"
#include "compose.hpp"
#include <dcp/exceptions.h>
#include <sub/exceptions.h>
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)
} catch (dcp::DCPReadError& e) {
- set_error (e.what(), "");//message(), e.detail().get_value_or(""));
+ set_error (e.message(), e.detail().get_value_or(""));
set_progress (1);
set_state (FINISHED_ERROR);
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);
}
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;
+}