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

diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc
index 4b30c9431..2b8f118f8 100644
--- a/src/lib/examine_content_job.cc
+++ b/src/lib/examine_content_job.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,29 +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)
+ExamineContentJob::ExamineContentJob (shared_ptr<const Film> f, shared_ptr<Content> c)
 	: Job (f)
+	, _content (c)
 {
 
 }
@@ -51,60 +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 ()
 {
-	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 */
-		
-		/* We don't want to use any existing length here, as progress
-		   will be messed up.
-		*/
-		_film->unset_length ();
-		_film->set_crop (Crop ());
-		
-		DecodeOptions o;
-		o.decode_audio = false;
-		
-		Decoders decoders = decoder_factory (_film, o);
-		
-		set_progress_unknown ();
-		while (!decoders.video->pass()) {
-			/* keep going */
-		}
-		
-		_film->set_length (decoders.video->video_frame());
-		
-		_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 */
-		
-		Decoders d = decoder_factory (_film, DecodeOptions());
-		_film->set_length (d.video->length());
-	
-		_film->log()->log (String::compose (N_("Video length obtained from header as %1 frames"), _film->length().get()));
-	}
-
-	ascend ();
+	_content->examine (shared_from_this ());
 	set_progress (1);
 	set_state (FINISHED_OK);
 }