X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_image_proxy.h;h=48317ed75c7ae16d3d3d61c30e729a9ec9c4976c;hb=10c9dbd18c11dc57629b5a0e0b8f33079f5d2d8f;hp=4fca899f49626c92223691e010f97df221a2bb37;hpb=e64a1a9aae0200d14feed49a4c6cf537bf5708a4;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_image_proxy.h b/src/lib/ffmpeg_image_proxy.h
index 4fca899f4..48317ed75 100644
--- a/src/lib/ffmpeg_image_proxy.h
+++ b/src/lib/ffmpeg_image_proxy.h
@@ -27,17 +27,18 @@
 class FFmpegImageProxy : public ImageProxy
 {
 public:
-	explicit FFmpegImageProxy (boost::filesystem::path, VideoRange video_range);
-	explicit FFmpegImageProxy (dcp::ArrayData, VideoRange video_range);
-	FFmpegImageProxy (boost::shared_ptr<cxml::Node> xml, boost::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;
 
 	void add_metadata (xmlpp::Node *) const;
-	void write_to_socket (boost::shared_ptr<Socket>) const;
-	bool same (boost::shared_ptr<const ImageProxy> other) const;
+	void write_to_socket (std::shared_ptr<Socket>) const;
+	bool same (std::shared_ptr<const ImageProxy> other) const;
 	size_t memory_used () const;
 
 	int avio_read (uint8_t* buffer, int const amount);
@@ -45,12 +46,11 @@ 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.
 	*/
 	boost::optional<boost::filesystem::path> _path;
-	mutable boost::shared_ptr<Image> _image;
+	mutable std::shared_ptr<Image> _image;
 	mutable boost::mutex _mutex;
 };