diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-12-03 00:49:37 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-12-03 00:49:37 +0000 |
| commit | edbb857ebfc7fa0f423ab6f402736f46a4fa058b (patch) | |
| tree | 4c2d7562fd0c279f3d8ce263b6efdff595526c56 /src | |
| parent | baa5aa9a69ab605cc800d4bbbddd55a33fcf5b97 (diff) | |
Hand apply e4615ebe1cef519e3aaee317ca6d319fbb9a0903 from master; put job errors in the logs.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/filter_graph.cc | 2 | ||||
| -rw-r--r-- | src/lib/job.cc | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/filter_graph.cc b/src/lib/filter_graph.cc index 3d1996fb0..86f291fde 100644 --- a/src/lib/filter_graph.cc +++ b/src/lib/filter_graph.cc @@ -149,7 +149,7 @@ FilterGraph::process (AVFrame* frame) } else { int r = av_buffersrc_write_frame (_buffer_src_context, frame); if (r < 0) { - throw DecodeError (N_("could not push buffer into filter chain (%1)."), r); + throw DecodeError (String::compose (N_("could not push buffer into filter chain (%1)."), r)); } while (true) { diff --git a/src/lib/job.cc b/src/lib/job.cc index 3cd729515..5b0b9c604 100644 --- a/src/lib/job.cc +++ b/src/lib/job.cc @@ -39,6 +39,8 @@ using std::list; using std::cout; using boost::shared_ptr; +#define LOG_ERROR_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_ERROR); + Job::Job (shared_ptr<const Film> f) : _film (f) , _thread (0) @@ -281,6 +283,9 @@ Job::error_summary () const void Job::set_error (string s, string d) { + LOG_ERROR_NC (s); + LOG_ERROR_NC (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; |