c++11 bits in examples/

[libdcp.git] / examples / read_dcp.cc

diff --git a/examples/read_dcp.cc b/examples/read_dcp.cc
index 7bd1e2db686ce2133d0cfa755a537bf8e6ed75fb..998d0dc4302d9faa19519c2a80ebdcd12faa997c 100644 (file)
--- a/examples/read_dcp.cc
+++ b/examples/read_dcp.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -51,50 +51,52 @@ main ()
        /* Read the DCP to find out about it */
        dcp.read ();
 
-       if (dcp.encrypted ()) {
+       if (dcp.all_encrypted()) {
                std::cout << "DCP is encrypted.\n";
+       } else if (dcp.any_encrypted()) {
+               std::cout << "DCP is partially encrypted.\n";
        } else {
                std::cout << "DCP is not encrypted.\n";
        }
 
        std::cout << "DCP has " << dcp.cpls().size() << " CPLs.\n";
-       std::list<boost::shared_ptr<dcp::Asset> > assets = dcp.assets ();
+       auto assets = dcp.assets ();
        std::cout << "DCP has " << assets.size() << " assets.\n";
-       for (std::list<boost::shared_ptr<dcp::Asset> >::const_iterator i = assets.begin(); i != assets.end(); ++i) {
-               if (boost::dynamic_pointer_cast<dcp::MonoPictureAsset> (*i)) {
+       for (auto i: assets) {
+               if (std::dynamic_pointer_cast<dcp::MonoPictureAsset>(i)) {
                        std::cout << "2D picture\n";
-               } else if (boost::dynamic_pointer_cast<dcp::StereoPictureAsset> (*i)) {
+               } else if (std::dynamic_pointer_cast<dcp::StereoPictureAsset>(i)) {
                        std::cout << "3D picture\n";
-               } else if (boost::dynamic_pointer_cast<dcp::SoundAsset> (*i)) {
+               } else if (std::dynamic_pointer_cast<dcp::SoundAsset>(i)) {
                        std::cout << "Sound\n";
-               } else if (boost::dynamic_pointer_cast<dcp::SubtitleAsset> (*i)) {
+               } else if (std::dynamic_pointer_cast<dcp::SubtitleAsset>(i)) {
                        std::cout << "Subtitle\n";
-               } else if (boost::dynamic_pointer_cast<dcp::CPL> (*i)) {
+               } else if (std::dynamic_pointer_cast<dcp::CPL>(i)) {
                        std::cout << "CPL\n";
                }
-               std::cout << "\t" << (*i)->file().leaf().string() << "\n";
+               std::cout << "\t" << i->file()->leaf().string() << "\n";
        }
 
        /* Take the first CPL */
-       boost::shared_ptr<dcp::CPL> cpl = dcp.cpls().front ();
+       auto cpl = dcp.cpls().front();
 
        /* Get the picture asset in the first reel */
-       boost::shared_ptr<dcp::MonoPictureAsset> picture_asset = boost::dynamic_pointer_cast<dcp::MonoPictureAsset> (
-               cpl->reels().front()->main_picture()->asset()
+       auto picture_asset = std::dynamic_pointer_cast<dcp::MonoPictureAsset>(
+               cpl->reels()[0]->main_picture()->asset()
                );
 
        /* Get a reader for it */
-       boost::shared_ptr<dcp::MonoPictureAssetReader> picture_asset_reader = picture_asset->start_read();
+       auto picture_asset_reader = picture_asset->start_read();
 
        /* Get the 1000th frame of it */
-       boost::shared_ptr<const dcp::MonoPictureFrame> picture_frame_j2k = picture_asset_reader->get_frame(999);
+       auto picture_frame_j2k = picture_asset_reader->get_frame(999);
 
        /* Get the frame as an XYZ image */
-       boost::shared_ptr<const dcp::OpenJPEGImage> picture_image_xyz = picture_frame_j2k->xyz_image ();
+       auto picture_image_xyz = picture_frame_j2k->xyz_image ();
 
        /* Convert to ARGB */
        boost::scoped_array<uint8_t> rgba (new uint8_t[picture_image_xyz->size().width * picture_image_xyz->size().height * 4]);
-       dcp::xyz_to_rgba (picture_image_xyz, dcp::ColourConversion::srgb_to_xyz(), rgba.get ());
+       dcp::xyz_to_rgba (picture_image_xyz, dcp::ColourConversion::srgb_to_xyz(), rgba.get(), picture_image_xyz->size().width * 4);
 
        Magick::Image image (picture_image_xyz->size().width, picture_image_xyz->size().height, "BGRA", Magick::CharPixel, rgba.get ());
        image.write ("frame.png");