Move _intrinsic_duration and _edit_rate up to the MXF class as XML subtitle files do not contain this information (whereas MXF files do).

1 files changed, 2 insertions, 24 deletions

diff --git a/src/content.h b/src/content.h
index 4bc21570..cf92f536 100644
--- a/src/content.h
+++ b/src/content.h
@@ -51,43 +51,21 @@ namespace dcp
 class Content : public Asset
 {
 public:
+	Content () {}
+	
 	/** Construct a Content object by reading a file.
 	 *  @param file File to read.
 	 */
 	Content (boost::filesystem::path file);
 
-	/** Construct a new piece of content with a specified edit rate.
-	 *  @param edit_rate Edit rate for the content.
-	 */
-	Content (Fraction edit_rate);
-	
 	bool equals (
 		boost::shared_ptr<const Content> other,
 		EqualityOptions opt,
 		boost::function<void (NoteType, std::string)>
 		) const;
 
-	Fraction edit_rate () const {
-		return _edit_rate;
-	}
-
-	/** @return The total length of this content in video frames.
-	 *  The amount of content presented may be less than this.
-	 */
-	int64_t intrinsic_duration () const {
-		return _intrinsic_duration;
-	}
-
 protected:
-	friend class MXFWriter;
-
 	virtual std::string asdcp_kind () const = 0;
-	
-	Fraction _edit_rate;
-	/** The total length of this content in video frames.  The amount of
-	 *  content presented may be less than this.
-	 */
-	int64_t _intrinsic_duration;
 };
 
 }