diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-08-30 23:16:21 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-08-30 23:16:21 +0100 |
| commit | 1f88a38a2a607c21988a403e76f315444c4be36b (patch) | |
| tree | 2b14f959784faf33eec61172552d9c50b72a0f65 /src/wx | |
| parent | 77d2514fee2919c32e4db92b8f75369754d17fb5 (diff) | |
Make player more tolerant of some DCP errors.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/content_menu.cc | 4 | ||||
| -rw-r--r-- | src/wx/text_panel.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index e5cadd794..c5dc1606d 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -126,7 +126,7 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList _kdm->Enable (dcp->encrypted ()); _ov->Enable (dcp->needs_assets ()); try { - DCPExaminer ex (dcp); + DCPExaminer ex (dcp, true); 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 */ @@ -433,7 +433,7 @@ ContentMenu::cpl_selected (wxCommandEvent& ev) shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (_content.front ()); DCPOMATIC_ASSERT (dcp); - DCPExaminer ex (dcp); + DCPExaminer ex (dcp, true); list<shared_ptr<dcp::CPL> > cpls = ex.cpls (); DCPOMATIC_ASSERT (ev.GetId() > 0); DCPOMATIC_ASSERT (ev.GetId() <= int (cpls.size())); diff --git a/src/wx/text_panel.cc b/src/wx/text_panel.cc index 98398aaa6..27465ad68 100644 --- a/src/wx/text_panel.cc +++ b/src/wx/text_panel.cc @@ -667,7 +667,7 @@ TextPanel::text_view_clicked () ContentList c = _parent->selected_text (); DCPOMATIC_ASSERT (c.size() == 1); - shared_ptr<Decoder> decoder = decoder_factory (_parent->film(), c.front(), false, shared_ptr<Decoder>()); + shared_ptr<Decoder> decoder = decoder_factory (_parent->film(), c.front(), false, false, shared_ptr<Decoder>()); if (decoder) { _text_view = new TextView (this, _parent->film(), c.front(), c.front()->text_of_original_type(_original_type), decoder, _parent->film_viewer()); |