Make CPL annotation_text optional.

[libdcp.git] / tools / dcpinfo.cc

diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc
index 38e43eb1425229b47e2fb0730b457b3e35deb7dd..aa1ce8c2425f8e1167991a83c4794f3f787ec5b4 100644 (file)
--- a/tools/dcpinfo.cc
+++ b/tools/dcpinfo.cc
@@ -69,8 +69,8 @@ using std::max;
 using std::exception;
 using std::vector;
 using std::stringstream;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 using boost::optional;
 using namespace dcp;
 
@@ -162,10 +162,10 @@ main_picture (vector<string> const& only, shared_ptr<Reel> reel, bool analyse, b
                        for (int64_t i = 0; i < ma->intrinsic_duration(); ++i) {
                                shared_ptr<const MonoPictureFrame> frame = reader->get_frame (i);
                                if (SHOULD_PICTURE) {
-                                       printf("Frame %" PRId64 " J2K size %7d", i, frame->j2k_size());
+                                       printf("Frame %" PRId64 " J2K size %7d", i, frame->size());
                                }
-                               j2k_size_range.first = min(j2k_size_range.first, frame->j2k_size());
-                               j2k_size_range.second = max(j2k_size_range.second, frame->j2k_size());
+                               j2k_size_range.first = min(j2k_size_range.first, frame->size());
+                               j2k_size_range.second = max(j2k_size_range.second, frame->size());
 
                                if (decompress) {
                                        try {
@@ -248,7 +248,7 @@ main_subtitle (vector<string> const& only, shared_ptr<Reel> reel, bool list_subt
        OUTPUT_SUBTITLE("      Subtitle ID: %1", ms->id());
 
        if (ms->asset_ref().resolved()) {
-               list<shared_ptr<Subtitle> > subs = ms->asset()->subtitles ();
+               auto subs = ms->asset()->subtitles ();
                OUTPUT_SUBTITLE("\n      Subtitle:    %1 subtitles", subs.size());
                shared_ptr<InteropSubtitleAsset> iop = dynamic_pointer_cast<InteropSubtitleAsset> (ms->asset());
                if (iop) {
@@ -259,14 +259,14 @@ main_subtitle (vector<string> const& only, shared_ptr<Reel> reel, bool list_subt
                        OUTPUT_SUBTITLE(" in %1\n", smpte->language().get());
                }
                if (list_subtitles) {
-                       BOOST_FOREACH (shared_ptr<Subtitle> k, subs) {
-                               shared_ptr<SubtitleString> ks = dynamic_pointer_cast<SubtitleString> (k);
+                       for (auto k: subs) {
+                               auto ks = dynamic_pointer_cast<const SubtitleString>(k);
                                if (ks) {
                                        stringstream s;
                                        s << *ks;
                                        OUTPUT_SUBTITLE("%1\n", s.str());
                                }
-                               shared_ptr<SubtitleImage> is = dynamic_pointer_cast<SubtitleImage> (k);
+                               auto is = dynamic_pointer_cast<const SubtitleImage>(k);
                                if (is) {
                                        stringstream s;
                                        s << *is;
@@ -283,6 +283,8 @@ main_subtitle (vector<string> const& only, shared_ptr<Reel> reel, bool list_subt
 int
 main (int argc, char* argv[])
 {
+       dcp::init ();
+
        bool subtitles = false;
        bool picture = false;
        bool decompress = false;
@@ -358,10 +360,10 @@ main (int argc, char* argv[])
                only = boost::split(only, *only_string, boost::is_any_of(","));
        }
 
-       list<shared_ptr<CPL> > cpls;
+       vector<shared_ptr<CPL> > cpls;
        if (boost::filesystem::is_directory(argv[optind])) {
                DCP* dcp = 0;
-               list<dcp::VerificationNote> notes;
+               vector<dcp::VerificationNote> notes;
                try {
                        dcp = new DCP (argv[optind]);
                        dcp->read (&notes);
@@ -395,7 +397,7 @@ 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());
+               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()) {