#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"
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)
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;
}
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;
}
_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()) {
_text_count[TEXT_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;
}
_text_count[TEXT_CLOSED_CAPTION]++;
+ _dcp_text_tracks.push_back (DCPTextTrack(j->annotation_text(), j->language().get_value_or(_("Unknown"))));
}
if (i->main_markers ()) {
}
}
- _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()) {
_standard = cpl->standard().get();
_three_d = !cpl->reels().empty() && cpl->reels().front()->main_picture() &&
dynamic_pointer_cast<dcp::StereoPictureAsset> (cpl->reels().front()->main_picture()->asset());
- _ratings = list_to_vector (cpl->ratings());
- _content_version = cpl->content_version_label_text ();
+ _ratings = cpl->ratings();
+ for (auto i: cpl->content_versions()) {
+ _content_versions.push_back (i.label_text);
+ }
_cpl = cpl->id ();
}