X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_proxy.h;h=def4878e3e1e5d6f52d16d29ec0f101e3c8c22f2;hb=f1bfe8575b3e2d2e90e2e623e60082bc1938ba64;hp=79b2bf4e89270d53f3a9b69684c94ea8a6929fdd;hpb=985a83ffbf251db481150221914ef74fbfe549b2;p=dcpomatic.git

diff --git a/src/lib/image_proxy.h b/src/lib/image_proxy.h
index 79b2bf4e8..def4878e3 100644
--- a/src/lib/image_proxy.h
+++ b/src/lib/image_proxy.h
@@ -24,21 +24,23 @@
  *  @brief ImageProxy and subclasses.
  */
 
+extern "C" {
+#include <libavutil/pixfmt.h>
+}
+#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;
 
-namespace cxml {
+namespace xmlpp {
 	class Node;
 }
 
-namespace dcp {
-	class MonoPictureFrame;
-	class StereoPictureFrame;
+namespace cxml {
+	class Node;
 }
 
 /** @class ImageProxy
@@ -58,13 +60,12 @@ 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;
+	virtual AVPixelFormat pixel_format () const = 0;
 };
 
 boost::shared_ptr<ImageProxy> image_proxy_factory (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);