summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-01-22 15:48:03 +0000
committerCarl Hetherington <cth@carlh.net>2019-01-22 15:48:03 +0000
commit360db7a7d5429c3bcf7c5c0e39e29a94a74d8f8a (patch)
treea09ed7810ec8537557d40c0afebca24362d55717
parenta2710f33a053e0e9c3ad1807549069c7e9c6fe6c (diff)
Put details of missing asset paths into the job details... box.
-rw-r--r--cscript4
-rw-r--r--src/lib/job.cc8
2 files changed, 9 insertions, 3 deletions
diff --git a/cscript b/cscript
index 77c5a94ba..969bb7227 100644
--- a/cscript
+++ b/cscript
@@ -327,8 +327,8 @@ def dependencies(target):
# Use distro-provided FFmpeg on Arch
deps = []
- deps.append(('libdcp', '4676616'))
- deps.append(('libsub', 'f93c12c'))
+ deps.append(('libdcp', '49f9ec2'))
+ deps.append(('libsub', '1e1836a'))
deps.append(('rtaudio-cdist', 'aad62d7'))
return deps
diff --git a/src/lib/job.cc b/src/lib/job.cc
index 763005b57..610d486b6 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
@@ -172,6 +172,12 @@ Job::run_wrapper ()
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(""));