projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pot/merge.
[dcpomatic.git]
/
src
/
lib
/
upload_job.cc
diff --git
a/src/lib/upload_job.cc
b/src/lib/upload_job.cc
index 4726c734ab19db889ea97e8f3bcda684db3d1b71..cbcb8dfc622ce3261175fafec32df5311116ae5e 100644
(file)
--- a/
src/lib/upload_job.cc
+++ b/
src/lib/upload_job.cc
@@
-26,6
+26,7
@@
#include "upload_job.h"
#include "config.h"
#include "log.h"
#include "upload_job.h"
#include "config.h"
#include "log.h"
+#include "dcpomatic_log.h"
#include "film.h"
#include "scp_uploader.h"
#include "curl_uploader.h"
#include "film.h"
#include "scp_uploader.h"
#include "curl_uploader.h"
@@
-33,8
+34,6
@@
#include "i18n.h"
#include "i18n.h"
-#define LOG_GENERAL_NC(...) _film->log()->log (__VA_ARGS__, LogEntry::TYPE_GENERAL);
-
using std::string;
using std::min;
using boost::shared_ptr;
using std::string;
using std::min;
using boost::shared_ptr;