X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_image_proxy.h;h=aa77003a4f9169c90bbf47471806700369f6b96e;hp=5f9b3b1313935d6fcfbd754f2f4f7a7d80eedb05;hb=6ef1fc5f40567650ca9ef2b7644e4fdd97640ae6;hpb=e5b744922fb6aed65ec13f22a9de0c86dd1bd561

diff --git a/src/lib/ffmpeg_image_proxy.h b/src/lib/ffmpeg_image_proxy.h
index 5f9b3b131..aa77003a4 100644
--- a/src/lib/ffmpeg_image_proxy.h
+++ b/src/lib/ffmpeg_image_proxy.h
@@ -30,12 +30,12 @@ public:
 	explicit FFmpegImageProxy (dcp::Data);
 	FFmpegImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
 
-	std::pair<boost::shared_ptr<Image>, int> image (
+	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;
+	void write_to_socket (boost::shared_ptr<Socket>) const;
 	bool same (boost::shared_ptr<const ImageProxy> other) const;
 	size_t memory_used () const;