Try again to fix Windows build of previous.

[libdcp.git] / src / dcp.h

diff --git a/src/dcp.h b/src/dcp.h
index fecf3cffebe3b1261881bf2b1961792059bec4aa..0ac93f49e627f0ce5bcc281793b494b25305c087 100644 (file)
--- a/src/dcp.h
+++ b/src/dcp.h
@@ -39,9 +39,11 @@
 #define LIBDCP_DCP_H
 
 #include "types.h"
+#include "util.h"
 #include "certificate.h"
 #include "metadata.h"
 #include "name_format.h"
+#include "verify.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 #include <string>
@@ -56,6 +58,7 @@ namespace xmlpp {
 namespace dcp
 {
 
+class PKL;
 class Content;
 class Reel;
 class CPL;
@@ -81,16 +84,13 @@ public:
         */
        explicit DCP (boost::filesystem::path directory);
 
-       typedef std::list<boost::shared_ptr<DCPReadError> > ReadErrors;
-
        /** 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 notes List of notes that will be added to if non-0.
         *  @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, bool ignore_incorrect_picture_mxf_type = false);
+       void read (std::list<VerificationNote>* notes = 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.
@@ -103,7 +103,7 @@ public:
        void add (boost::shared_ptr<CPL> cpl);
 
        std::list<boost::shared_ptr<CPL> > cpls () const;
-       std::list<boost::shared_ptr<Asset> > assets () const;
+       std::list<boost::shared_ptr<Asset> > assets (bool ignore_unresolved = false) const;
 
        bool encrypted () const;
 
@@ -113,7 +113,7 @@ public:
                Standard standard,
                XMLMetadata metadata = XMLMetadata (),
                boost::shared_ptr<const CertificateChain> signer = boost::shared_ptr<const CertificateChain> (),
-               NameFormat name_format = NameFormat("%t_%i")
+               NameFormat name_format = NameFormat("%t")
        );
 
        void resolve_refs (std::list<boost::shared_ptr<Asset> > assets);
@@ -123,31 +123,41 @@ public:
                return _standard;
        }
 
-private:
+       boost::filesystem::path directory () const {
+               return _directory;
+       }
 
-       /** Write the PKL file.
-        *  @param pkl_uuid UUID to use.
+       /** @return PKLs if this DCP was read from an existing one, or if write_xml() has been called on it.
+        *  If neither is true, this method returns an empty list.
         */
-       boost::filesystem::path write_pkl (
-               std::string file,
-               Standard standard,
-               std::string pkl_uuid,
-               XMLMetadata metadata,
-               boost::shared_ptr<const CertificateChain> signer
-               ) const;
+       std::list<boost::shared_ptr<PKL> > pkls () const {
+               return _pkls;
+       }
+
+       boost::optional<boost::filesystem::path> asset_map_path () {
+               return _asset_map;
+       }
+
+       static std::vector<boost::filesystem::path> directories_from_files (std::vector<boost::filesystem::path> files);
+
+private:
 
        void write_volindex (Standard standard) const;
 
        /** Write the ASSETMAP file.
         *  @param pkl_uuid UUID of our PKL.
-        *  @param pkl_length Length of our PKL in bytes.
+        *  @param pkl_path Pathname of our PKL file.
         */
-       void write_assetmap (Standard standard, std::string pkl_uuid, int pkl_length, XMLMetadata metadata) const;
+       void write_assetmap (Standard standard, std::string pkl_uuid, boost::filesystem::path pkl_path, XMLMetadata metadata) const;
 
-       /** the directory that we are writing to */
+       /** The directory that we are writing to */
        boost::filesystem::path _directory;
-       /** the CPLs that make up this DCP */
+       /** The CPLs that make up this DCP */
        std::list<boost::shared_ptr<CPL> > _cpls;
+       /** The PKLs that make up this DCP */
+       std::list<boost::shared_ptr<PKL> > _pkls;
+       /** File that the ASSETMAP was read from or last written to */
+       mutable boost::optional<boost::filesystem::path> _asset_map;
 
        /** Standard of DCP that was read in */
        boost::optional<Standard> _standard;