FIXME: Remove all use of add_child() from xmlpp.

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

diff --git a/src/lib/image_proxy.h b/src/lib/image_proxy.h
index 8817845d997d8d77643814328609489a42b26e79..cec13b7732e162b8c57fb033f2f3a7b6eed20d55 100644 (file)
--- a/src/lib/image_proxy.h
+++ b/src/lib/image_proxy.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,13 +18,17 @@
 
 */
 
+
 #ifndef DCPOMATIC_IMAGE_PROXY_H
 #define DCPOMATIC_IMAGE_PROXY_H
 
+
 /** @file  src/lib/image_proxy.h
  *  @brief ImageProxy and subclasses.
  */
 
+
+#include "image.h"
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
@@ -32,17 +36,19 @@ extern "C" {
 #include <boost/optional.hpp>
 #include <boost/utility.hpp>
 
+
 class Image;
 class Socket;
 
 namespace xmlpp {
-       class Node;
+       class Element;
 }
 
 namespace cxml {
        class Node;
 }
 
+
 /** @class ImageProxy
  *  @brief A class which holds an Image, and can produce it on request.
  *
@@ -91,11 +97,11 @@ public:
         *  can be used as an optimisation.
         */
        virtual Result image (
-               bool aligned,
+               Image::Alignment alignment,
                boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
                ) const = 0;
 
-       virtual void add_metadata (xmlpp::Node *) const = 0;
+       virtual void add_metadata(xmlpp::Element *) const = 0;
        virtual void write_to_socket (std::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 (std::shared_ptr<const ImageProxy>) const = 0;
@@ -103,10 +109,12 @@ public:
         *  This method may be called in a different thread to image().
         *  @return log2 of any scaling down that will be applied to the image.
         */
-       virtual int prepare (bool, boost::optional<dcp::Size> = boost::optional<dcp::Size>()) const { return 0; }
+       virtual int prepare (Image::Alignment, boost::optional<dcp::Size> = boost::optional<dcp::Size>()) const { return 0; }
        virtual size_t memory_used () const = 0;
 };
 
+
 std::shared_ptr<ImageProxy> image_proxy_factory (std::shared_ptr<cxml::Node> xml, std::shared_ptr<Socket> socket);
 
+
 #endif