X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fexamine_content_job.cc;h=cbf180ffcb3bf451379e410039d5d28dfed75d80;hb=1ba7bca7f2950faa441ec83920d35b65016f3fa6;hp=eaf1033d9830d262192c08d12517b846d3a8e0fb;hpb=0813034d7193dc8869126d13a9d12d2c4d1e6c14;p=dcpomatic.git

diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc
index eaf1033d9..cbf180ffc 100644
--- a/src/lib/examine_content_job.cc
+++ b/src/lib/examine_content_job.cc
@@ -17,27 +17,21 @@
 
 */
 
-/** @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 "decoder_factory.h"
-#include "decoder.h"
-#include "transcoder.h"
 #include "log.h"
+#include "content.h"
 #include "film.h"
-#include "video_decoder.h"
+
+#include "i18n.h"
 
 using std::string;
-using std::vector;
-using std::pair;
+using std::cout;
 using boost::shared_ptr;
 
-ExamineContentJob::ExamineContentJob (shared_ptr<Film> f, shared_ptr<Job> req)
-	: Job (f, req)
+ExamineContentJob::ExamineContentJob (shared_ptr<const Film> f, shared_ptr<Content> c)
+	: Job (f)
+	, _content (c)
 {
 
 }
@@ -49,42 +43,13 @@ ExamineContentJob::~ExamineContentJob ()
 string
 ExamineContentJob::name () const
 {
-	if (_film->name().empty ()) {
-		return "Examine content";
-	}
-	
-	return String::compose ("Examine content of %1", _film->name());
+	return _("Examine content");
 }
 
 void
 ExamineContentJob::run ()
 {
-	/* Decode the content to get an accurate length */
-
-	/* We don't want to use any existing length here, as progress
-	   will be messed up.
-	*/
-	_film->unset_length ();
-	_film->set_crop (Crop ());
-	
-	shared_ptr<Options> o (new Options ("", "", ""));
-	o->out_size = Size (512, 512);
-	o->decode_audio = false;
-
-	descend (1);
-
-	Decoders decoders = decoder_factory (_film, o, this);
-
-	set_progress_unknown ();
-	while (!decoders.video->pass()) {
-		/* keep going */
-	}
-
-	_film->set_length (decoders.video->video_frame());
-
-	_film->log()->log (String::compose ("Video length is %1 frames", _film->length()));
-
-	ascend ();
+	_content->examine (shared_from_this ());
 	set_progress (1);
 	set_state (FINISHED_OK);
 }