projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump libdcp for better verification, and make API adjustments.
[dcpomatic.git]
/
src
/
wx
/
content_menu.cc
diff --git
a/src/wx/content_menu.cc
b/src/wx/content_menu.cc
index d93fd31b2ce023c6730c7ba67d46389c711281ae..1ac13b143356b5fea68f7e8d101eb9f236df3c20 100644
(file)
--- 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);
_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;
_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)",
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()
)
);
std_to_wx(i->id()).data()
)
);