Use pofilter to check i18n and fix some .po file glitches.

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

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index 4b9238e5b3d1c7f3758c833fc615a0d76d780bc0..c70d8b2dbc9172966e400ce8451c9a0ed6168493 100644 (file)
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -66,7 +66,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
        shared_ptr<dcp::CPL> cpl;
 
        for (int i = 0; i < TEXT_COUNT; ++i) {
-               _has_text[i] = false;
+               _text_count[i] = 0;
        }
 
        if (content->cpl ()) {
@@ -108,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()) {
 
@@ -169,17 +170,17 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
                                return;
                        }
 
-                       _has_text[TEXT_OPEN_SUBTITLE] = true;
+                       _text_count[TEXT_OPEN_SUBTITLE] = 1;
                }
 
-               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;
                        }
 
-                       _has_text[TEXT_CLOSED_CAPTION] = true;
+                       _text_count[TEXT_CLOSED_CAPTION]++;
                }
 
                if (i->main_picture()) {
@@ -188,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());
                }
        }