X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_proxy.h;h=39cbda27d85e4572c99480b0b921064775e10099;hb=769c71b5c3e050ccfc1c13771d24328fbf76a495;hp=0fdea48ee06e04d2610332d259c442d53ab9f8ba;hpb=2154e7c39166cfc4b128545d94a5698c7d70daea;p=dcpomatic.git

diff --git a/src/lib/image_proxy.h b/src/lib/image_proxy.h
index 0fdea48ee..39cbda27d 100644
--- a/src/lib/image_proxy.h
+++ b/src/lib/image_proxy.h
@@ -24,14 +24,15 @@
  *  @brief ImageProxy and subclasses.
  */
 
-#include <boost/shared_ptr.hpp>
-#include <boost/filesystem.hpp>
+#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;
 class Socket;
-class Log;
 
 namespace cxml {
 	class Node;
@@ -50,24 +51,24 @@ namespace dcp {
  *  of happening in a single-threaded decoder.
  *
  *  For example, large TIFFs are slow to decode, so this class will keep
- *  the TIFF data TIFF until such a time that the actual image is needed.
+ *  the TIFF data compressed until the decompressed image is needed.
  *  At this point, the class decodes the TIFF to an Image.
  */
 class ImageProxy : public boost::noncopyable
 {
 public:
-	ImageProxy (boost::shared_ptr<Log> log);
 	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;
-
-protected:
-	boost::shared_ptr<Log> _log;
+	/** @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;
+	}
 };
 
-boost::shared_ptr<ImageProxy> image_proxy_factory (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket, boost::shared_ptr<Log> log);
+boost::shared_ptr<ImageProxy> image_proxy_factory (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
 
 #endif