1 files changed, 15 insertions, 30 deletions
diff --git a/src/lib/image_proxy.h b/src/lib/image_proxy.h
index c0ccd9125..7ff28e174 100644
--- a/src/lib/image_proxy.h
+++ b/src/lib/image_proxy.h
@@ -17,6 +17,9 @@
 
 */
 
+#ifndef DCPOMATIC_IMAGE_PROXY_H
+#define DCPOMATIC_IMAGE_PROXY_H
+
 /** @file  src/lib/image_proxy.h
  *  @brief ImageProxy and subclasses.
  */
@@ -34,6 +37,11 @@ namespace cxml {
 	class Node;
 }
 
+namespace dcp {
+	class MonoPictureFrame;
+	class StereoPictureFrame;
+}
+
 /** @class ImageProxy
  *  @brief A class which holds an Image, and can produce it on request.
  *
@@ -42,7 +50,7 @@ namespace cxml {
  *  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
@@ -55,38 +63,15 @@ public:
 	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;
+	/** @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;
+	}
 
 protected:
 	boost::shared_ptr<Log> _log;
 };
 
-class RawImageProxy : public ImageProxy
-{
-public:
-	RawImageProxy (boost::shared_ptr<Image>, boost::shared_ptr<Log> log);
-	RawImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket, boost::shared_ptr<Log> log);
-
-	boost::shared_ptr<Image> image () const;
-	void add_metadata (xmlpp::Node *) const;
-	void send_binary (boost::shared_ptr<Socket>) const;
-	
-private:
-	boost::shared_ptr<Image> _image;
-};
-
-class MagickImageProxy : public ImageProxy
-{
-public:
-	MagickImageProxy (boost::filesystem::path, boost::shared_ptr<Log> log);
-	MagickImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket, boost::shared_ptr<Log> log);
-
-	boost::shared_ptr<Image> image () const;
-	void add_metadata (xmlpp::Node *) const;
-	void send_binary (boost::shared_ptr<Socket>) const;
-
-private:	
-	Magick::Blob _blob;
-	mutable boost::shared_ptr<Image> _image;
-};
-
 boost::shared_ptr<ImageProxy> image_proxy_factory (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket, boost::shared_ptr<Log> log);
+
+#endif