summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-03-24 13:34:08 +0100
committerCarl Hetherington <cth@carlh.net>2022-03-25 07:53:08 +0100
commit5215408c36898039e8fa294bb74bf94d5762b0c7 (patch)
tree66d4937b35da2848a8ce85219d2330036f2ddd4f /src
parenta939e4b642ff9b398920dee1d0154729217347a5 (diff)
Bump libdcp for fix to remove erroneous <EntryPoint> and <Duration> markers from <MainMarkers> (#2215).
Diffstat (limited to 'src')
-rw-r--r--src/lib/reel_writer.cc2
-rw-r--r--src/wx/verify_dcp_dialog.cc6
2 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index 78148d18f..d8ce8882e 100644
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -698,7 +698,7 @@ ReelWriter::create_reel_markers (shared_ptr<dcp::Reel> reel) const
}
if (!reel_markers.empty ()) {
- auto ma = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(film()->video_frame_rate(), 1), reel->duration(), 0);
+ auto ma = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(film()->video_frame_rate(), 1), reel->duration());
for (auto const& i: reel_markers) {
DCPTime relative = i.second - _period.from;
auto hmsf = relative.split (film()->video_frame_rate());
diff --git a/src/wx/verify_dcp_dialog.cc b/src/wx/verify_dcp_dialog.cc
index 3ab9062c7..b76176728 100644
--- a/src/wx/verify_dcp_dialog.cc
+++ b/src/wx/verify_dcp_dialog.cc
@@ -371,6 +371,12 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr<VerifyDCPJob> job
case dcp::VerificationNote::Code::INCORRECT_CLOSED_CAPTION_ORDERING:
add(i, _("Some closed captions are not listed in the order of their vertical position."));
break;
+ case dcp::VerificationNote::Code::UNEXPECTED_ENTRY_POINT:
+ add(i, _("There is a <EntryPoint> tag inside a <MainMarkers>."));
+ break;
+ case dcp::VerificationNote::Code::UNEXPECTED_DURATION:
+ add(i, _("There is a <Duration> tag inside a <MainMarkers>."));
+ break;
}
}