Fix incorrect day-of-month in LocalTime.

[libdcp.git] / src / reel_asset.h

diff --git a/src/reel_asset.h b/src/reel_asset.h
index 40eb6986f975aeb27c7b9c69527b9a0ac359cb74..6db621ccf0b90c073dbfb6a6423eae2f49dfec2d 100644 (file)
--- a/src/reel_asset.h
+++ b/src/reel_asset.h
@@ -52,28 +52,13 @@ public:
        ReelAsset (boost::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,
-               boost::function<void (NoteType, std::string)>)
-               const {
-               
-               return false;
-       }
+       virtual bool equals (boost::shared_ptr<const ReelAsset>, EqualityOptions, NoteHandler) const;
 
        /** @return a Ref to our actual content */
        Ref<Content>& content () {
                return _content;
        }
 
-       /** @return true if a KeyId is specified for this asset, implying
-        *  that its content is encrypted.
-        */
-       bool encrypted () const {
-               return !_key_id.empty ();
-       }
-
        int64_t entry_point () const {
                return _entry_point;
        }
@@ -82,13 +67,6 @@ public:
                return _duration;
        }
 
-       /** @return Key ID to describe the key that encrypts this asset's;
-        *  content.
-        */
-       std::string key_id () const {
-               return _key_id;
-       }
-
 protected:
        /** @return the node name that this asset uses in the CPL's &lt;Reel&gt; node
         *  e.g. MainPicture, MainSound etc.
@@ -98,7 +76,7 @@ protected:
        /** @return Any attribute that should be used on the asset's node in the
         *  CPL.
         */
-       virtual std::pair<std::string, std::string> cpl_node_attribute () const;
+       virtual std::pair<std::string, std::string> cpl_node_attribute (Standard) const;
 
        /** Reference to the content (MXF or XML file) that this reel entry
         *  applies to.
@@ -113,7 +91,6 @@ private:
        int64_t _entry_point;         ///< The &lt;EntryPoint&gt; from the reel's entry for this asset
        int64_t _duration;            ///< The &lt;Duration&gt; from the reel's entry for this asset
        std::string _hash;            ///< The &lt;Hash&gt; from the reel's entry for this asset
-       std::string _key_id;          ///< The &lt;KeyId&gt; from the reel's entry for this asset, or empty if there isn't one
 };
 
 }