Various markup and tweaks.

[dcpomatic.git] / src / lib / examine_content_job.cc

diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc
index 70a04b8255059262ec0de2fc8e0c929a277b6702..4b30c943136a522d3b2197794ca38ca5eb2b187d 100644 (file)
--- 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,16 +52,20 @@ 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
 ExamineContentJob::run ()
 {
-       descend (1);
+       descend (0.5);
+       _film->set_content_digest (md5_digest (_film->content_path ()));
+       ascend ();
+
+       descend (0.5);
 
        /* Set the film's length to either
           a) a length judged by running through the content or
@@ -74,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()) {
@@ -86,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 ();