Remove XMLMetadata.

[libdcp.git] / src / encrypted_kdm.h

diff --git a/src/encrypted_kdm.h b/src/encrypted_kdm.h
index 5b60378cd1e3657ceace2f2854eb2e38318c1632..ddc0273a89a507455f6f926c2b74e2ce8be0ffd0 100644 (file)
--- a/src/encrypted_kdm.h
+++ b/src/encrypted_kdm.h
@@ -86,12 +86,15 @@ public:
         */
        std::list<std::string> keys () const;
 
+       std::string id () const;
        boost::optional<std::string> annotation_text () const;
        std::string content_title_text () const;
        std::string issue_date () const;
        std::string cpl_id () const;
-       LocalTime not_valid_before() const;
-       LocalTime not_valid_after() const;
+       LocalTime not_valid_before () const;
+       LocalTime not_valid_after () const;
+       std::string recipient_x509_subject_name () const;
+       CertificateChain signer_certificate_chain () const;
 
 private:
 
@@ -101,14 +104,15 @@ private:
        EncryptedKDM (
                boost::shared_ptr<const CertificateChain> signer,
                Certificate recipient,
-               std::vector<Certificate> trusted_devices,
-               std::string device_list_description,
+               std::vector<std::string> trusted_devices,
                std::string cpl_id,
                std::string cpl_content_title_text,
                boost::optional<std::string> annotation_text,
                LocalTime not_valid_before,
                LocalTime not_valid_after,
                Formulation formulation,
+               bool disable_forensic_marking_picture,
+               boost::optional<int> disable_forensic_marking_audio,
                std::list<std::pair<std::string, std::string> > key_ids,
                std::list<std::string> keys
                );