X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_content.cc;h=d1a65800155ec13559b071ee41f3332a782af08a;hb=59e769023c392c332331567a1aea94660002c463;hp=cd82ee6e9e811b54a6b7538d1a8a712d9ca22947;hpb=8596e31595c9aba128078ba4a3950543ea291f98;p=dcpomatic.git diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index cd82ee6e9..d1a658001 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -77,12 +77,12 @@ DCPContent::read_directory (boost::filesystem::path p) } void -DCPContent::examine (shared_ptr job, bool calculate_digest) +DCPContent::examine (shared_ptr job) { bool const could_be_played = can_be_played (); job->set_progress_unknown (); - Content::examine (job, calculate_digest); + Content::examine (job); shared_ptr examiner (new DCPExaminer (shared_from_this ())); take_from_video_examiner (examiner); @@ -139,7 +139,7 @@ DCPTime DCPContent::full_length () const { shared_ptr film = _film.lock (); - assert (film); + DCPOMATIC_ASSERT (film); return DCPTime (video_length (), FrameRateChange (video_frame_rate (), film->video_frame_rate ())); }