Tidying.

[libdcp.git] / src / reel.h

diff --git a/src/reel.h b/src/reel.h
index 3792682e52b9440847de4390c746369a350f189c..fdbe473a64739de24ee35065579fcd1cef447b07 100644 (file)
--- a/src/reel.h
+++ b/src/reel.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -31,26 +31,31 @@
     files in the program, then also delete it here.
 */
 
+
 #ifndef LIBDCP_REEL_H
 #define LIBDCP_REEL_H
 
+
 #include "key.h"
 #include "types.h"
 #include "ref.h"
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <boost/function.hpp>
-#include <list>
+
 
 namespace cxml {
        class Node;
 }
 
+
 namespace xmlpp {
        class Element;
 }
 
+
 namespace dcp {
 
+
 class DecryptedKDM;
 class ReelAsset;
 class ReelPictureAsset;
@@ -61,6 +66,7 @@ class ReelClosedCaptionAsset;
 class ReelAtmosAsset;
 class Content;
 
+
 /** @brief A reel within a DCP; the part which actually refers to picture, sound, subtitle, marker and Atmos data */
 class Reel : public Object
 {
@@ -68,11 +74,11 @@ public:
        Reel () {}
 
        Reel (
-               boost::shared_ptr<ReelPictureAsset> picture,
-               boost::shared_ptr<ReelSoundAsset> sound = boost::shared_ptr<ReelSoundAsset> (),
-               boost::shared_ptr<ReelSubtitleAsset> subtitle = boost::shared_ptr<ReelSubtitleAsset> (),
-               boost::shared_ptr<ReelMarkersAsset> markers = boost::shared_ptr<ReelMarkersAsset> (),
-               boost::shared_ptr<ReelAtmosAsset> atmos = boost::shared_ptr<ReelAtmosAsset> ()
+               std::shared_ptr<ReelPictureAsset> picture,
+               std::shared_ptr<ReelSoundAsset> sound = std::shared_ptr<ReelSoundAsset> (),
+               std::shared_ptr<ReelSubtitleAsset> subtitle = std::shared_ptr<ReelSubtitleAsset> (),
+               std::shared_ptr<ReelMarkersAsset> markers = std::shared_ptr<ReelMarkersAsset> (),
+               std::shared_ptr<ReelAtmosAsset> atmos = std::shared_ptr<ReelAtmosAsset> ()
                )
                : _main_picture (picture)
                , _main_sound (sound)
@@ -81,55 +87,56 @@ public:
                , _atmos (atmos)
        {}
 
-       explicit Reel (boost::shared_ptr<const cxml::Node>);
+       explicit Reel (std::shared_ptr<const cxml::Node>);
 
-       boost::shared_ptr<ReelPictureAsset> main_picture () const {
+       std::shared_ptr<ReelPictureAsset> main_picture () const {
                return _main_picture;
        }
 
-       boost::shared_ptr<ReelSoundAsset> main_sound () const {
+       std::shared_ptr<ReelSoundAsset> main_sound () const {
                return _main_sound;
        }
 
-       boost::shared_ptr<ReelSubtitleAsset> main_subtitle () const {
+       std::shared_ptr<ReelSubtitleAsset> main_subtitle () const {
                return _main_subtitle;
        }
 
-       boost::shared_ptr<ReelMarkersAsset> main_markers () const {
+       std::shared_ptr<ReelMarkersAsset> main_markers () const {
                return _main_markers;
        }
 
-       std::list<boost::shared_ptr<ReelClosedCaptionAsset> > closed_captions () const {
+       std::vector<std::shared_ptr<ReelClosedCaptionAsset>> closed_captions () const {
                return _closed_captions;
        }
 
-       boost::shared_ptr<ReelAtmosAsset> atmos () const {
+       std::shared_ptr<ReelAtmosAsset> atmos () const {
                return _atmos;
        }
 
        int64_t duration () const;
 
-       void add (boost::shared_ptr<ReelAsset> asset);
+       void add (std::shared_ptr<ReelAsset> asset);
 
-       std::list<boost::shared_ptr<ReelAsset> > assets () const;
+       std::vector<std::shared_ptr<ReelAsset>> assets () const;
 
-       void write_to_cpl (xmlpp::Element* node, Standard standard) const;
+       xmlpp::Element* write_to_cpl (xmlpp::Element* node, Standard standard) const;
 
-       bool encrypted () const;
+       bool any_encrypted () const;
+       bool all_encrypted () const;
 
-       bool equals (boost::shared_ptr<const Reel> other, EqualityOptions opt, NoteHandler notes) const;
+       bool equals (std::shared_ptr<const Reel> other, EqualityOptions opt, NoteHandler notes) const;
 
        void add (DecryptedKDM const &);
 
-       void resolve_refs (std::list<boost::shared_ptr<Asset> >);
+       void resolve_refs (std::vector<std::shared_ptr<Asset>>);
 
 private:
-       boost::shared_ptr<ReelPictureAsset> _main_picture;
-       boost::shared_ptr<ReelSoundAsset> _main_sound;
-       boost::shared_ptr<ReelSubtitleAsset> _main_subtitle;
-       boost::shared_ptr<ReelMarkersAsset> _main_markers;
-       std::list<boost::shared_ptr<ReelClosedCaptionAsset> > _closed_captions;
-       boost::shared_ptr<ReelAtmosAsset> _atmos;
+       std::shared_ptr<ReelPictureAsset> _main_picture;
+       std::shared_ptr<ReelSoundAsset> _main_sound;
+       std::shared_ptr<ReelSubtitleAsset> _main_subtitle;
+       std::shared_ptr<ReelMarkersAsset> _main_markers;
+       std::vector<std::shared_ptr<ReelClosedCaptionAsset>> _closed_captions;
+       std::shared_ptr<ReelAtmosAsset> _atmos;
 };
 
 }