X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscode_job.cc;h=6d5edd7c060c662dc404445c1e3ed1a1175d4ace;hb=320a74efb8d9c8aacded2799459a92d5b7235d90;hp=cf16b8ab650982b8e65b09b4c50909af6d39f8b6;hpb=63ea6b6c5ee64f8ee067c2b488d004b6dfe363e0;p=dcpomatic.git

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index cf16b8ab6..6d5edd7c0 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -24,12 +24,11 @@
 #include <iostream>
 #include <iomanip>
 #include "transcode_job.h"
-#include "j2k_wav_encoder.h"
 #include "film.h"
-#include "format.h"
 #include "transcoder.h"
 #include "log.h"
-#include "encoder_factory.h"
+
+#include "i18n.h"
 
 using std::string;
 using std::stringstream;
@@ -38,11 +37,9 @@ using std::setprecision;
 using boost::shared_ptr;
 
 /** @param s Film to use.
- *  @param o Options.
  */
-TranscodeJob::TranscodeJob (shared_ptr<Film> f, shared_ptr<const Options> o, shared_ptr<Job> req)
-	: Job (f, req)
-	, _opt (o)
+TranscodeJob::TranscodeJob (shared_ptr<const Film> f)
+	: Job (f)
 {
 	
 }
@@ -50,7 +47,7 @@ TranscodeJob::TranscodeJob (shared_ptr<Film> f, shared_ptr<const Options> o, sha
 string
 TranscodeJob::name () const
 {
-	return String::compose ("Transcode %1", _film->name());
+	return String::compose (_("Transcode %1"), _film->name());
 }
 
 void
@@ -58,21 +55,20 @@ TranscodeJob::run ()
 {
 	try {
 
-		_film->log()->log ("Transcode job starting");
+		_film->log()->log (N_("Transcode job starting"));
 
-		_encoder = encoder_factory (_film, _opt);
-		Transcoder w (_film, _opt, this, _encoder);
-		w.go ();
+		_transcoder.reset (new Transcoder (_film, shared_from_this ()));
+		_transcoder->go ();
 		set_progress (1);
 		set_state (FINISHED_OK);
 
-		_film->log()->log ("Transcode job completed successfully");
+		_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;
 	}
@@ -81,33 +77,40 @@ TranscodeJob::run ()
 string
 TranscodeJob::status () const
 {
-	if (!_encoder) {
-		return "0%";
+	if (!_transcoder) {
+		return _("0%");
 	}
 
-	if (_encoder->skipping () && !finished ()) {
-		return "skipping already-encoded frames";
-	}
-		
-	
-	float const fps = _encoder->current_frames_per_second ();
+	float const fps = _transcoder->current_encoding_rate ();
 	if (fps == 0) {
 		return Job::status ();
 	}
 
 	stringstream s;
 
-	s << Job::status () << "; " << fixed << setprecision (1) << fps << " frames per second";
+	s << Job::status ();
+
+	if (!finished ()) {
+		s << N_("; ") << fixed << setprecision (1) << fps << N_(" ") << _("frames per second");
+	}
+	
 	return s.str ();
 }
 
 int
 TranscodeJob::remaining_time () const
 {
-	float fps = _encoder->current_frames_per_second ();
+	if (!_transcoder) {
+		return 0;
+	}
+	
+	float fps = _transcoder->current_encoding_rate ();
+
 	if (fps == 0) {
 		return 0;
 	}
 
-	return ((_film->dcp_length() - _encoder->last_frame()) / fps);
+	/* Compute approximate proposed length here, as it's only here that we need it */
+	OutputVideoFrame const left = _film->time_to_video_frames (_film->length ()) - _transcoder->video_frames_out();
+	return left / fps;
 }