X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_content.cc;h=95f293b4d3ef894f1cfd50529716c30a17aa42cc;hb=1bfc60e40f533c6d931a915deabd97899719eb4b;hp=ef877a17fbd438d2159400190ebc91a185774597;hpb=2e9744b7c79a0e56193b48bd0760a7b989f06079;p=dcpomatic.git diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index ef877a17f..95f293b4d 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -55,6 +55,7 @@ using boost::optional; using boost::function; using boost::dynamic_pointer_cast; using dcp::raw_convert; +using namespace dcpomatic; int const DCPContentProperty::NEEDS_ASSETS = 600; int const DCPContentProperty::NEEDS_KDM = 601; @@ -197,7 +198,7 @@ DCPContent::examine (shared_ptr film, shared_ptr job) } Content::examine (film, job); - shared_ptr examiner (new DCPExaminer (shared_from_this ())); + shared_ptr examiner (new DCPExaminer(shared_from_this(), film->tolerant())); if (examiner->has_video()) { { @@ -477,7 +478,7 @@ DCPContent::reels (shared_ptr film) const if (reel_lengths.empty ()) { /* Old metadata with no reel lengths; get them here instead */ try { - scoped_ptr examiner (new DCPExaminer (shared_from_this())); + scoped_ptr examiner (new DCPExaminer(shared_from_this(), film->tolerant())); reel_lengths = examiner->reel_lengths (); } catch (...) { /* Could not examine the DCP; guess reels */ @@ -624,7 +625,7 @@ DCPContent::can_reference_audio (shared_ptr film, string& why_not) c { shared_ptr decoder; try { - decoder.reset (new DCPDecoder (film, shared_from_this(), false)); + decoder.reset (new DCPDecoder (film, shared_from_this(), false, film->tolerant(), shared_ptr())); } catch (dcp::DCPReadError &) { /* We couldn't read the DCP, so it's probably missing */ return false; @@ -659,7 +660,7 @@ DCPContent::can_reference_text (shared_ptr film, TextType type, stri { shared_ptr decoder; try { - decoder.reset (new DCPDecoder (film, shared_from_this(), false)); + decoder.reset (new DCPDecoder (film, shared_from_this(), false, film->tolerant(), shared_ptr())); } catch (dcp::DCPReadError &) { /* We couldn't read the DCP, so it's probably missing */ return false;