X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscode_job.cc;h=4a85fa18aa8935d0a2c0ff5670f504de012b439e;hb=8d58a7c5f4320ad5c111e336c45e44d6b51ab509;hp=fd4dfcef6dfc10c89b699777514377b1b47820b2;hpb=e6f28e7cda23c1ba3c49cc1bf2dc1491c2f87160;p=dcpomatic.git diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc index fd4dfcef6..4a85fa18a 100644 --- a/src/lib/transcode_job.cc +++ b/src/lib/transcode_job.cc @@ -30,10 +30,14 @@ #include "i18n.h" +#define LOG_GENERAL_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_GENERAL); +#define LOG_ERROR_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_ERROR); + using std::string; using std::stringstream; using std::fixed; using std::setprecision; +using std::cout; using boost::shared_ptr; /** @param s Film to use. @@ -61,20 +65,20 @@ TranscodeJob::run () { try { - _film->log()->log (N_("Transcode job starting")); + LOG_GENERAL_NC (N_("Transcode job starting")); _transcoder.reset (new Transcoder (_film, shared_from_this ())); _transcoder->go (); set_progress (1); set_state (FINISHED_OK); - _film->log()->log (N_("Transcode job completed successfully")); + LOG_GENERAL_NC (N_("Transcode job completed successfully")); _transcoder.reset (); } catch (...) { set_progress (1); set_state (FINISHED_ERROR); - _film->log()->log (N_("Transcode job failed or cancelled")); + LOG_ERROR_NC (N_("Transcode job failed or cancelled")); _transcoder.reset (); throw; }