X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Freel_picture_asset.h;h=3b65abd245ddc375dc0088a6fa70e3dd38b861ae;hb=093525165f6397ba9eaffd19833dc978bcb32d55;hp=a20c216f0abb9f4dedc5293d29eb229264a25f8b;hpb=367b43df1630a5e4e4173fb50e234803f248f00f;p=libdcp.git

diff --git a/src/reel_picture_asset.h b/src/reel_picture_asset.h
index a20c216f..3b65abd2 100644
--- a/src/reel_picture_asset.h
+++ b/src/reel_picture_asset.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -31,39 +31,43 @@
     files in the program, then also delete it here.
 */
 
+
 /** @file  src/reel_picture_asset.h
- *  @brief ReelPictureAsset class.
+ *  @brief ReelPictureAsset class
  */
 
+
 #ifndef LIBDCP_REEL_PICTURE_ASSET_H
 #define LIBDCP_REEL_PICTURE_ASSET_H
 
-#include "reel_mxf.h"
+
+#include "reel_encryptable_asset.h"
 #include "reel_asset.h"
 #include "picture_asset.h"
 
+
 namespace dcp {
 
+
 /** @class ReelPictureAsset
- *  @brief Part of a Reel's description which refers to a picture asset.
+ *  @brief Part of a Reel's description which refers to a picture asset
  */
-class ReelPictureAsset : public ReelAsset, public ReelMXF
+class ReelPictureAsset : public ReelAsset, public ReelEncryptableAsset
 {
 public:
-	ReelPictureAsset ();
-	ReelPictureAsset (boost::shared_ptr<PictureAsset> asset, int64_t entry_point);
-	explicit ReelPictureAsset (boost::shared_ptr<const cxml::Node>);
+	ReelPictureAsset (std::shared_ptr<PictureAsset> asset, int64_t entry_point);
+	explicit ReelPictureAsset (std::shared_ptr<const cxml::Node>);
 
 	virtual xmlpp::Node* write_to_cpl (xmlpp::Node* node, Standard standard) const;
-	virtual bool equals (boost::shared_ptr<const ReelAsset>, EqualityOptions, NoteHandler) const;
+	bool equals (std::shared_ptr<const ReelPictureAsset>, EqualityOptions, NoteHandler) const;
 
 	/** @return the PictureAsset that this object refers to */
-	boost::shared_ptr<const PictureAsset> asset () const {
+	std::shared_ptr<const PictureAsset> asset () const {
 		return asset_of_type<const PictureAsset> ();
 	}
 
 	/** @return the PictureAsset that this object refers to */
-	boost::shared_ptr<PictureAsset> asset () {
+	std::shared_ptr<PictureAsset> asset () {
 		return asset_of_type<PictureAsset> ();
 	}
 
@@ -90,6 +94,8 @@ private:
 	Fraction _screen_aspect_ratio;
 };
 
+
 }
 
+
 #endif