X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscode_job.cc;h=d16287111edaf098f3df86e7d7b86b472efc18cd;hb=53eea12d3e0d7925d5949de92859bc358ee0adcc;hp=97e8bd416a0432697b14dcb2503d6f82d62ba2e0;hpb=cfdd68eb5fb0ef8423e860103ad4e5510994f1da;p=dcpomatic.git

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 97e8bd416..d16287111 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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;
@@ -39,8 +42,8 @@ using boost::shared_ptr;
 
 /** @param s Film to use.
  */
-TranscodeJob::TranscodeJob (shared_ptr<const Film> f)
-	: Job (f)
+TranscodeJob::TranscodeJob (shared_ptr<const Film> film)
+	: Job (film)
 {
 	
 }
@@ -62,14 +65,14 @@ 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 (...) {
@@ -90,12 +93,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 ();