X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fdcp.h;h=f852b6eba4bf324364878ee923d72e1a7ed39612;hb=bec7cbcc015814452690a0f702cc41b6f5f56311;hp=effadfa3ebeb2b8f3538122359028b5415d572dc;hpb=02279f7c2a7ab8ec8cc416da528bc53dcc8f2c9f;p=libdcp.git

diff --git a/src/dcp.h b/src/dcp.h
index effadfa3..f852b6eb 100644
--- 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>
@@ -41,23 +41,19 @@ namespace xmlpp {
 namespace dcp
 {
 
-class Content;	
+class Content;
 class Reel;
 class CPL;
 class XMLMetadata;
-class Signer;
+class CertificateChain;
 class DecryptedKDM;
 class Asset;
 class DCPReadError;
 
-namespace parse {
-	class AssetMap;
-}
-
 /** @class DCP
  *  @brief A class to create or read a DCP.
  */
-	
+
 class DCP : public boost::noncopyable
 {
 public:
@@ -71,7 +67,7 @@ public:
 	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.
@@ -86,14 +82,10 @@ public:
 	 */
 	bool equals (DCP const & other, EqualityOptions options, NoteHandler note) const;
 
-	void add (boost::shared_ptr<Asset> asset);
+	void add (boost::shared_ptr<CPL> cpl);
 
 	std::list<boost::shared_ptr<CPL> > cpls () const;
-
-	/** @return All this DCP's assets (note that CPLs are assets) */
-	std::list<boost::shared_ptr<Asset> > assets () const {
-		return _assets;
-	}
+	std::list<boost::shared_ptr<Asset> > assets () const;
 
 	bool encrypted () const;
 
@@ -102,7 +94,7 @@ 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> ()
 	);
 
 private:
@@ -114,9 +106,9 @@ 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;
 
 	/** Write the ASSETMAP file.
@@ -127,8 +119,8 @@ private:
 
 	/** the directory that we are writing to */
 	boost::filesystem::path _directory;
-	/** the assets that make up this DCP */
-	std::list<boost::shared_ptr<Asset> > _assets;
+	/** the CPLs that make up this DCP */
+	std::list<boost::shared_ptr<CPL> > _cpls;
 };
 
 }