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 93333605b8e6a6983fc63fd668f420bd426fae35..4b30c943136a522d3b2197794ca38ca5eb2b187d 100644 (file)
--- a/src/lib/examine_content_job.cc
+++ b/src/lib/examine_content_job.cc
@@ -26,19 +26,20 @@
 #include "options.h"
 #include "decoder_factory.h"
 #include "decoder.h"
-#include "imagemagick_encoder.h"
 #include "transcoder.h"
 #include "log.h"
 #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)
 {
 
 }
@@ -51,22 +52,25 @@ 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 ()
 {
-       float progress_remaining = 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
           b) the length from a decoder's header.
        */
-
        if (!_film->trust_content_header()) {
                /* Decode the content to get an accurate length */
                
@@ -74,97 +78,32 @@ ExamineContentJob::run ()
                   will be messed up.
                */
                _film->unset_length ();
+               _film->set_crop (Crop ());
                
-               shared_ptr<Options> o (new Options ("", "", ""));
-               o->out_size = Size (512, 512);
-               o->apply_crop = false;
-               o->decode_audio = false;
+               DecodeOptions o;
+               o.decode_audio = false;
                
-               descend (0.5);
-               
-               pair<shared_ptr<VideoDecoder>, shared_ptr<AudioDecoder> > decoders = decoder_factory (_film, o, this);
+               Decoders decoders = decoder_factory (_film, o);
                
                set_progress_unknown ();
-               while (!decoders.first->pass()) {
+               while (!decoders.video->pass()) {
                        /* keep going */
                }
                
-               _film->set_length (decoders.first->video_frame());
-               
-               _film->log()->log (String::compose ("Video length examined as %1 frames", _film->length().get()));
-               
-               ascend ();
+               _film->set_length (decoders.video->video_frame());
                
-               progress_remaining -= 0.5;
+               _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.
-                  It would have been nice to just use the thumbnail transcoder's decoder,
-                  but that's a bit fiddly, and this isn't too expensive.
-               */
+               /* Get a quick decoder to get the content's length from its header */
                
-               shared_ptr<Options> o (new Options ("", "", ""));
-               o->out_size = Size (1024, 1024);
-               pair<shared_ptr<VideoDecoder>, shared_ptr<AudioDecoder> > d = decoder_factory (_film, o, 0);
-               _film->set_length (d.first->length());
+               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()));
        }
 
-       /* Now make thumbnails for it */
-
-       descend (progress_remaining);
-
-       try {
-               shared_ptr<Options> o (new Options (_film->dir ("thumbs"), ".png", ""));
-               o->out_size = _film->size ();
-               o->apply_crop = false;
-               o->decode_audio = false;
-               o->decode_video_skip = _film->length().get() / 128;
-               o->decode_subtitles = true;
-               shared_ptr<ImageMagickEncoder> e (new ImageMagickEncoder (_film, o));
-               Transcoder w (_film, o, this, e);
-               w.go ();
-
-               /* Now set the film's length from the transcoder's decoder, since we
-                  went to all the trouble of going through the content.
-               */
-
-               _film->set_length (w.video_decoder()->video_frame());
-               
-       } catch (std::exception& e) {
-
-               ascend ();
-               set_progress (1);
-               set_error (e.what ());
-               set_state (FINISHED_ERROR);
-               return;
-               
-       }
-
-       string const tdir = _film->dir ("thumbs");
-       vector<SourceFrame> thumbs;
-
-       for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (tdir); i != boost::filesystem::directory_iterator(); ++i) {
-
-               /* Aah, the sweet smell of progress */
-#if BOOST_FILESYSTEM_VERSION == 3              
-               string const l = boost::filesystem::path(*i).leaf().generic_string();
-#else
-               string const l = i->leaf ();
-#endif
-               
-               size_t const d = l.find (".png");
-               size_t const t = l.find (".tmp");
-               if (d != string::npos && t == string::npos) {
-                       thumbs.push_back (atoi (l.substr (0, d).c_str()));
-               }
-       }
-
-       sort (thumbs.begin(), thumbs.end());
-       _film->set_thumbs (thumbs);     
-
        ascend ();
        set_progress (1);
        set_state (FINISHED_OK);