Fix failure on 1-frame-back seek (#604).

[dcpomatic.git] / src / lib / image_proxy.h

diff --git a/src/lib/image_proxy.h b/src/lib/image_proxy.h
index e2d86b8a7ca05a31f3815f183d885c7c5f376730..1f19a4160b312ce436994ba8aec6ecb53273c02d 100644 (file)
--- a/src/lib/image_proxy.h
+++ b/src/lib/image_proxy.h
@@ -24,9 +24,11 @@
  *  @brief ImageProxy and subclasses.
  */
 
+#include <dcp/types.h>
 #include <Magick++.h>
 #include <libxml++/libxml++.h>
 #include <boost/shared_ptr.hpp>
+#include <boost/optional.hpp>
 #include <boost/filesystem.hpp>
 
 class Image;
@@ -58,13 +60,11 @@ public:
        virtual ~ImageProxy () {}
 
        /** @return Image (which must be aligned) */
-       virtual boost::shared_ptr<Image> image () const = 0;
+       virtual boost::shared_ptr<Image> image (boost::optional<dcp::NoteHandler> note = boost::optional<dcp::NoteHandler> ()) const = 0;
        virtual void add_metadata (xmlpp::Node *) const = 0;
        virtual void send_binary (boost::shared_ptr<Socket>) const = 0;
        /** @return true if our image is definitely the same as another, false if it is probably not */
-       virtual bool same (boost::shared_ptr<const ImageProxy>) const {
-               return false;
-       }
+       virtual bool same (boost::shared_ptr<const ImageProxy>) const = 0;
 };
 
 boost::shared_ptr<ImageProxy> image_proxy_factory (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);