summaryrefslogtreecommitdiff
path: root/src/lib/dcp_examiner.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-01-04 21:32:13 +0100
committerCarl Hetherington <cth@carlh.net>2021-01-07 23:27:56 +0100
commita5d004b0773f633401528392fc28e66d70e13ac8 (patch)
tree9f83ff2ab353f5a63918210d4930d0ead228375e /src/lib/dcp_examiner.cc
parentdd9be86db6cde0afa5da0d1d1ac43b42e05dca26 (diff)
BOOST_FOREACH.
Diffstat (limited to 'src/lib/dcp_examiner.cc')
-rw-r--r--src/lib/dcp_examiner.cc15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index fc1fbc53a..191022f12 100644
--- 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"
@@ -77,7 +76,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool 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;
}
@@ -87,9 +86,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 +118,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()) {
@@ -182,7 +181,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
_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;
@@ -225,7 +224,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
/* 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()) {
+ for (auto 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);
@@ -260,7 +259,7 @@ 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();
- BOOST_FOREACH (dcp::ContentVersion i, cpl->content_versions()) {
+ for (auto i: cpl->content_versions()) {
_content_versions.push_back (i.label_text);
}