Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

[dcpomatic.git] / src / lib / dcp_examiner.cc

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index 8ce4aee001df26f64ca57cb2cb5d2d76c3e17172..dfb47f2ebf6d1f009e9476620e4c708ea84591c4 100644 (file)
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -58,7 +58,6 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
        , _audio_length (0)
        , _has_video (false)
        , _has_audio (false)
-       , _captions (0)
        , _encrypted (false)
        , _needs_assets (false)
        , _kdm_valid (false)
@@ -66,6 +65,10 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
 {
        shared_ptr<dcp::CPL> cpl;
 
+       for (int i = 0; i < TEXT_COUNT; ++i) {
+               _has_text[i] = false;
+       }
+
        if (content->cpl ()) {
                /* Use the CPL that the content was using before */
                BOOST_FOREACH (shared_ptr<dcp::CPL> i, cpls()) {
@@ -105,6 +108,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
 
        _cpl = cpl->id ();
        _name = cpl->content_title_text ();
+       _content_kind = cpl->content_kind ();
 
        BOOST_FOREACH (shared_ptr<dcp::Reel> i, cpl->reels()) {
 
@@ -166,17 +170,17 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
                                return;
                        }
 
-                       ++_captions;
+                       _has_text[TEXT_OPEN_SUBTITLE] = true;
                }
 
-               if (i->closed_caption ()) {
-                       if (!i->closed_caption()->asset_ref().resolved()) {
+               BOOST_FOREACH (shared_ptr<dcp::ReelClosedCaptionAsset> 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;
                        }
 
-                       ++_captions;
+                       _has_text[TEXT_CLOSED_CAPTION] = true;
                }
 
                if (i->main_picture()) {
@@ -185,8 +189,8 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> 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());
                }
        }