Remove log from ImageProxy hierarchy.

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

diff --git a/src/lib/image_proxy.h b/src/lib/image_proxy.h
index 0fdea48ee06e04d2610332d259c442d53ab9f8ba..79b2bf4e89270d53f3a9b69684c94ea8a6929fdd 100644 (file)
--- a/src/lib/image_proxy.h
+++ b/src/lib/image_proxy.h
@@ -31,7 +31,6 @@
 
 class Image;
 class Socket;
-class Log;
 
 namespace cxml {
        class Node;
@@ -50,24 +49,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 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