Partial.rework-again

1 files changed, 5 insertions, 28 deletions

diff --git a/src/dcp.h b/src/dcp.h
index 8086f4de..bae8a823 100644
--- a/src/dcp.h
+++ b/src/dcp.h
@@ -91,26 +91,6 @@ public:
 	 */
 	bool equals (DCP const & other, EqualityOptions options, boost::function<void (NoteType, std::string)> note) const;
 
-	/** Add a CPL to this DCP.
-	 *  @param cpl CPL to add.
-	 */
-	void add_cpl (boost::shared_ptr<CPL> cpl);
-
-	/** @return The list of CPLs in this DCP */
-	std::list<boost::shared_ptr<CPL> > cpls () const {
-		return _cpls;
-	}
-
-	/** Add another DCP as a source of assets for this DCP.  This should be called before
-	 *  ::read() on the DCP that needs the extra assets.  For example
-	 *
-	 *  DCP original_version ("my_dcp_OV");
-	 *  DCP supplemental ("my_dcp_VF");
-	 *  supplemental.add_assets_from (original_version);
-	 *  supplemental.read ();
-	 */
-	void add_assets_from (libdcp::DCP const &);
-
 	bool encrypted () const;
 
 	void add_kdm (KDM const &);
@@ -120,6 +100,10 @@ public:
 	 */
 	boost::signals2::signal<void (float)> Progress;
 
+	std::list<boost::shared_ptr<CPL> > cpls;
+	/** Assets that are written to this DCP (and not just referenced) */
+	std::list<boost::shared_ptr<const Asset> > assets;
+	
 private:
 
 	/** Write the PKL file.
@@ -136,9 +120,6 @@ private:
 	 */
 	void write_assetmap (std::string pkl_uuid, int pkl_length, bool, XMLMetadata const &) const;
 
-	/** @return Assets in all the CPLs in this DCP */
-	std::list<boost::shared_ptr<const Asset> > assets () const;
-
 	struct Files {
 		std::list<std::string> cpls;
 		std::string pkl;
@@ -147,12 +128,8 @@ private:
 
 	/** the directory that we are writing to */
 	std::string _directory;
-	/** our CPLs */
-	std::list<boost::shared_ptr<CPL> > _cpls;
-
-	std::list<PathAssetMap> _asset_maps;
 };
-
+	
 }
 
 #endif