Add edit_rate accessor.

[libdcp.git] / src / cpl.h

diff --git a/src/cpl.h b/src/cpl.h
index 431aef7deb88c156ed15bdd031ef8d8006db64da..fe123fd3d3cc5dc38281f89d49cf4da3c8e7918a 100644 (file)
--- a/src/cpl.h
+++ b/src/cpl.h
@@ -25,7 +25,7 @@
 #define LIBDCP_CPL_H
 
 #include "types.h"
-#include "certificates.h"
+#include "certificate.h"
 #include "key.h"
 #include "asset.h"
 #include "metadata.h"
@@ -37,14 +37,14 @@
 #include <list>
 
 namespace dcp {
-       
+
 class ReelAsset;
 class Reel;
 class XMLMetadata;
 class MXFMetadata;
-class Signer;
+class CertificateChain;
 class DecryptedKDM;
-       
+
 /** @class CPL
  *  @brief A Composition Playlist.
  */
@@ -55,9 +55,9 @@ public:
        CPL (boost::filesystem::path file);
 
        bool equals (
-               CPL const & other,
+               boost::shared_ptr<const Asset> other,
                EqualityOptions options,
-               boost::function<void (NoteType, std::string)> note
+               NoteHandler note
                ) const;
 
        void add (boost::shared_ptr<Reel> reel);
@@ -67,7 +67,7 @@ public:
        std::string annotation_text () const {
                return _annotation_text;
        }
-       
+
        /** @return contents of the &lt;ContentTitleText&gt; node */
        std::string content_title_text () const {
                return _content_title_text;
@@ -82,7 +82,7 @@ public:
        void set_content_version_label_text (std::string text) {
                _content_version_label_text = text;
        }
-       
+
        /** @return the type of the content, used by media servers
         *  to categorise things (e.g. feature, trailer, etc.)
         */
@@ -101,7 +101,6 @@ public:
 
        bool encrypted () const;
 
-       void set_mxf_keys (Key);
        void set_metadata (XMLMetadata m) {
                _metadata = m;
        }
@@ -109,7 +108,7 @@ public:
        void write_xml (
                boost::filesystem::path file,
                Standard standard,
-               boost::shared_ptr<const Signer>
+               boost::shared_ptr<const CertificateChain>
                ) const;
 
        void resolve_refs (std::list<boost::shared_ptr<Object> >);