X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_image_proxy.h;h=21109c9d6f2dccf9baf64f11ebbc3b2ac24618bc;hb=66cf5e6f9201183a15d325dd0d779fc7f53efc84;hp=0fa8774b85390aa91781191ac9fa1695c59bfde5;hpb=72b11d5eb036651b6ff68edf3ed270e8fc52960f;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_image_proxy.h b/src/lib/ffmpeg_image_proxy.h
index 0fa8774b8..21109c9d6 100644
--- a/src/lib/ffmpeg_image_proxy.h
+++ b/src/lib/ffmpeg_image_proxy.h
@@ -19,7 +19,8 @@
 */
 
 #include "image_proxy.h"
-#include <dcp/data.h>
+#include "types.h"
+#include <dcp/array_data.h>
 #include <boost/thread/mutex.hpp>
 #include <boost/filesystem.hpp>
 
@@ -27,29 +28,28 @@ class FFmpegImageProxy : public ImageProxy
 {
 public:
 	explicit FFmpegImageProxy (boost::filesystem::path);
-	explicit FFmpegImageProxy (dcp::Data);
-	FFmpegImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
+	explicit FFmpegImageProxy (dcp::ArrayData);
+	FFmpegImageProxy (std::shared_ptr<Socket> socket);
 
-	std::pair<boost::shared_ptr<Image>, int> image (
-		boost::optional<dcp::NoteHandler> note = boost::optional<dcp::NoteHandler> (),
+	Result image (
 		boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
 		) const;
 
 	void add_metadata (xmlpp::Node *) const;
-	void send_binary (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);
 	int64_t avio_seek (int64_t const pos, int whence);
 
 private:
-	dcp::Data _data;
+	dcp::ArrayData _data;
 	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;
 };