X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscode_job.cc;h=234ebe051f0b44ae678b43cd8e20cd1def6af5dc;hb=6713cba3044efdb7623edfb92c94fb74aaf9a518;hp=a4279ef8bf0f619e723b75f5d69e48ca6137fe81;hpb=fa6c885de512cdde0590c2bbe9ea424030a12c6b;p=dcpomatic.git

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index a4279ef8b..234ebe051 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -59,8 +59,8 @@ TranscodeJob::run ()
 {
 	try {
 
-		_film->log()->log ("Transcode job starting");
-		_film->log()->log (String::compose ("Audio delay is %1ms", _film->audio_delay()));
+		_film->log()->log (N_("Transcode job starting"));
+		_film->log()->log (String::compose (N_("Audio delay is %1ms"), _film->audio_delay()));
 
 		_encoder.reset (new Encoder (_film));
 		Transcoder w (_film, _decode_opt, this, _encoder);
@@ -68,16 +68,13 @@ TranscodeJob::run ()
 		set_progress (1);
 		set_state (FINISHED_OK);
 
-		_film->set_dcp_intrinsic_duration (_encoder->video_frames_out ());
-
-		_film->log()->log ("Transcode job completed successfully");
-		_film->log()->log (String::compose ("DCP intrinsic duration is %1", _encoder->video_frames_out()));
+		_film->log()->log (N_("Transcode job completed successfully"));
 
 	} catch (std::exception& e) {
 
 		set_progress (1);
 		set_state (FINISHED_ERROR);
-		_film->log()->log (String::compose ("Transcode job failed (%1)", e.what()));
+		_film->log()->log (String::compose (N_("Transcode job failed (%1)"), e.what()));
 
 		throw;
 	}
@@ -87,7 +84,7 @@ string
 TranscodeJob::status () const
 {
 	if (!_encoder) {
-		return "0%";
+		return _("0%");
 	}
 
 	float const fps = _encoder->current_frames_per_second ();
@@ -100,7 +97,7 @@ TranscodeJob::status () const
 	s << Job::status ();
 
 	if (!finished ()) {
-		s << "; " << fixed << setprecision (1) << fps << " " << _("frames per second");
+		s << N_("; ") << fixed << setprecision (1) << fps << N_(" ") << _("frames per second");
 	}
 	
 	return s.str ();
@@ -120,8 +117,8 @@ TranscodeJob::remaining_time () const
 
 	/* Compute approximate proposed length here, as it's only here that we need it */
 	int length = _film->length().get();
-	DCPFrameRate const dfr (_film->frames_per_second ());
-	if (dfr.skip) {
+	FrameRateConversion const frc (_film->source_frame_rate(), _film->dcp_frame_rate());
+	if (frc.skip) {
 		length /= 2;
 	}
 	/* If we are repeating it shouldn't affect transcode time, so don't take it into account */