X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscode_job.cc;h=23a46d06dddcb7875a9247911d387028a0da802e;hb=152b14ab5509678f3d68b52a1ed275cfdc38191b;hp=97e8bd416a0432697b14dcb2503d6f82d62ba2e0;hpb=39bc73fe192f932ed6695eb87b19de446e8b4f55;p=dcpomatic.git

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 97e8bd416..23a46d06d 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -27,11 +27,14 @@
 #include "film.h"
 #include "transcoder.h"
 #include "log.h"
+#include "safe_stringstream.h"
 
 #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;
@@ -51,28 +54,25 @@ TranscodeJob::name () const
 	return String::compose (_("Transcode %1"), _film->name());
 }
 
-string
-TranscodeJob::json_name () const
-{
-	return N_("transcode");
-}
-
 void
 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);
+		LOG_ERROR_NC (N_("Transcode job failed or cancelled"));
 		_transcoder.reset ();
 		throw;
 	}
@@ -90,7 +90,7 @@ TranscodeJob::status () const
 		return Job::status ();
 	}
 
-	stringstream s;
+	SafeStringStream s;
 
 	s << Job::status ();