More enum class additions.

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

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index 65cfb884ed8d39911f519b5d196c700a1c3cdae1..89ddfd6eae907b49c3d1d46237275eea6a280ef6 100644 (file)
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -44,7 +44,6 @@
 #include <dcp/reel_closed_caption_asset.h>
 #include <dcp/reel_markers_asset.h>
 #include <dcp/sound_asset.h>
-#include <boost/foreach.hpp>
 #include <iostream>
 
 #include "i18n.h"
@@ -53,31 +52,21 @@ using std::list;
 using std::cout;
 using std::runtime_error;
 using std::map;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 
 DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
        : DCP (content, tolerant)
-       , _video_length (0)
-       , _audio_length (0)
-       , _has_video (false)
-       , _has_audio (false)
-       , _encrypted (false)
-       , _needs_assets (false)
-       , _kdm_valid (false)
-       , _three_d (false)
-       , _has_atmos (false)
-       , _atmos_length (0)
 {
        shared_ptr<dcp::CPL> cpl;
 
-       for (int i = 0; i < TEXT_COUNT; ++i) {
+       for (int i = 0; i < static_cast<int>(TextType::COUNT); ++i) {
                _text_count[i] = 0;
        }
 
        if (content->cpl ()) {
                /* Use the CPL that the content was using before */
-               BOOST_FOREACH (shared_ptr<dcp::CPL> i, cpls()) {
+               for (auto i: cpls()) {
                        if (i->id() == content->cpl().get()) {
                                cpl = i;
                        }
@@ -87,9 +76,9 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 
                int least_unsatisfied = INT_MAX;
 
-               BOOST_FOREACH (shared_ptr<dcp::CPL> i, cpls()) {
+               for (auto i: cpls()) {
                        int unsatisfied = 0;
-                       BOOST_FOREACH (shared_ptr<dcp::Reel> j, i->reels()) {
+                       for (auto j: i->reels()) {
                                if (j->main_picture() && !j->main_picture()->asset_ref().resolved()) {
                                        ++unsatisfied;
                                }
@@ -119,7 +108,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
        _name = cpl->content_title_text ();
        _content_kind = cpl->content_kind ();
 
-       BOOST_FOREACH (shared_ptr<dcp::Reel> i, cpl->reels()) {
+       for (auto i: cpl->reels()) {
 
                if (i->main_picture ()) {
                        if (!i->main_picture()->asset_ref().resolved()) {
@@ -128,7 +117,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
                                return;
                        }
 
-                       dcp::Fraction const frac = i->main_picture()->edit_rate ();
+                       auto const frac = i->main_picture()->edit_rate ();
                        float const fr = float(frac.numerator) / frac.denominator;
                        if (!_video_frame_rate) {
                                _video_frame_rate = fr;
@@ -137,7 +126,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
                        }
 
                        _has_video = true;
-                       shared_ptr<dcp::PictureAsset> asset = i->main_picture()->asset ();
+                       auto asset = i->main_picture()->asset();
                        if (!_video_size) {
                                _video_size = asset->size ();
                        } else if (_video_size.get() != asset->size ()) {
@@ -155,7 +144,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
                        }
 
                        _has_audio = true;
-                       shared_ptr<dcp::SoundAsset> asset = i->main_sound()->asset ();
+                       auto asset = i->main_sound()->asset();
 
                        if (!_audio_channels) {
                                _audio_channels = asset->channels ();
@@ -179,17 +168,17 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
                                return;
                        }
 
-                       _text_count[TEXT_OPEN_SUBTITLE] = 1;
+                       _text_count[static_cast<int>(TextType::OPEN_SUBTITLE)] = 1;
                }
 
-               BOOST_FOREACH (shared_ptr<dcp::ReelClosedCaptionAsset> j, i->closed_captions()) {
+               for (auto 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;
                        }
 
-                       _text_count[TEXT_CLOSED_CAPTION]++;
+                       _text_count[static_cast<int>(TextType::CLOSED_CAPTION)]++;
                        _dcp_text_tracks.push_back (DCPTextTrack(j->annotation_text(), j->language().get_value_or(_("Unknown"))));
                }
 
@@ -220,20 +209,20 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
                }
        }
 
-       _encrypted = cpl->encrypted ();
+       _encrypted = cpl->any_encrypted ();
        _kdm_valid = true;
 
        /* Check that we can read the first picture, sound and subtitle frames of each reel */
        try {
-               BOOST_FOREACH (shared_ptr<dcp::Reel> i, cpl->reels()) {
-                       shared_ptr<dcp::PictureAsset> pic = i->main_picture()->asset ();
-                       shared_ptr<dcp::MonoPictureAsset> mono = dynamic_pointer_cast<dcp::MonoPictureAsset> (pic);
-                       shared_ptr<dcp::StereoPictureAsset> stereo = dynamic_pointer_cast<dcp::StereoPictureAsset> (pic);
+               for (auto i: cpl->reels()) {
+                       auto pic = i->main_picture()->asset ();
+                       auto mono = dynamic_pointer_cast<dcp::MonoPictureAsset> (pic);
+                       auto stereo = dynamic_pointer_cast<dcp::StereoPictureAsset> (pic);
 
                        if (mono) {
                                mono->start_read()->get_frame(0)->xyz_image ();
                        } else {
-                               stereo->start_read()->get_frame(0)->xyz_image (dcp::EYE_LEFT);
+                               stereo->start_read()->get_frame(0)->xyz_image(dcp::Eye::LEFT);
                        }
 
                        if (i->main_sound()) {
@@ -260,7 +249,9 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
        _three_d = !cpl->reels().empty() && cpl->reels().front()->main_picture() &&
                dynamic_pointer_cast<dcp::StereoPictureAsset> (cpl->reels().front()->main_picture()->asset());
        _ratings = cpl->ratings();
-       _content_version = cpl->content_version().label_text;
+       for (auto i: cpl->content_versions()) {
+               _content_versions.push_back (i.label_text);
+       }
 
        _cpl = cpl->id ();
 }