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

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

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 347d10667de69d97584a4dccb0ec9ddc1d194970..acf7f6473297aceab29dfd2b037a2998401f9d69 100644 (file)
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -23,11 +23,12 @@
 #define DCPOMATIC_PLAYER_VIDEO_H
 
 
-#include "types.h"
-#include "position.h"
-#include "dcpomatic_time.h"
 #include "colour_conversion.h"
+#include "dcpomatic_time.h"
+#include "image.h"
+#include "position.h"
 #include "position_image.h"
+#include "types.h"
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
@@ -74,14 +75,14 @@ public:
                return _text;
        }
 
-       void prepare (std::function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, bool aligned, bool fast, bool proxy_only);
-       std::shared_ptr<Image> image (std::function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, bool aligned, bool fast) const;
-       std::shared_ptr<Image> raw_image () const;
+       void prepare (std::function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, Image::Alignment alignment, bool fast, bool proxy_only);
+       std::shared_ptr<Image> image (std::function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, bool fast) const;
+       std::shared_ptr<const Image> raw_image () const;
 
-       static AVPixelFormat force (AVPixelFormat, AVPixelFormat);
+       static AVPixelFormat force (AVPixelFormat);
        static AVPixelFormat keep_xyz_or_rgb (AVPixelFormat);
 
-       void add_metadata (xmlpp::Node* node) const;
+       void add_metadata(xmlpp::Element* element) const;
        void write_to_socket (std::shared_ptr<Socket> socket) const;
 
        bool reset_metadata (std::shared_ptr<const Film> film, dcp::Size player_video_container_size);
@@ -126,7 +127,7 @@ public:
        }
 
 private:
-       void make_image (std::function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, bool aligned, bool fast) const;
+       void make_image (std::function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, bool fast) const;
 
        std::shared_ptr<const ImageProxy> _in;
        Crop _crop;