Remove ReelEncryptableAsset and tidy up a bit.

[libdcp.git] / src / reel_asset.h

diff --git a/src/reel_asset.h b/src/reel_asset.h
index 00355335ec10e716604ad2ba29debe86246690a1..ab06434ebe5f2f14774def1dc267e4afad623128 100644 (file)
--- a/src/reel_asset.h
+++ b/src/reel_asset.h
@@ -83,7 +83,11 @@ public:
 
        explicit ReelAsset (std::shared_ptr<const cxml::Node>);
 
-       virtual xmlpp::Node* write_to_cpl (xmlpp::Node* node, Standard standard) const = 0;
+       virtual xmlpp::Node* write_to_cpl (xmlpp::Node* node, Standard standard) const;
+
+       virtual bool encryptable () const {
+               return false;
+       }
 
        Fraction edit_rate () const {
                return _edit_rate;
@@ -139,8 +143,6 @@ 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 () const;
 
-       xmlpp::Node* write_to_cpl_asset (xmlpp::Node* node, Standard standard, boost::optional<std::string> hash) const;
-
        int64_t _intrinsic_duration = 0;       ///< 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