Bv2.1 8.3.1: MainSubtitles must be in all reels (if they are there at

[libdcp.git] / src / reel_asset.h

diff --git a/src/reel_asset.h b/src/reel_asset.h
index 072d55fd4edf8654d031d5b7fc913be8706e4586..654b5a974f5e6ee4ebe7490432d675cdb978bccd 100644 (file)
--- a/src/reel_asset.h
+++ b/src/reel_asset.h
@@ -41,7 +41,7 @@
 #include "object.h"
 #include "util.h"
 #include "ref.h"
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 namespace cxml {
        class Node;
@@ -66,7 +66,7 @@ class ReelAsset : public Object
 {
 public:
        ReelAsset (std::string id, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point);
-       explicit ReelAsset (boost::shared_ptr<const cxml::Node>);
+       explicit ReelAsset (std::shared_ptr<const cxml::Node>);
 
        virtual xmlpp::Node* write_to_cpl (xmlpp::Node* node, Standard standard) const = 0;
 
@@ -104,7 +104,7 @@ public:
                _annotation_text = at;
        }
 
-       bool asset_equals (boost::shared_ptr<const ReelAsset>, EqualityOptions, NoteHandler) const;
+       bool asset_equals (std::shared_ptr<const ReelAsset>, EqualityOptions, NoteHandler) const;
 
 protected:
 
@@ -119,7 +119,7 @@ protected:
        /** @return Any namespace that should be used on the asset's node in the CPL */
        virtual std::pair<std::string, std::string> cpl_node_namespace (Standard) const;
 
-       xmlpp::Node* write_to_cpl_base (xmlpp::Node* node, Standard standard, boost::optional<std::string> hash) const;
+       xmlpp::Node* write_to_cpl_asset (xmlpp::Node* node, Standard standard, boost::optional<std::string> hash) const;
 
        int64_t _intrinsic_duration;           ///< The &lt;IntrinsicDuration&gt; from the reel's entry for this asset
        boost::optional<int64_t> _duration;    ///< The &lt;Duration&gt; from the reel's entry for this asset, if present