Merge.

[libdcp.git] / src / mxf_asset.h

diff --git a/src/mxf_asset.h b/src/mxf_asset.h
index d01d091d7104d2c9ed2c410b5b30dad85f047d13..03f2aa6b486f8427695aba558f8649d9658ca319 100644 (file)
--- a/src/mxf_asset.h
+++ b/src/mxf_asset.h
@@ -20,6 +20,7 @@
 #ifndef LIBDCP_MXF_ASSET_H
 #define LIBDCP_MXF_ASSET_H
 
+#include <boost/signals2.hpp>
 #include "asset.h"
 
 namespace libdcp
@@ -33,11 +34,12 @@ public:
         *  @param file_name Name of MXF file.
         *  @param progress Signal to inform of progress.
         *  @param fps Frames per second.
+        *  @param entry_point The entry point of this MXF; ie the first frame that should be used.
         *  @param length Length in frames.
         */
-       MXFAsset (std::string directory, std::string file_name, sigc::signal1<void, float>* progress, int fps, int length);
+       MXFAsset (std::string directory, std::string file_name, boost::signals2::signal<void (float)>* progress, int fps, int entry_point, int length);
 
-       virtual std::list<std::string> equals (boost::shared_ptr<const Asset> other, EqualityOptions opt) const;
+       virtual bool equals (boost::shared_ptr<const Asset> other, EqualityOptions opt, std::list<std::string>& notes) const;
        
        int length () const;
 
@@ -48,9 +50,10 @@ protected:
        void fill_writer_info (ASDCP::WriterInfo* w) const;
 
        /** Signal to emit to report progress */
-       sigc::signal1<void, float>* _progress;
+       boost::signals2::signal<void (float)>* _progress;
        /** Frames per second */
        int _fps;
+       int _entry_point;
        /** Length in frames */
        int _length;
 };