Bump version

[libdcp.git] / src / reel.h

diff --git a/src/reel.h b/src/reel.h
index ea7e1c4180f6e43199d5ba900c25c418bd96eca6..8d7546fac384dfa8b24ab2374ea76994970acf08 100644 (file)
--- a/src/reel.h
+++ b/src/reel.h
@@ -23,7 +23,6 @@
 #include "key.h"
 #include "types.h"
 #include "ref.h"
-#include <libxml++/libxml++.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
 #include <list>
@@ -32,20 +31,25 @@ namespace cxml {
        class Node;
 }
 
+namespace xmlpp {
+       class Element;
+}
+
 namespace dcp {
 
-class KDM;
+class DecryptedKDM;
 class ReelAsset;
 class ReelPictureAsset;
 class ReelSoundAsset;
 class ReelSubtitleAsset;
+class Content;
 
-/** @brief A reel within a DCP; the part which actually contains picture, sound and subtitle data */   
+/** @brief A reel within a DCP; the part which actually refers to picture, sound and subtitle data */
 class Reel : public Object
 {
 public:
        Reel () {}
-       
+
        Reel (
                boost::shared_ptr<ReelPictureAsset> picture,
                boost::shared_ptr<ReelSoundAsset> sound,
@@ -57,7 +61,7 @@ public:
        {}
 
        Reel (boost::shared_ptr<const cxml::Node>);
-       
+
        boost::shared_ptr<ReelPictureAsset> main_picture () const {
                return _main_picture;
        }
@@ -65,22 +69,24 @@ public:
        boost::shared_ptr<ReelSoundAsset> main_sound () const {
                return _main_sound;
        }
-       
+
        boost::shared_ptr<ReelSubtitleAsset> main_subtitle () const {
                return _main_subtitle;
        }
 
+       int64_t duration () const;
+
        void add (boost::shared_ptr<ReelAsset> asset);
 
        void write_to_cpl (xmlpp::Element* node, Standard standard) const;
 
        bool encrypted () const;
 
-       void set_mxf_keys (dcp::Key);
-       
-       bool equals (boost::shared_ptr<const Reel> other, EqualityOptions opt, boost::function<void (NoteType, std::string)> notes) const;
+       bool equals (boost::shared_ptr<const Reel> other, EqualityOptions opt, NoteHandler notes) const;
+
+       void add (DecryptedKDM const &);
 
-       void add_kdm (KDM const &);
+       void resolve_refs (std::list<boost::shared_ptr<Asset> >);
 
 private:
        boost::shared_ptr<ReelPictureAsset> _main_picture;