X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fraw_image_proxy.cc;h=21201faa69264826db4129b7db3eaccb931e10c1;hb=950ca13738e95f27ce67dbc087db15c68e0c6032;hp=e182c0e5d17f5048f70f1814826dbfbdf4aac88f;hpb=73654117144c6de0ec4efe39ddc88485df546cc9;p=dcpomatic.git

diff --git a/src/lib/raw_image_proxy.cc b/src/lib/raw_image_proxy.cc
index e182c0e5d..21201faa6 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.
 
@@ -31,6 +31,8 @@ extern "C" {
 #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 +54,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>) const
+pair<shared_ptr<Image>, int>
+RawImageProxy::image (optional<dcp::Size>) const
 {
-	return _image;
+	return make_pair (_image, 0);
 }
 
 void
@@ -64,7 +66,7 @@ RawImageProxy::add_metadata (xmlpp::Node* node) const
 	node->add_child("Type")->add_child_text (N_("Raw"));
 	node->add_child("Width")->add_child_text (raw_convert<string> (_image->size().width));
 	node->add_child("Height")->add_child_text (raw_convert<string> (_image->size().height));
-	node->add_child("PixelFormat")->add_child_text (raw_convert<string> (_image->pixel_format ()));
+	node->add_child("PixelFormat")->add_child_text (raw_convert<string> (static_cast<int> (_image->pixel_format ())));
 }
 
 void
@@ -81,11 +83,11 @@ RawImageProxy::same (shared_ptr<const ImageProxy> other) const
 		return false;
 	}
 
-	return (*_image.get()) == (*rp->image().get());
+	return (*_image.get()) == (*rp->image().first.get());
 }
 
-AVPixelFormat
-RawImageProxy::pixel_format () const
+size_t
+RawImageProxy::memory_used () const
 {
-	return _image->pixel_format ();
+	return _image->memory_used ();
 }