Merge branch 'master' of /home/carl/git/libdcp

[libdcp.git] / src / reel.h

diff --git a/src/reel.h b/src/reel.h
index 58caed31c2b17972ad28224777fb6bf01720ab5c..93dc09206ffc998b2af2aeb44edceaa3a8432d24 100644 (file)
--- a/src/reel.h
+++ b/src/reel.h
@@ -19,6 +19,7 @@
 
 #include <list>
 #include <boost/shared_ptr.hpp>
+#include <boost/function.hpp>
 #include "types.h"
 
 namespace libdcp {
@@ -27,6 +28,7 @@ class PictureAsset;
 class SoundAsset;      
 class SubtitleAsset;   
 
+/** @brief A reel within a DCP; the part which actually contains picture, sound and subtitle data */   
 class Reel
 {
 public:
@@ -54,7 +56,7 @@ public:
 
        void write_to_cpl (std::ostream & s) const;
 
-       std::list<std::string> equals (boost::shared_ptr<const Reel> other, EqualityOptions opt) const;
+       bool equals (boost::shared_ptr<const Reel> other, EqualityOptions opt, boost::function<void (NoteType, std::string)> notes) const;
 
 private:
        boost::shared_ptr<const PictureAsset> _main_picture;