Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0

[libdcp.git] / src / mxf.h

diff --git a/src/mxf.h b/src/mxf.h
index 4fbc14952a17d1a893e5adaa9f8ed04605246f46..f0ad4bd837cf2671312a6194a9467f195ae271b7 100644 (file)
--- a/src/mxf.h
+++ b/src/mxf.h
@@ -49,13 +49,10 @@ public:
        MXF (boost::filesystem::path file);
        ~MXF ();
 
-       /** @return the 4-character key type for this MXF (MDIK, MDAK, etc.) */
-       virtual std::string key_type () const = 0;
-       
        bool equals (
-               boost::shared_ptr<const Content> other,
+               boost::shared_ptr<const Asset> other,
                EqualityOptions opt,
-               boost::function<void (NoteType, std::string)> note
+               NoteHandler note
                ) const;
 
        /** Fill in a ADSCP::WriteInfo struct.