X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fraw_image_proxy.cc;h=09902c3a29b5c0a5844b83fe50f932e5039b34e0;hb=ba9fb85168d004d7643dc02f911fd173a136758b;hp=094b50d058c2bef13cece2d1dbe8df402bce4e21;hpb=a5ea5c0d2637dd41e3d356cb62cac75b8cadf8ce;p=dcpomatic.git

diff --git a/src/lib/raw_image_proxy.cc b/src/lib/raw_image_proxy.cc
index 094b50d05..09902c3a2 100644
--- a/src/lib/raw_image_proxy.cc
+++ b/src/lib/raw_image_proxy.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -20,17 +20,22 @@
 
 #include "raw_image_proxy.h"
 #include "image.h"
+#include "warnings.h"
 #include <dcp/raw_convert.h>
 #include <dcp/util.h>
 #include <libcxml/cxml.h>
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 #include "i18n.h"
 
 using std::string;
+using std::pair;
+using std::make_pair;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
@@ -52,10 +57,10 @@ RawImageProxy::RawImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> soc
 	_image->read_from_socket (socket);
 }
 
-shared_ptr<Image>
-RawImageProxy::image (optional<dcp::NoteHandler>, optional<dcp::Size>) const
+ImageProxy::Result
+RawImageProxy::image (optional<dcp::Size>) const
 {
-	return _image;
+	return Result (_image, 0);
 }
 
 void
@@ -68,7 +73,7 @@ RawImageProxy::add_metadata (xmlpp::Node* node) const
 }
 
 void
-RawImageProxy::send_binary (shared_ptr<Socket> socket) const
+RawImageProxy::write_to_socket (shared_ptr<Socket> socket) const
 {
 	_image->write_to_socket (socket);
 }
@@ -81,13 +86,7 @@ RawImageProxy::same (shared_ptr<const ImageProxy> other) const
 		return false;
 	}
 
-	return (*_image.get()) == (*rp->image().get());
-}
-
-AVPixelFormat
-RawImageProxy::pixel_format () const
-{
-	return _image->pixel_format ();
+	return (*_image.get()) == (*rp->image().image.get());
 }
 
 size_t