From 1c724e363a644abaee7efb39d6091e7b30de0fb6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 22 Jan 2014 19:42:39 +0000 Subject: Various work. --- src/mxf.h | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'src/mxf.h') diff --git a/src/mxf.h b/src/mxf.h index 3e9e6666..a83d9fff 100644 --- a/src/mxf.h +++ b/src/mxf.h @@ -21,7 +21,7 @@ #define LIBDCP_MXF_ASSET_H #include -#include "content_asset.h" +#include "content.h" #include "key.h" #include "metadata.h" @@ -38,20 +38,15 @@ class MXFMetadata; /** @class MXF * @brief Parent class for classes which represent MXF files. */ -class MXF : public ContentAsset +class MXF : public Content { public: - /** Construct an MXF. - * This class will not write anything to disk in this constructor, but subclasses may. - * - * @param directory Directory where MXF file is. - * @param file_name Name of MXF file. - */ - MXF (boost::filesystem::path directory, boost::filesystem::path file_name); + MXF (boost::filesystem::path file); + MXF (int edit_rate); ~MXF (); - virtual bool equals (boost::shared_ptr other, EqualityOptions opt, boost::function note) const; + virtual bool equals (boost::shared_ptr other, EqualityOptions opt, boost::function note) const; virtual void write_to_cpl (xmlpp::Element *) const; virtual std::string key_type () const = 0; -- cgit v1.2.3