Move Socket to dcpomatic_socket.{cc,h}.

[dcpomatic.git] / src / lib / magick_image_proxy.cc

diff --git a/src/lib/magick_image_proxy.cc b/src/lib/magick_image_proxy.cc
index e71ee4284f041d5c1acb2154e8896dcaf885b7f7..e4417f3665e85d0e15163bd0ffccde7b1fa2f23b 100644 (file)
--- a/src/lib/magick_image_proxy.cc
+++ b/src/lib/magick_image_proxy.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,14 +21,16 @@
 #include "magick_image_proxy.h"
 #include "cross.h"
 #include "exceptions.h"
-#include "util.h"
+#include "dcpomatic_socket.h"
 #include "image.h"
+#include "compose.hpp"
 
 #include "i18n.h"
 
 using std::string;
 using std::cout;
 using boost::shared_ptr;
+using boost::optional;
 using boost::dynamic_pointer_cast;
 
 MagickImageProxy::MagickImageProxy (boost::filesystem::path path)
@@ -62,7 +64,7 @@ MagickImageProxy::MagickImageProxy (shared_ptr<cxml::Node>, shared_ptr<Socket> s
 }
 
 shared_ptr<Image>
-MagickImageProxy::image () const
+MagickImageProxy::image (optional<dcp::NoteHandler>) const
 {
        if (_image) {
                return _image;