Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/raw_image_proxy.cc b/src/lib/raw_image_proxy.cc
index 7e0688d13eee5beacb75a1810d7997c3e934babb..a7c77ce6c6406e9168503384b92535fafd4c305b 100644 (file)
--- a/src/lib/raw_image_proxy.cc
+++ b/src/lib/raw_image_proxy.cc
@@ -17,29 +17,30 @@
 
 */
 
+#include "raw_image_proxy.h"
+#include "image.h"
+#include "raw_convert.h"
+#include <dcp/util.h>
+#include <libcxml/cxml.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 <libxml++/libxml++.h>
 
 #include "i18n.h"
 
 using std::string;
 using boost::shared_ptr;
+using boost::dynamic_pointer_cast;
+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 +51,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 +60,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
@@ -69,3 +70,14 @@ RawImageProxy::send_binary (shared_ptr<Socket> socket) const
 {
        _image->write_to_socket (socket);
 }
+
+bool
+RawImageProxy::same (shared_ptr<const ImageProxy> other) const
+{
+       shared_ptr<const RawImageProxy> rp = dynamic_pointer_cast<const RawImageProxy> (other);
+       if (!rp) {
+               return false;
+       }
+
+       return (*_image.get()) == (*rp->image().get());
+}