diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-01-20 23:42:28 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-01-20 23:42:28 +0100 |
| commit | cb6729aa79b555b219974207fbe2ff0510f9d3ea (patch) | |
| tree | 973024e5dbf8bd8d873850909665e6229138ef57 /src/wx/content_menu.cc | |
| parent | d24251b2e0d82236f93ee5415b72849dee2a0ac8 (diff) | |
Bump libdcp for better verification, and make API adjustments.
Diffstat (limited to 'src/wx/content_menu.cc')
| -rw-r--r-- | src/wx/content_menu.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index d93fd31b2..1ac13b143 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -142,7 +142,7 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList _set_dcp_settings->Enable (static_cast<bool>(dcp)); try { DCPExaminer ex (dcp, true); - list<shared_ptr<dcp::CPL> > cpls = ex.cpls (); + auto 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; @@ -151,7 +151,7 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList id++, wxString::Format ( "%s (%s)", - std_to_wx(i->annotation_text()).data(), + std_to_wx(i->annotation_text().get_value_or("")).data(), std_to_wx(i->id()).data() ) ); |