Replace aligned bool with enum Alignment.

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

diff --git a/src/lib/ffmpeg_image_proxy.h b/src/lib/ffmpeg_image_proxy.h
index 92689abe89245df278c97cb1b463023d84e681b1..48317ed75c7ae16d3d3d61c30e729a9ec9c4976c 100644 (file)
--- a/src/lib/ffmpeg_image_proxy.h
+++ b/src/lib/ffmpeg_image_proxy.h
@@ -27,11 +27,12 @@
 class FFmpegImageProxy : public ImageProxy
 {
 public:
-       explicit FFmpegImageProxy (boost::filesystem::path, VideoRange video_range);
-       explicit FFmpegImageProxy (dcp::ArrayData, VideoRange video_range);
-       FFmpegImageProxy (std::shared_ptr<cxml::Node> xml, std::shared_ptr<Socket> socket);
+       explicit FFmpegImageProxy (boost::filesystem::path);
+       explicit FFmpegImageProxy (dcp::ArrayData);
+       FFmpegImageProxy (std::shared_ptr<Socket> socket);
 
        Result image (
+               Image::Alignment alignment,
                boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
                ) const;
 
@@ -45,7 +46,6 @@ public:
 
 private:
        dcp::ArrayData _data;
-       VideoRange _video_range;
        mutable int64_t _pos;
        /** Path of a file that this image came from, if applicable; stored so that
            failed-decode errors can give more detail.