X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fraw_image_proxy.cc;h=e73a1543d34faabe40467f284065e00784bb09ca;hb=05c37bfdb86be26497d5baa448a0cbda20e33bed;hp=7e0688d13eee5beacb75a1810d7997c3e934babb;hpb=946dbad9821e676f1d8fdc5abba459da54b8e84c;p=dcpomatic.git

diff --git a/src/lib/raw_image_proxy.cc b/src/lib/raw_image_proxy.cc
index 7e0688d13..e73a1543d 100644
--- a/src/lib/raw_image_proxy.cc
+++ b/src/lib/raw_image_proxy.cc
@@ -17,29 +17,28 @@
 
 */
 
+#include "raw_image_proxy.h"
+#include "image.h"
+#include "raw_convert.h"
+#include <dcp/util.h>
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
 #include <libcxml/cxml.h>
-#include <dcp/util.h>
-#include <dcp/raw_convert.h>
-#include "raw_image_proxy.h"
-#include "image.h"
 
 #include "i18n.h"
 
 using std::string;
 using boost::shared_ptr;
+using boost::optional;
 
-RawImageProxy::RawImageProxy (shared_ptr<Image> image, shared_ptr<Log> log)
-	: ImageProxy (log)
-	, _image (image)
+RawImageProxy::RawImageProxy (shared_ptr<Image> image)
+	: _image (image)
 {
 
 }
 
-RawImageProxy::RawImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket, shared_ptr<Log> log)
-	: ImageProxy (log)
+RawImageProxy::RawImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket)
 {
 	dcp::Size size (
 		xml->number_child<int> ("Width"), xml->number_child<int> ("Height")
@@ -50,7 +49,7 @@ RawImageProxy::RawImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> soc
 }
 
 shared_ptr<Image>
-RawImageProxy::image () const
+RawImageProxy::image (optional<dcp::NoteHandler>) const
 {
 	return _image;
 }
@@ -59,9 +58,9 @@ void
 RawImageProxy::add_metadata (xmlpp::Node* node) const
 {
 	node->add_child("Type")->add_child_text (N_("Raw"));
-	node->add_child("Width")->add_child_text (dcp::raw_convert<string> (_image->size().width));
-	node->add_child("Height")->add_child_text (dcp::raw_convert<string> (_image->size().height));
-	node->add_child("PixelFormat")->add_child_text (dcp::raw_convert<string> (_image->pixel_format ()));
+	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 ()));
 }
 
 void