X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_proxy.h;h=0fdea48ee06e04d2610332d259c442d53ab9f8ba;hb=fc56dc97103d00437843a31e1ef0c4915900ad1a;hp=f6212e54f59bc11a5c679b4551bfc8d8d57cd72f;hpb=604e8aae4fc6ed22f9051173b11f509d178617c7;p=dcpomatic.git

diff --git a/src/lib/image_proxy.h b/src/lib/image_proxy.h
index f6212e54f..0fdea48ee 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.
  *
@@ -49,6 +57,7 @@ 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;
@@ -59,33 +68,6 @@ 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