X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscode_job.cc;h=c7102879413b7f3a3a628a9596557c68b14b7aa0;hb=985a83ffbf251db481150221914ef74fbfe549b2;hp=fd4dfcef6dfc10c89b699777514377b1b47820b2;hpb=1f8b45c7fd49714628009f5ed2161fbaa2b4d729;p=dcpomatic.git

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index fd4dfcef6..c71028794 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -27,13 +27,17 @@
 #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;
 using boost::shared_ptr;
 
 /** @param s Film to use.
@@ -50,31 +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);
-		_film->log()->log (N_("Transcode job failed or cancelled"));
+		LOG_ERROR_NC (N_("Transcode job failed or cancelled"));
 		_transcoder.reset ();
 		throw;
 	}
@@ -92,12 +90,13 @@ TranscodeJob::status () const
 		return Job::status ();
 	}
 
-	stringstream s;
+	SafeStringStream s;
 
 	s << Job::status ();
 
 	if (!finished () && !_transcoder->finishing ()) {
-		s << "; " << fixed << setprecision (1) << fps << " " << _("frames per second");
+		/* TRANSLATORS: fps here is an abbreviation for frames per second */
+		s << "; " << fixed << setprecision (1) << fps << " " << _("fps");
 	}
 	
 	return s.str ();