X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscode_job.cc;h=7d11d51a9589c474306068fbafd47f20eb05ed6f;hb=d456cc07a466329a4c07e5c13322b34814e6489e;hp=4a85fa18aa8935d0a2c0ff5670f504de012b439e;hpb=f1d30fb114b3b2c6ccd8fdf5823e7cd6b26c1eef;p=dcpomatic.git

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 4a85fa18a..7d11d51a9 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
@@ -21,20 +21,21 @@
  *  @brief A job which transcodes from one format to another.
  */
 
-#include <iostream>
-#include <iomanip>
 #include "transcode_job.h"
 #include "film.h"
 #include "transcoder.h"
 #include "log.h"
+#include "safe_stringstream.h"
+#include "compose.hpp"
+#include <iostream>
+#include <iomanip>
 
 #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);
+#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::stringstream;
 using std::fixed;
 using std::setprecision;
 using std::cout;
@@ -42,10 +43,10 @@ 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)
 {
-	
+
 }
 
 string
@@ -76,9 +77,6 @@ TranscodeJob::run ()
 		_transcoder.reset ();
 
 	} catch (...) {
-		set_progress (1);
-		set_state (FINISHED_ERROR);
-		LOG_ERROR_NC (N_("Transcode job failed or cancelled"));
 		_transcoder.reset ();
 		throw;
 	}
@@ -96,14 +94,17 @@ 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 << "; " << _transcoder->video_frames_out() << "/"
+		  << _film->length().frames_round (_film->video_frame_rate ()) << " " << _("frames") << "; "
+		  << fixed << setprecision (1) << fps << " " << _("fps");
 	}
-	
+
 	return s.str ();
 }
 
@@ -113,11 +114,11 @@ TranscodeJob::remaining_time () const
 {
 	/* _transcoder might be destroyed by the job-runner thread */
 	shared_ptr<Transcoder> t = _transcoder;
-	
+
 	if (!t) {
 		return 0;
 	}
-	
+
 	float fps = t->current_encoding_rate ();
 
 	if (fps == 0) {
@@ -125,5 +126,5 @@ TranscodeJob::remaining_time () const
 	}
 
 	/* Compute approximate proposed length here, as it's only here that we need it */
-	return (_film->length().frames (_film->video_frame_rate ()) - t->video_frames_out()) / fps;
+	return (_film->length().frames_round (_film->video_frame_rate ()) - t->video_frames_out()) / fps;
 }