Merge master.

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

diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index 2842b6325d7017d964000bb637cab40b9905e274..2b7a2e18f6b2ff712ba6baf47b9e074f44681676 100644 (file)
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
     Taken from code Copyright (C) 2010-2011 Terrence Meiczinger
 
     This program is free software; you can redistribute it and/or modify
@@ -43,10 +43,10 @@
 #include <boost/asio.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/lexical_cast.hpp>
-#include <libdcp/gamma_lut.h>
-#include <libdcp/xyz_frame.h>
-#include <libdcp/rgb_xyz.h>
-#include <libdcp/colour_matrix.h>
+#include <dcp/gamma_lut.h>
+#include <dcp/xyz_frame.h>
+#include <dcp/rgb_xyz.h>
+#include <dcp/colour_matrix.h>
 #include <libcxml/cxml.h>
 #include "film.h"
 #include "dcp_video_frame.h"
@@ -288,12 +288,7 @@ DCPVideoFrame::encode_remotely (ServerDescription serv)
        stringstream xml;
        doc.write_to_stream (xml, "UTF-8");
 
-       _log->log (String::compose (
-                          N_("Sending to remote; pixel format %1, components %2, lines (%3,%4,%5), line sizes (%6,%7,%8)"),
-                          _image->pixel_format(), _image->components(),
-                          _image->lines(0), _image->lines(1), _image->lines(2),
-                          _image->line_size()[0], _image->line_size()[1], _image->line_size()[2]
-                          ));
+       _log->log (String::compose (N_("Sending frame %1 to remote"), _frame));
 
        socket->write (xml.str().length() + 1);
        socket->write ((uint8_t *) xml.str().c_str(), xml.str().length() + 1);