diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-12-15 11:01:40 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-12-15 11:01:40 +0000 |
| commit | d7bffb968f0abd5c1e6d5e72e6ea70a701fe5d48 (patch) | |
| tree | 65cdd7417592339ee688a8547daf93915fb94eeb /src/tools | |
| parent | 815e4cf7441d83ffca6d4d797a1a313f7c6464ab (diff) | |
Hand-apply d1bffe67820adaa10654f722b15eebdd773b3680; remove unnecessary JobWrapper stuff.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 1a05ed2cb..ae0c25591 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -36,7 +36,6 @@ #include "wx/film_editor.h" #include "wx/job_manager_view.h" #include "wx/config_dialog.h" -#include "wx/job_wrapper.h" #include "wx/wx_util.h" #include "wx/new_film_dialog.h" #include "wx/properties_dialog.h" @@ -399,8 +398,14 @@ private: return; } } - - JobWrapper::make_dcp (this, _film); + + try { + _film->make_dcp (); + } catch (BadSettingError& e) { + error_dialog (this, wxString::Format (_("Bad setting for %s (%s)"), std_to_wx(e.setting()).data(), std_to_wx(e.what()).data())); + } catch (std::exception& e) { + error_dialog (this, wxString::Format (_("Could not make DCP: %s"), std_to_wx(e.what()).data())); + } } void jobs_make_kdms () |