X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fexamine_content_job.cc;h=3cab9716de3783576d92cd9e441d50e6d1765df8;hb=57f229171a08567efeaed678381808173e4ef7a5;hp=40665e1e89eed2696b6c365d019f39d7f8fdd3f1;hpb=cbaed1119cdf3acb8662e5240f59706722437d94;p=dcpomatic.git

diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc
index 40665e1e8..3cab9716d 100644
--- a/src/lib/examine_content_job.cc
+++ b/src/lib/examine_content_job.cc
@@ -17,23 +17,20 @@
 
 */
 
-/** @file  src/examine_content_job.cc
- *  @brief A class to run through content at high speed to find its length.
- */
-
+#include <boost/filesystem.hpp>
 #include "examine_content_job.h"
-#include "options.h"
-#include "film_state.h"
-#include "decoder_factory.h"
-#include "decoder.h"
-#include "imagemagick_encoder.h"
-#include "transcoder.h"
+#include "log.h"
+#include "content.h"
+#include "film.h"
+
+#include "i18n.h"
 
-using namespace std;
-using namespace boost;
+using std::string;
+using boost::shared_ptr;
 
-ExamineContentJob::ExamineContentJob (shared_ptr<const FilmState> fs, Log* l, shared_ptr<Job> req)
-	: Job (fs, l, req)
+ExamineContentJob::ExamineContentJob (shared_ptr<const Film> f, shared_ptr<Content> c)
+	: Job (f)
+	, _content (c)
 {
 
 }
@@ -45,65 +42,13 @@ ExamineContentJob::~ExamineContentJob ()
 string
 ExamineContentJob::name () const
 {
-	if (_fs->name().empty ()) {
-		return "Examine content";
-	}
-	
-	return String::compose ("Examine content of %1", _fs->name());
+	return _("Examine content");
 }
 
 void
 ExamineContentJob::run ()
 {
-	shared_ptr<FilmState> fs = _fs->state_copy ();
-	
-	/* Decode the content to get an accurate length */
-	
-	shared_ptr<Options> o (new Options ("", "", ""));
-	o->out_size = Size (512, 512);
-	o->apply_crop = false;
-
-	descend (0.5);
-
-	_decoder = decoder_factory (fs, o, this, _log, true, true);
-	_decoder->go ();
-	fs->set_length (last_video_frame ());
-
-	ascend ();
-
-	/* Now make thumbnails for it */
-
-	descend (0.5);
-
-	try {
-		o.reset (new Options (fs->dir ("thumbs"), ".png", ""));
-		o->out_size = fs->size ();
-		o->apply_crop = false;
-		o->decode_audio = false;
-		o->decode_video_frequency = 128;
-		o->decode_subtitles = true;
-		shared_ptr<ImageMagickEncoder> e (new ImageMagickEncoder (fs, o, _log));
-		Transcoder w (fs, o, this, _log, e);
-		w.go ();
-		set_progress (1);
-		set_state (FINISHED_OK);
-		
-	} catch (std::exception& e) {
-
-		ascend ();
-		set_progress (1);
-		set_error (e.what ());
-		set_state (FINISHED_ERROR);
-		
-	}
-
-	ascend ();
+	_content->examine (shared_from_this ());
 	set_progress (1);
 	set_state (FINISHED_OK);
 }
-
-int
-ExamineContentJob::last_video_frame () const
-{
-	return _decoder->last_video_frame ();
-}