Tidy up logging a bit. Make it configurable from the GUI.

1 files changed, 23 insertions, 10 deletions

diff --git a/src/lib/image_proxy.cc b/src/lib/image_proxy.cc
index 0806b4ccc..c0e75c77c 100644
--- a/src/lib/image_proxy.cc
+++ b/src/lib/image_proxy.cc
@@ -24,21 +24,32 @@
 #include "image.h"
 #include "exceptions.h"
 #include "cross.h"
+#include "log.h"
 
 #include "i18n.h"
 
+#define LOG_TIMING(...) _log->microsecond_log (String::compose (__VA_ARGS__), Log::TIMING);
+
 using std::cout;
 using std::string;
 using std::stringstream;
 using boost::shared_ptr;
 
-RawImageProxy::RawImageProxy (shared_ptr<Image> image)
-	: _image (image)
+ImageProxy::ImageProxy (shared_ptr<Log> log)
+	: _log (log)
+{
+
+}
+
+RawImageProxy::RawImageProxy (shared_ptr<Image> image, shared_ptr<Log> log)
+	: ImageProxy (log)
+	, _image (image)
 {
 
 }
 
-RawImageProxy::RawImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket)
+RawImageProxy::RawImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket, shared_ptr<Log> log)
+	: ImageProxy (log)
 {
 	libdcp::Size size (
 		xml->number_child<int> ("Width"), xml->number_child<int> ("Height")
@@ -68,7 +79,8 @@ RawImageProxy::send_binary (shared_ptr<Socket> socket) const
 	_image->write_to_socket (socket);
 }
 
-MagickImageProxy::MagickImageProxy (boost::filesystem::path path)
+MagickImageProxy::MagickImageProxy (boost::filesystem::path path, shared_ptr<Log> log)
+	: ImageProxy (log)
 {
 	/* Read the file into a Blob */
 	
@@ -89,7 +101,8 @@ MagickImageProxy::MagickImageProxy (boost::filesystem::path path)
 	delete[] data;
 }
 
-MagickImageProxy::MagickImageProxy (shared_ptr<cxml::Node>, shared_ptr<Socket> socket)
+MagickImageProxy::MagickImageProxy (shared_ptr<cxml::Node>, shared_ptr<Socket> socket, shared_ptr<Log> log)
+	: ImageProxy (log)
 {
 	uint32_t const size = socket->read_uint32 ();
 	uint8_t* data = new uint8_t[size];
@@ -105,7 +118,7 @@ MagickImageProxy::image () const
 		return _image;
 	}
 
-	TIMING("MagickImageProxy begins read and decode of %1 bytes", _blob.length());
+	LOG_TIMING ("MagickImageProxy begins read and decode of %1 bytes", _blob.length());
 
 	Magick::Image* magick_image = 0;
 	try {
@@ -134,7 +147,7 @@ MagickImageProxy::image () const
 
 	delete magick_image;
 
-	TIMING("MagickImageProxy completes read and decode of %1 bytes", _blob.length());
+	LOG_TIMING ("MagickImageProxy completes read and decode of %1 bytes", _blob.length());
 
 	return _image;
 }
@@ -153,12 +166,12 @@ MagickImageProxy::send_binary (shared_ptr<Socket> socket) const
 }
 
 shared_ptr<ImageProxy>
-image_proxy_factory (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket)
+image_proxy_factory (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket, shared_ptr<Log> log)
 {
 	if (xml->string_child("Type") == N_("Raw")) {
-		return shared_ptr<ImageProxy> (new RawImageProxy (xml, socket));
+		return shared_ptr<ImageProxy> (new RawImageProxy (xml, socket, log));
 	} else if (xml->string_child("Type") == N_("Magick")) {
-		return shared_ptr<MagickImageProxy> (new MagickImageProxy (xml, socket));
+		return shared_ptr<MagickImageProxy> (new MagickImageProxy (xml, socket, log));
 	}
 
 	throw NetworkError (_("Unexpected image type received by server"));