X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fexamine_content_job.cc;h=4b30c943136a522d3b2197794ca38ca5eb2b187d;hb=0d3f5aae5b99832b7c5d55f32f5bccb365caa3fd;hp=a783cde339f646a009d7b4c3da9eea617ace0b16;hpb=dedac27070ac5ad65265a0db1fa316b3e436cea7;p=dcpomatic.git

diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc
index a783cde33..4b30c9431 100644
--- a/src/lib/examine_content_job.cc
+++ b/src/lib/examine_content_job.cc
@@ -31,13 +31,15 @@
 #include "film.h"
 #include "video_decoder.h"
 
+#include "i18n.h"
+
 using std::string;
 using std::vector;
 using std::pair;
 using boost::shared_ptr;
 
-ExamineContentJob::ExamineContentJob (shared_ptr<Film> f, shared_ptr<Job> req)
-	: Job (f, req)
+ExamineContentJob::ExamineContentJob (shared_ptr<Film> f)
+	: Job (f)
 {
 
 }
@@ -50,10 +52,10 @@ string
 ExamineContentJob::name () const
 {
 	if (_film->name().empty ()) {
-		return "Examine content";
+		return _("Examine content");
 	}
 	
-	return String::compose ("Examine content of %1", _film->name());
+	return String::compose (_("Examine content of %1"), _film->name());
 }
 
 void
@@ -78,10 +80,10 @@ ExamineContentJob::run ()
 		_film->unset_length ();
 		_film->set_crop (Crop ());
 		
-		shared_ptr<DecodeOptions> o (new DecodeOptions);
-		o->decode_audio = false;
+		DecodeOptions o;
+		o.decode_audio = false;
 		
-		Decoders decoders = decoder_factory (_film, o, this);
+		Decoders decoders = decoder_factory (_film, o);
 		
 		set_progress_unknown ();
 		while (!decoders.video->pass()) {
@@ -90,17 +92,16 @@ ExamineContentJob::run ()
 		
 		_film->set_length (decoders.video->video_frame());
 		
-		_film->log()->log (String::compose ("Video length examined as %1 frames", _film->length().get()));
+		_film->log()->log (String::compose (N_("Video length examined as %1 frames"), _film->length().get()));
 		
 	} else {
 
 		/* Get a quick decoder to get the content's length from its header */
 		
-		shared_ptr<DecodeOptions> o (new DecodeOptions);
-		Decoders d = decoder_factory (_film, o, 0);
+		Decoders d = decoder_factory (_film, DecodeOptions());
 		_film->set_length (d.video->length());
 	
-		_film->log()->log (String::compose ("Video length obtained from header as %1 frames", _film->length().get()));
+		_film->log()->log (String::compose (N_("Video length obtained from header as %1 frames"), _film->length().get()));
 	}
 
 	ascend ();