projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Logging improvements to allow prettier displays in the server GUI.
[dcpomatic.git]
/
src
/
lib
/
image_proxy.cc
diff --git
a/src/lib/image_proxy.cc
b/src/lib/image_proxy.cc
index 233f477453416ee44dac4c0659442a751e48a701..2e9e8caafc0ba841db0f347a87903fc7aaea240f 100644
(file)
--- a/
src/lib/image_proxy.cc
+++ b/
src/lib/image_proxy.cc
@@
-17,8
+17,6
@@
*/
*/
-#include <dcp/util.h>
-#include <dcp/raw_convert.h>
#include "image_proxy.h"
#include "raw_image_proxy.h"
#include "magick_image_proxy.h"
#include "image_proxy.h"
#include "raw_image_proxy.h"
#include "magick_image_proxy.h"
@@
-26,32
+24,25
@@
#include "image.h"
#include "exceptions.h"
#include "cross.h"
#include "image.h"
#include "exceptions.h"
#include "cross.h"
-#include "log.h"
+#include <dcp/util.h>
+#include <libcxml/cxml.h>
+#include <iostream>
#include "i18n.h"
#include "i18n.h"
-#define LOG_TIMING(...) _log->microsecond_log (String::compose (__VA_ARGS__), Log::TYPE_TIMING);
-
using std::cout;
using std::string;
using std::cout;
using std::string;
-using std::stringstream;
using boost::shared_ptr;
using boost::shared_ptr;
-ImageProxy::ImageProxy (shared_ptr<Log> log)
- : _log (log)
-{
-
-}
-
shared_ptr<ImageProxy>
shared_ptr<ImageProxy>
-image_proxy_factory (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket
, shared_ptr<Log> log
)
+image_proxy_factory (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket)
{
if (xml->string_child("Type") == N_("Raw")) {
{
if (xml->string_child("Type") == N_("Raw")) {
- return shared_ptr<ImageProxy> (new RawImageProxy (xml, socket
, log
));
+ return shared_ptr<ImageProxy> (new RawImageProxy (xml, socket));
} else if (xml->string_child("Type") == N_("Magick")) {
} else if (xml->string_child("Type") == N_("Magick")) {
- return shared_ptr<MagickImageProxy> (new MagickImageProxy (xml, socket
, log
));
+ return shared_ptr<MagickImageProxy> (new MagickImageProxy (xml, socket));
} else if (xml->string_child("Type") == N_("J2K")) {
} else if (xml->string_child("Type") == N_("J2K")) {
- return shared_ptr<J2KImageProxy> (new J2KImageProxy (xml, socket
, log
));
+ return shared_ptr<J2KImageProxy> (new J2KImageProxy (xml, socket));
}
throw NetworkError (_("Unexpected image type received by server"));
}
throw NetworkError (_("Unexpected image type received by server"));