Remove fps/length from CPL.

1 files changed, 8 insertions, 17 deletions

diff --git a/src/cpl.h b/src/cpl.h
index 95bcd03f..f9535a31 100644
--- a/src/cpl.h
+++ b/src/cpl.h
@@ -43,20 +43,15 @@ class MXFMetadata;
 class Encryption;
 class KDM;
 	
-/** @brief A CPL within a DCP */
+/** @brief A composition playlist (CPL) */
 class CPL
 {
 public:
-	CPL (std::string directory, std::string name, ContentKind content_kind, int length, int frames_per_second);
+	CPL (std::string directory, std::string name, ContentKind content_kind);
 	CPL (std::string directory, std::string file, std::list<PathAssetMap> asset_maps, bool require_mxfs = true);
 
 	void add_reel (boost::shared_ptr<Reel> reel);
 	
-	/** @return the length in frames */
-	int length () const {
-		return _length;
-	}
-
 	/** @return the type of the content, used by media servers
 	 *  to categorise things (e.g. feature, trailer, etc.)
 	 */
@@ -75,11 +70,6 @@ public:
 		return _name;
 	}
 
-	/** @return the number of frames per second */
-	int frames_per_second () const {
-		return _fps;
-	}
-
 	std::list<boost::shared_ptr<const Asset> > assets () const;
 
 	bool encrypted () const;
@@ -115,17 +105,18 @@ private:
 	std::string _name;
 	/** the content kind of the CPL */
 	ContentKind _content_kind;
-	/** length in frames */
-	mutable int _length;
-	/** frames per second */
-	int _fps;
 	/** reels */
 	std::list<boost::shared_ptr<Reel> > _reels;
 
 	/** our UUID */
 	std::string _id;
-	/** a SHA1 digest of our XML */
+
+
+	/* XXX: nasty */
+        /** the SHA1 digest of our XML the last time it was written to disk */
 	mutable std::string _digest;
+	/** file size of our XML the last time it was written to disk */
+	mutable int _length;
 };
 
 }