X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=tools%2Fdcpinfo.cc;h=c85198587947ce876f73bbace97ccafae09a7af4;hb=f8882632e7f2968f97f551615da3e8403a398992;hp=5ca9b24ff651cc427193e6ca2937acd02f679b51;hpb=e668388d1a552c845dbe9ae3cdcdfd979f2da582;p=libdcp.git

diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc
index 5ca9b24f..c8519858 100644
--- a/tools/dcpinfo.cc
+++ b/tools/dcpinfo.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -52,7 +52,6 @@
 #include "compose.hpp"
 #include <getopt.h>
 #include <boost/filesystem.hpp>
-#include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
 #include <iostream>
 #include <cstdlib>
@@ -143,7 +142,7 @@ main_picture (vector<string> const& only, shared_ptr<Reel> reel, bool analyse, b
 		OUTPUT_PICTURE(
 			" duration %1 (%2) intrinsic %3",
 			*mp->duration(),
-			dcp::Time(*mp->duration(), mp->frame_rate().as_float(), mp->frame_rate().as_float()).as_string(dcp::SMPTE),
+			dcp::Time(*mp->duration(), mp->frame_rate().as_float(), mp->frame_rate().as_float()).as_string(dcp::Standard::SMPTE),
 		     	mp->intrinsic_duration()
 			);
 	} else {
@@ -384,7 +383,7 @@ main (int argc, char* argv[])
 		OUTPUT_DCP_PATH("DCP: %1\n", boost::filesystem::path(argv[optind]).string());
 
 		dcp::filter_notes (notes, ignore_missing_assets);
-		BOOST_FOREACH (dcp::VerificationNote i, notes) {
+		for (auto i: notes) {
 			cerr << "Error: " << note_to_string(i) << "\n";
 		}
 
@@ -396,11 +395,11 @@ main (int argc, char* argv[])
 
 	dcp::Time total_time;
 
-	BOOST_FOREACH (shared_ptr<CPL> i, cpls) {
-		OUTPUT_CPL_NAME_ID("  CPL: %1 %2\n", i->annotation_text(), i->id());
+	for (auto i: cpls) {
+		OUTPUT_CPL_NAME_ID("  CPL: %1 %2\n", i->annotation_text().get_value_or(""), i->id());
 
 		int R = 1;
-		BOOST_FOREACH (shared_ptr<Reel> j, i->reels()) {
+		for (auto j: i->reels()) {
 			if (should_output(only, "picture") || should_output(only, "sound") || should_output(only, "subtitle")) {
 				cout << "    Reel " << R << "\n";
 			}
@@ -433,7 +432,7 @@ main (int argc, char* argv[])
 		}
 	}
 
-	OUTPUT_TOTAL_TIME("Total: %1\n", total_time.as_string(dcp::SMPTE));
+	OUTPUT_TOTAL_TIME("Total: %1\n", total_time.as_string(dcp::Standard::SMPTE));
 
 	return 0;
 }