Merge master.

[libdcp.git] / src / cpl.h

diff --git a/src/cpl.h b/src/cpl.h
index 0c86b91e0547a941ea3a80fe7e3152f103a6f5d3..f9814337d7f6948b8711224ebf0ad66edd7c75c2 100644 (file)
--- a/src/cpl.h
+++ b/src/cpl.h
@@ -20,8 +20,10 @@
 #include <list>
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
 #include <libxml++/libxml++.h>
 #include "types.h"
+#include "certificates.h"
 
 namespace libdcp {
 
@@ -32,7 +34,8 @@ namespace parse {
 class Asset;
 class Reel;
 class XMLMetadata;
-
+       class Encryption;
+       
 /** @brief A CPL within a DCP */
 class CPL
 {
@@ -74,9 +77,17 @@ public:
        
        bool equals (CPL const & other, EqualityOptions options, boost::function<void (NoteType, std::string)> note) const;
        
-       void write_xml (XMLMetadata const &) const;
+       void write_xml (XMLMetadata const &, boost::shared_ptr<Encryption>) const;
        void write_to_assetmap (xmlpp::Node *) const;
        void write_to_pkl (xmlpp::Node *) const;
+
+       boost::shared_ptr<xmlpp::Document> make_kdm (
+               CertificateChain const &,
+               std::string const &,
+               boost::shared_ptr<const Certificate>,
+               boost::posix_time::ptime from,
+               boost::posix_time::ptime until
+               ) const;
        
 private:
        std::string _directory;