From a75132724be4962225e5cb0f5ef5297e2e78aeee Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 10 Jul 2014 16:16:51 +0100 Subject: Move _intrinsic_duration and _edit_rate up to the MXF class as XML subtitle files do not contain this information (whereas MXF files do). --- src/content.h | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) (limited to 'src/content.h') 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 other, EqualityOptions opt, boost::function ) 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; }; } -- cgit v1.2.3