projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidy and fix logging.
[dcpomatic.git]
/
src
/
lib
/
film.cc
diff --git
a/src/lib/film.cc
b/src/lib/film.cc
index 4d6b3d7e3b4fa132bf54b9e75fa568246f1e3615..60b80d052689de056619a2dc8b967fba4f46f66b 100644
(file)
--- a/
src/lib/film.cc
+++ b/
src/lib/film.cc
@@
-32,6
+32,7
@@
#include "upload_job.h"
#include "null_log.h"
#include "file_log.h"
#include "upload_job.h"
#include "null_log.h"
#include "file_log.h"
+#include "dcpomatic_log.h"
#include "exceptions.h"
#include "examine_content_job.h"
#include "config.h"
#include "exceptions.h"
#include "examine_content_job.h"
#include "config.h"
@@
-98,9
+99,6
@@
using boost::optional;
using boost::is_any_of;
using dcp::raw_convert;
using boost::is_any_of;
using dcp::raw_convert;
-#define LOG_GENERAL(...) log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
-#define LOG_GENERAL_NC(...) log()->log (__VA_ARGS__, LogEntry::TYPE_GENERAL);
-
string const Film::metadata_file = "metadata.xml";
/* 5 -> 6
string const Film::metadata_file = "metadata.xml";
/* 5 -> 6
@@
-1087,7
+1085,7
@@
void
Film::examine_and_add_content (shared_ptr<Content> content, bool disable_audio_analysis)
{
if (dynamic_pointer_cast<FFmpegContent> (content) && _directory) {
Film::examine_and_add_content (shared_ptr<Content> content, bool disable_audio_analysis)
{
if (dynamic_pointer_cast<FFmpegContent> (content) && _directory) {
- run_ffprobe (content->path(0), file
("ffprobe.log"), _log
);
+ run_ffprobe (content->path(0), file
("ffprobe.log")
);
}
shared_ptr<Job> j (new ExamineContentJob (shared_from_this(), content));
}
shared_ptr<Job> j (new ExamineContentJob (shared_from_this(), content));