Remove some unnecessary includes.

[libdcp.git] / src / dcp.h

diff --git a/src/dcp.h b/src/dcp.h
index ed5e5e3e0f00d8aac3557850513df63dde7c894f..05c2026bbd34e299b39892cd04cdbf1082360764 100644 (file)
--- a/src/dcp.h
+++ b/src/dcp.h
@@ -25,7 +25,7 @@
 #define LIBDCP_DCP_H
 
 #include "types.h"
-#include "certificates.h"
+#include "certificate.h"
 #include "metadata.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
@@ -45,7 +45,7 @@ class Content;
 class Reel;
 class CPL;
 class XMLMetadata;
-class Signer;
+class CertificateChain;
 class DecryptedKDM;
 class Asset;
 class DCPReadError;
@@ -71,8 +71,11 @@ public:
        /** Read the DCP's structure into this object.
         *  @param keep_going true to try to keep going in the face of (some) errors.
         *  @param errors List of errors that will be added to if keep_going is true.
+        *  @param ignore_incorrect_picture_mxf_type true to try loading MXF files marked as monoscopic
+        *  as stereoscopic if the monoscopic load fails; fixes problems some 3D DCPs that (I think)
+        *  have an incorrect descriptor in their MXF.
         */
-       void read (bool keep_going = false, ReadErrors* errors = 0);
+       void read (bool keep_going = false, ReadErrors* errors = 0, bool ignore_incorrect_picture_mxf_type = false);
 
        /** Compare this DCP with another, according to various options.
         *  @param other DCP to compare this one to.
@@ -94,9 +97,11 @@ public:
        void write_xml (
                Standard standard,
                XMLMetadata metadata = XMLMetadata (),
-               boost::shared_ptr<const Signer> signer = boost::shared_ptr<const Signer> ()
+               boost::shared_ptr<const CertificateChain> signer = boost::shared_ptr<const CertificateChain> ()
        );
 
+       void resolve_refs (std::list<boost::shared_ptr<Asset> > assets);
+
 private:
 
        /** Write the PKL file.
@@ -106,7 +111,7 @@ private:
                Standard standard,
                std::string pkl_uuid,
                XMLMetadata metadata,
-               boost::shared_ptr<const Signer> signer
+               boost::shared_ptr<const CertificateChain> signer
                ) const;
 
        void write_volindex (Standard standard) const;