diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-12-13 00:47:30 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-12-13 00:47:30 +0000 |
| commit | 138f5ea7697dd8e8ed4180ba41ef41ab686c305d (patch) | |
| tree | 8a9ea3824ab51fdd32da14e37b648700aa2aff93 /src | |
| parent | 9a34c90600fcce228322d5b52581fb6c0dd10a5b (diff) | |
| parent | 3a4c1c53d261ad9bd5a2afd6df89dbbc38d9089d (diff) | |
Merge branch 'master' of /home/carl/git/dvdomatic
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/job.cc | 6 | ||||
| -rw-r--r-- | src/lib/make_dcp_job.cc | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/lib/job.cc b/src/lib/job.cc index 201397f08..896862d14 100644 --- a/src/lib/job.cc +++ b/src/lib/job.cc @@ -75,6 +75,12 @@ Job::run_wrapper () set_state (FINISHED_ERROR); set_error (e.what ()); + } catch (...) { + + set_progress (1); + set_state (FINISHED_ERROR); + set_error ("unknown exception"); + } } diff --git a/src/lib/make_dcp_job.cc b/src/lib/make_dcp_job.cc index 026724806..65cd272e7 100644 --- a/src/lib/make_dcp_job.cc +++ b/src/lib/make_dcp_job.cc @@ -103,7 +103,7 @@ MakeDCPJob::run () dcp.add_cpl (cpl); - descend (0.9); + descend (0.8); shared_ptr<libdcp::MonoPictureAsset> pa ( new libdcp::MonoPictureAsset ( boost::bind (&MakeDCPJob::j2c_path, this, _1), @@ -137,8 +137,10 @@ MakeDCPJob::run () ascend (); } + descend (0.1); cpl->add_reel (shared_ptr<libdcp::Reel> (new libdcp::Reel (pa, sa, shared_ptr<libdcp::SubtitleAsset> ()))); dcp.write_xml (); + ascend (); set_progress (1); set_state (FINISHED_OK); |