X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fexamine_content_job.cc;h=3cab9716de3783576d92cd9e441d50e6d1765df8;hb=50cb31af16240b248700dab1484d7f07656c66df;hp=d77ede2f91abf1d1c0d0d9348ed19247429a3272;hpb=5d48e36440d6b4ebf4c04a413bd340b214ba8c42;p=dcpomatic.git

diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc
index d77ede2f9..3cab9716d 100644
--- a/src/lib/examine_content_job.cc
+++ b/src/lib/examine_content_job.cc
@@ -17,21 +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 "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)
-	: Job (fs, shared_ptr<Options> (), l)
+ExamineContentJob::ExamineContentJob (shared_ptr<const Film> f, shared_ptr<Content> c)
+	: Job (f)
+	, _content (c)
 {
 
 }
@@ -43,25 +42,13 @@ ExamineContentJob::~ExamineContentJob ()
 string
 ExamineContentJob::name () const
 {
-	return String::compose ("Examine content of %1", _fs->name);
+	return _("Examine content");
 }
 
 void
 ExamineContentJob::run ()
 {
-	shared_ptr<Options> o (new Options ("", "", ""));
-	o->out_size = Size (512, 512);
-	o->apply_crop = false;
-
-	_decoder = decoder_factory (_fs, o, this, _log, true, true);
-	_decoder->go ();
-	
+	_content->examine (shared_from_this ());
 	set_progress (1);
 	set_state (FINISHED_OK);
 }
-
-int
-ExamineContentJob::last_video_frame () const
-{
-	return _decoder->last_video_frame ();
-}