summaryrefslogtreecommitdiff
path: root/src/mxf.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-01-22 19:42:39 +0000
committerCarl Hetherington <cth@carlh.net>2014-01-22 19:42:39 +0000
commit1c724e363a644abaee7efb39d6091e7b30de0fb6 (patch)
tree413e28533849835f8496c8c972bd26e1d27aefbe /src/mxf.h
parent1e9f115b7cda68ccba99f58d194a2c0eb83e7e23 (diff)
Various work.
Diffstat (limited to 'src/mxf.h')
-rw-r--r--src/mxf.h15
1 files changed, 5 insertions, 10 deletions
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 <boost/signals2.hpp>
-#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<const ContentAsset> other, EqualityOptions opt, boost::function<void (NoteType, std::string)> note) const;
+ virtual bool equals (boost::shared_ptr<const Content> other, EqualityOptions opt, boost::function<void (NoteType, std::string)> note) const;
virtual void write_to_cpl (xmlpp::Element *) const;
virtual std::string key_type () const = 0;