From a22b277dd8896511a322459f45db8e99ad1ab7fe Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 22 Aug 2018 16:21:57 +0100 Subject: [PATCH] libdcp updates for multiple CCAPs. --- cscript | 4 ++-- src/lib/dcp_decoder.cc | 6 +++--- src/lib/dcp_examiner.cc | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cscript b/cscript index 242d41e4a..f1e530e80 100644 --- a/cscript +++ b/cscript @@ -328,8 +328,8 @@ def dependencies(target): else: deps = [('ffmpeg-cdist', '27f25fb', ffmpeg_options)] - deps.append(('libdcp', '348aaa6')) - deps.append(('libsub', '75d9785')) + deps.append(('libdcp', '9f75a44')) + deps.append(('libsub', '920b428')) deps.append(('rtaudio-cdist', '739969e')) return deps diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc index b9cb66a60..f4da18649 100644 --- a/src/lib/dcp_decoder.cc +++ b/src/lib/dcp_decoder.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2016 Carl Hetherington + Copyright (C) 2014-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -201,10 +201,10 @@ DCPDecoder::pass_texts (ContentTime next) ); ++decoder; } - if ((*_reel)->closed_caption()) { + BOOST_FOREACH (shared_ptr i, (*_reel)->closed_captions()) { DCPOMATIC_ASSERT (decoder != text.end ()); pass_texts ( - next, (*_reel)->closed_caption()->asset(), _dcp_content->reference_text(TEXT_CLOSED_CAPTION), (*_reel)->closed_caption()->entry_point(), *decoder + next, i->asset(), _dcp_content->reference_text(TEXT_CLOSED_CAPTION), i->entry_point(), *decoder ); ++decoder; } diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc index 4b9238e5b..1785669dd 100644 --- a/src/lib/dcp_examiner.cc +++ b/src/lib/dcp_examiner.cc @@ -172,8 +172,8 @@ DCPExaminer::DCPExaminer (shared_ptr content) _has_text[TEXT_OPEN_SUBTITLE] = true; } - if (i->closed_caption ()) { - if (!i->closed_caption()->asset_ref().resolved()) { + BOOST_FOREACH (shared_ptr j, i->closed_captions()) { + if (!j->asset_ref().resolved()) { /* We are missing this asset so we can't continue; examination will be repeated later */ _needs_assets = true; return; @@ -188,8 +188,8 @@ DCPExaminer::DCPExaminer (shared_ptr content) _reel_lengths.push_back (i->main_sound()->duration()); } else if (i->main_subtitle()) { _reel_lengths.push_back (i->main_subtitle()->duration()); - } else if (i->closed_caption()) { - _reel_lengths.push_back (i->closed_caption()->duration()); + } else if (!i->closed_captions().empty()) { + _reel_lengths.push_back (i->closed_captions().front()->duration()); } } -- 2.30.2