Remove ReelEncryptableAsset and tidy up a bit.

[libdcp.git] / src / reel_picture_asset.h

diff --git a/src/reel_picture_asset.h b/src/reel_picture_asset.h
index 6eb01bc9e36df5ed8150978e6e76293b01d3f70c..5a925e24ad93918aaa1f7f51f822c9fbed82fee4 100644 (file)
--- a/src/reel_picture_asset.h
+++ b/src/reel_picture_asset.h
@@ -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,7 +51,7 @@ namespace dcp {
 /** @class ReelPictureAsset
  *  @brief Part of a Reel's description which refers to a picture asset
  */
-class ReelPictureAsset : public ReelFileAsset, public ReelEncryptableAsset
+class ReelPictureAsset : public ReelFileAsset
 {
 public:
        ReelPictureAsset (std::shared_ptr<PictureAsset> asset, int64_t entry_point);
@@ -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;