C++11 tidying.

[libdcp.git] / src / reel_picture_asset.h

diff --git a/src/reel_picture_asset.h b/src/reel_picture_asset.h
index 3d98b09d7ddbd35f74bfd39de75c587f9d564264..64fa54f4e92a709d1f89442195534626605883f8 100644 (file)
--- a/src/reel_picture_asset.h
+++ b/src/reel_picture_asset.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -41,8 +41,7 @@
 #define LIBDCP_REEL_PICTURE_ASSET_H
 
 
-#include "reel_encryptable_asset.h"
-#include "reel_asset.h"
+#include "reel_file_asset.h"
 #include "picture_asset.h"
 
 
@@ -52,25 +51,25 @@ namespace dcp {
 /** @class ReelPictureAsset
  *  @brief Part of a Reel's description which refers to a picture asset
  */
-class ReelPictureAsset : public ReelAsset, public ReelFileAsset, public ReelEncryptableAsset
+class ReelPictureAsset : public ReelFileAsset
 {
 public:
        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;
-       bool equals (std::shared_ptr<const ReelPictureAsset>, EqualityOptions, NoteHandler) const;
-
        /** @return the PictureAsset that this object refers to */
        std::shared_ptr<const PictureAsset> asset () const {
-               return asset_of_type<const PictureAsset> ();
+               return asset_of_type<const PictureAsset>();
        }
 
        /** @return the PictureAsset that this object refers to */
        std::shared_ptr<PictureAsset> asset () {
-               return asset_of_type<PictureAsset> ();
+               return asset_of_type<PictureAsset>();
        }
 
+       virtual xmlpp::Node* write_to_cpl (xmlpp::Node* node, Standard standard) const override;
+       bool equals (std::shared_ptr<const ReelPictureAsset>, EqualityOptions, NoteHandler) const;
+
        /** @return picture frame rate */
        Fraction frame_rate () const {
                return _frame_rate;
@@ -88,7 +87,9 @@ public:
        }
 
 private:
-       std::string key_type () const;
+       boost::optional<std::string> key_type () const override {
+               return std::string ("MDIK");
+       }
 
        Fraction _frame_rate;
        Fraction _screen_aspect_ratio;