X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Freel.h;h=5dcb97c20e48f58d20f8f8d8b6957fb03aa09503;hb=f8005516a681b805ccc2d929f63312ac711fdc24;hp=c7d3b1648142fedc3ee0511c33ac8ddf8c4f748c;hpb=41daa5821b3d3b0f450094fbf0d1e37a449f482c;p=libdcp.git

diff --git a/src/reel.h b/src/reel.h
index c7d3b164..5dcb97c2 100644
--- a/src/reel.h
+++ b/src/reel.h
@@ -17,24 +17,35 @@
 
 */
 
+#ifndef LIBDCP_REEL_H
+#define LIBDCP_REEL_H
+
 #include <list>
 #include <boost/shared_ptr.hpp>
+#include <boost/function.hpp>
+#include <libxml++/libxml++.h>
+#include <libdcp/key.h>
 #include "types.h"
 
+namespace xmlpp {
+	class Node;
+}
+
 namespace libdcp {
 
 class PictureAsset;
-class SoundAsset;	
-class SubtitleAsset;	
+class SoundAsset;
+class SubtitleAsset;
+class KDM;	
 
 /** @brief A reel within a DCP; the part which actually contains picture, sound and subtitle data */	
 class Reel
 {
 public:
 	Reel (
-		boost::shared_ptr<const PictureAsset> picture,
-		boost::shared_ptr<const SoundAsset> sound,
-		boost::shared_ptr<const SubtitleAsset> subtitle
+		boost::shared_ptr<PictureAsset> picture,
+		boost::shared_ptr<SoundAsset> sound,
+		boost::shared_ptr<SubtitleAsset> subtitle
 		)
 		: _main_picture (picture)
 		, _main_sound (sound)
@@ -53,14 +64,22 @@ public:
 		return _main_subtitle;
 	}
 
-	void write_to_cpl (std::ostream & s) const;
+	void write_to_cpl (xmlpp::Element *, bool) const;
 
-	bool equals (boost::shared_ptr<const Reel> other, EqualityOptions opt, std::list<std::string>& notes) const;
+	bool encrypted () const;
+
+	void set_mxf_keys (libdcp::Key);
+	
+	bool equals (boost::shared_ptr<const Reel> other, EqualityOptions opt, boost::function<void (NoteType, std::string)> notes) const;
+
+	void add_kdm (KDM const &);
 
 private:
-	boost::shared_ptr<const PictureAsset> _main_picture;
-	boost::shared_ptr<const SoundAsset> _main_sound;
-	boost::shared_ptr<const SubtitleAsset> _main_subtitle;
+	boost::shared_ptr<PictureAsset> _main_picture;
+	boost::shared_ptr<SoundAsset> _main_sound;
+	boost::shared_ptr<SubtitleAsset> _main_subtitle;
 };
 
 }
+
+#endif