summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-01-20 23:42:28 +0100
committerCarl Hetherington <cth@carlh.net>2021-01-20 23:42:28 +0100
commitcb6729aa79b555b219974207fbe2ff0510f9d3ea (patch)
tree973024e5dbf8bd8d873850909665e6229138ef57 /src/tools
parentd24251b2e0d82236f93ee5415b72849dee2a0ac8 (diff)
Bump libdcp for better verification, and make API adjustments.
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/dcpomatic_player.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 0586db975..c6c4c0878 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -315,7 +315,7 @@ public:
"playback-started %s %s %s",
time.timecode(_film->video_frame_rate()).c_str(),
dcp->directories().front().string().c_str(),
- playing_cpl->annotation_text().c_str()
+ playing_cpl->annotation_text().get_value_or("").c_str()
)
);
}
@@ -455,7 +455,7 @@ public:
for (auto i: ex.cpls()) {
wxMenuItem* j = _cpl_menu->AppendRadioItem(
id,
- wxString::Format("%s (%s)", std_to_wx(i->annotation_text()).data(), std_to_wx(i->id()).data())
+ wxString::Format("%s (%s)", std_to_wx(i->annotation_text().get_value_or("")).data(), std_to_wx(i->id()).data())
);
j->Check(!first->cpl() || i->id() == *first->cpl());
++id;
@@ -532,7 +532,7 @@ private:
view->AppendRadioItem(ID_view_scale_quarter, _("Decode at quarter resolution"))->Check(c && c.get() == 2);
wxMenu* tools = new wxMenu;
- _tools_verify = tools->Append (ID_tools_verify, _("Verify DCP"));
+ _tools_verify = tools->Append (ID_tools_verify, _("Verify DCP..."));
tools->AppendSeparator ();
tools->Append (ID_tools_check_for_updates, _("Check for updates"));
tools->Append (ID_tools_timing, _("Timing..."));