Rename ReelFileAsset -> ReelEncryptableAsset

[libdcp.git] / src / reel_picture_asset.h

diff --git a/src/reel_picture_asset.h b/src/reel_picture_asset.h
index 73be1a1a8f864f7058fe4030579d2bf89fdd0b8a..3b65abd245ddc375dc0088a6fa70e3dd38b861ae 100644 (file)
--- 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.
 
@@ -15,41 +15,59 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    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);
-       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 void write_to_cpl (xmlpp::Node* node, Standard standard) const;
-       virtual bool equals (boost::shared_ptr<const ReelAsset>, EqualityOptions, NoteHandler) const;
+       virtual xmlpp::Node* write_to_cpl (xmlpp::Node* node, Standard standard) 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> ();
        }
 
@@ -76,6 +94,8 @@ private:
        Fraction _screen_aspect_ratio;
 };
 
+
 }
 
+
 #endif