Cleanup: sorting.

[libdcp.git] / tools / dcpinfo.cc

diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc
index 38e43eb1425229b47e2fb0730b457b3e35deb7dd..6a37be1c1f4941347e1d218a22f9774658e55007 100644 (file)
--- 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.
 
@@ -31,49 +31,51 @@
     files in the program, then also delete it here.
 */
 
+
+#include "common.h"
+#include "compose.hpp"
+#include "cpl.h"
 #include "dcp.h"
+#include "decrypted_kdm.h"
+#include "encrypted_kdm.h"
 #include "exceptions.h"
-#include "reel.h"
-#include "sound_asset.h"
+#include "interop_subtitle_asset.h"
+#include "mono_picture_asset.h"
 #include "picture_asset.h"
-#include "subtitle_asset.h"
+#include "reel.h"
 #include "reel_picture_asset.h"
 #include "reel_sound_asset.h"
 #include "reel_subtitle_asset.h"
-#include "subtitle_string.h"
-#include "subtitle_image.h"
-#include "interop_subtitle_asset.h"
 #include "smpte_subtitle_asset.h"
-#include "mono_picture_asset.h"
-#include "encrypted_kdm.h"
-#include "decrypted_kdm.h"
-#include "cpl.h"
-#include "common.h"
-#include "compose.hpp"
+#include "sound_asset.h"
+#include "subtitle_asset.h"
+#include "subtitle_image.h"
+#include "subtitle_string.h"
 #include <getopt.h>
 #include <boost/filesystem.hpp>
-#include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
 #include <iostream>
 #include <cstdlib>
 #include <sstream>
 #include <inttypes.h>
 
-using std::string;
+
 using std::cerr;
 using std::cout;
+using std::dynamic_pointer_cast;
+using std::exception;
 using std::list;
-using std::pair;
-using std::min;
 using std::max;
-using std::exception;
-using std::vector;
+using std::min;
+using std::pair;
+using std::shared_ptr;
+using std::string;
 using std::stringstream;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::vector;
 using boost::optional;
 using namespace dcp;
 
+
 static void
 help (string n)
 {
@@ -143,7 +145,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 {
@@ -162,10 +164,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 +250,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 +261,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 +285,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;
@@ -314,7 +318,7 @@ main (int argc, char* argv[])
 
                switch (c) {
                case 'v':
-                       cout << "libdcp version " << LIBDCP_VERSION << "\n";
+                       cout << "libdcp version " << dcp::version << "\n";
                        exit (EXIT_SUCCESS);
                case 'h':
                        help (argv[0]);
@@ -358,10 +362,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);
@@ -382,7 +386,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";
                }
 
@@ -394,11 +398,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";
                        }
@@ -431,7 +435,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;
 }