X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_proxy.h;h=d6b3f878e74a5179483a67d843d9f69a47e9693d;hb=e0adfd85dd7987ee2b77eea7f6d3c13885729a38;hp=7ff28e174ec092afdbc832ec6b07fb40c7f47c37;hpb=e491397c0028a80ac4a48a92007f783746553c1a;p=dcpomatic.git

diff --git a/src/lib/image_proxy.h b/src/lib/image_proxy.h
index 7ff28e174..d6b3f878e 100644
--- a/src/lib/image_proxy.h
+++ b/src/lib/image_proxy.h
@@ -24,22 +24,20 @@
  *  @brief ImageProxy and subclasses.
  */
 
+#include <dcp/types.h>
 #include <boost/shared_ptr.hpp>
-#include <boost/filesystem.hpp>
-#include <Magick++.h>
-#include <libxml++/libxml++.h>
+#include <boost/optional.hpp>
+#include <boost/utility.hpp>
 
 class Image;
 class Socket;
-class Log;
 
-namespace cxml {
+namespace xmlpp {
 	class Node;
 }
 
-namespace dcp {
-	class MonoPictureFrame;
-	class StereoPictureFrame;
+namespace cxml {
+	class Node;
 }
 
 /** @class ImageProxy
@@ -56,22 +54,16 @@ namespace dcp {
 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;
 	/** @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;
+	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, boost::shared_ptr<Log> log);
+boost::shared_ptr<ImageProxy> image_proxy_factory (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
 
 #endif