Fix code and tests so that SubtitleString::v_position is between 0 and 1 (not a perce...

[libdcp.git] / src / encrypted_kdm.h

diff --git a/src/encrypted_kdm.h b/src/encrypted_kdm.h
index 0aa36a1566862333e56f614c3f2d5d53d203c93b..f89ba5962c2e00f80b9824c9de8600da7e6940a6 100644 (file)
--- a/src/encrypted_kdm.h
+++ b/src/encrypted_kdm.h
@@ -21,7 +21,11 @@
  *  @brief EncryptedKDM class.
  */
 
+#ifndef LIBDCP_ENCRYPTED_KDM_H
+#define LIBDCP_ENCRYPTED_KDM_H
+
 #include "local_time.h"
+#include "types.h"
 #include <boost/filesystem.hpp>
 #include <boost/date_time/local_time/local_time.hpp>
 
@@ -48,11 +52,7 @@ class Certificate;
 class EncryptedKDM
 {
 public:
-       /** Read a KDM from an XML file.
-        *  @param file XML file to read.
-        */
-       EncryptedKDM (boost::filesystem::path file);
-
+       EncryptedKDM (std::string);
        EncryptedKDM (EncryptedKDM const & kdm);
        EncryptedKDM & operator= (EncryptedKDM const &);
        ~EncryptedKDM ();
@@ -78,12 +78,13 @@ private:
        /** Construct an EncryptedKDM from a set of details */
        EncryptedKDM (
                boost::shared_ptr<const Signer> signer,
-               boost::shared_ptr<const Certificate> recipient,
+               Certificate recipient,
                std::string device_list_description,
                std::string cpl_id,
                std::string cpl_content_title_text,
-               LocalTime _not_valid_before,
-               LocalTime _not_valid_after,
+               LocalTime not_valid_before,
+               LocalTime not_valid_after,
+               Formulation formulation,
                std::list<std::pair<std::string, std::string> > key_ids,
                std::list<std::string> keys
                );
@@ -92,3 +93,5 @@ private:
 };
 
 }
+
+#endif