Partial.rework-again

1 files changed, 4 insertions, 14 deletions

diff --git a/src/cpl.h b/src/cpl.h
index dfc05c8e..62362c6f 100644
--- a/src/cpl.h
+++ b/src/cpl.h
@@ -49,15 +49,7 @@ class CPL
 {
 public:
 	CPL (std::string annotation_text, std::string content_title_text, ContentKind content_kind);
-	CPL (boost::filesystem::path file, std::list<PathAssetMap> asset_maps, bool require_mxfs = true);
-
-	void add_reel (boost::shared_ptr<Reel> reel);
-	
-	std::list<boost::shared_ptr<Reel> > reels () const {
-		return _reels;
-	}
-
-	std::list<boost::shared_ptr<const Asset> > assets () const;
+	CPL (boost::filesystem::path file);
 
 	bool encrypted () const;
 
@@ -87,16 +79,14 @@ public:
 	/* Properties */
 	
 	std::string annotation_text;
+	std::string issue_date;
+	std::string creator;
 	std::string content_title_text;
 	/** The type of the content, used by media servers to categorise things (e.g. feature, trailer, etc.) */
 	ContentKind content_kind;
+	std::list<boost::shared_ptr<Reel> > reels;
 	
 private:
-	std::pair<std::string, boost::shared_ptr<const parse::AssetMapAsset> > asset_from_id (std::list<PathAssetMap>, std::string id) const;
-	
-	/** reels */
-	std::list<boost::shared_ptr<Reel> > _reels;
-
 	/** our UUID */
 	std::string _id;