diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-11-16 00:19:29 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-11-16 00:19:29 +0000 |
| commit | 8a05e8f7d58fb7411e091ae8161c351f735f7735 (patch) | |
| tree | 4585a7105edc9095d7f5e7719f310f3e799c5ee8 /src/wx | |
| parent | 12a621982da4a7e0976829654ecc16026665c4e9 (diff) | |
Catch failures to read missing DCPs in various places.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/content_menu.cc | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index 2d49ac4be..14632d984 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -36,6 +36,7 @@ #include "lib/ffmpeg_content.h" #include "lib/audio_content.h" #include <dcp/cpl.h> +#include <dcp/exceptions.h> #include <wx/wx.h> #include <wx/dirdlg.h> #include <boost/foreach.hpp> @@ -132,21 +133,25 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList if (dcp) { _kdm->Enable (dcp->encrypted ()); _ov->Enable (dcp->needs_assets ()); - DCPExaminer ex (dcp); - list<shared_ptr<dcp::CPL> > cpls = ex.cpls (); - _choose_cpl->Enable (cpls.size() > 1); - /* We can't have 0 as a menu item ID on OS X */ - int id = 1; - BOOST_FOREACH (shared_ptr<dcp::CPL> i, cpls) { - wxMenuItem* item = _cpl_menu->AppendCheckItem ( - id++, - wxString::Format ( - "%s (%s)", - std_to_wx(i->annotation_text()).data(), - std_to_wx(i->id()).data() - ) - ); - item->Check (dcp->cpl() && dcp->cpl() == i->id()); + try { + DCPExaminer ex (dcp); + list<shared_ptr<dcp::CPL> > cpls = ex.cpls (); + _choose_cpl->Enable (cpls.size() > 1); + /* We can't have 0 as a menu item ID on OS X */ + int id = 1; + BOOST_FOREACH (shared_ptr<dcp::CPL> i, cpls) { + wxMenuItem* item = _cpl_menu->AppendCheckItem ( + id++, + wxString::Format ( + "%s (%s)", + std_to_wx(i->annotation_text()).data(), + std_to_wx(i->id()).data() + ) + ); + item->Check (dcp->cpl() && dcp->cpl() == i->id()); + } + } catch (dcp::DCPReadError) { + /* The DCP is probably missing */ } } else { _kdm->Enable (false); |