X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscode_job.cc;h=23a46d06dddcb7875a9247911d387028a0da802e;hb=12efbd5938f08eb445b43f539fa4f27aa5caccfb;hp=46fc97fb31b74bdf14f6093dd0d973e34fa78709;hpb=f58d9e44302151dea9f594acd9fc27a331fa77fb;p=dcpomatic.git

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 46fc97fb3..23a46d06d 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.
@@ -55,20 +59,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;
 	}
@@ -86,7 +90,7 @@ TranscodeJob::status () const
 		return Job::status ();
 	}
 
-	stringstream s;
+	SafeStringStream s;
 
 	s << Job::status ();
 
@@ -97,6 +101,7 @@ TranscodeJob::status () const
 	return s.str ();
 }
 
+/** @return Approximate remaining time in seconds */
 int
 TranscodeJob::remaining_time () const
 {
@@ -114,6 +119,5 @@ TranscodeJob::remaining_time () const
 	}
 
 	/* Compute approximate proposed length here, as it's only here that we need it */
-	VideoFrame const left = _film->time_to_video_frames (_film->length ()) - t->video_frames_out();
-	return left / fps;
+	return (_film->length().frames (_film->video_frame_rate ()) - t->video_frames_out()) / fps;
 }