Only mark _suspended as false at the appropriate times; previously
[dcpomatic.git] / src / lib / transcode_job.cc
index 420f5a8d219240ed726e617c9cab49febae7a9a5..da7571b96db1219d63dbe7c6abfaf411535c528c 100644 (file)
 #include "film.h"
 #include "encoder.h"
 #include "log.h"
+#include "dcpomatic_log.h"
 #include "compose.hpp"
 #include <iostream>
 #include <iomanip>
 
 #include "i18n.h"
 
-#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
-#define LOG_GENERAL_NC(...) _film->log()->log (__VA_ARGS__, LogEntry::TYPE_GENERAL);
-#define LOG_ERROR_NC(...)   _film->log()->log (__VA_ARGS__, LogEntry::TYPE_ERROR);
-
 using std::string;
 using std::fixed;
 using std::setprecision;
@@ -55,7 +52,7 @@ TranscodeJob::TranscodeJob (shared_ptr<const Film> film)
 string
 TranscodeJob::name () const
 {
-       return String::compose (_("Transcode %1"), _film->name());
+       return String::compose (_("Transcoding %1"), _film->name());
 }
 
 string