Merge master.

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

diff --git a/src/lib/image_proxy.h b/src/lib/image_proxy.h
index 792fa004aea931e3d3a4041822571a4c89ec3633..0fdea48ee06e04d2610332d259c442d53ab9f8ba 100644 (file)
--- 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.
  */
@@ -28,11 +31,17 @@
 
 class Image;
 class Socket;
+class Log;
 
 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.
  *
@@ -44,41 +53,21 @@ namespace cxml {
  *  the TIFF data TIFF until such a time that the actual image is needed.
  *  At this point, the class decodes the TIFF to an Image.
  */
-class ImageProxy
+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;
-};
 
-class RawImageProxy : public ImageProxy
-{
-public:
-       RawImageProxy (boost::shared_ptr<Image>);
-       RawImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
-
-       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;
+protected:
+       boost::shared_ptr<Log> _log;
 };
 
-class MagickImageProxy : public ImageProxy
-{
-public:
-       MagickImageProxy (boost::filesystem::path);
-       MagickImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
-
-       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);
 
-boost::shared_ptr<ImageProxy> image_proxy_factory (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
+#endif