X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fexamine_content_job.cc;h=3be38863d46e4204bf364da3989ee4b1d7e0fe19;hp=d91fc2136e8e3545b32b57e201de8eb3e731712a;hb=463496994d770577ff1e1ea6e7b1e4addb4252b2;hpb=4cb33e432c7070f59c3ee3fbeb0b5c8755bba3bd

diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc
index d91fc2136..3be38863d 100644
--- a/src/lib/examine_content_job.cc
+++ b/src/lib/examine_content_job.cc
@@ -1,114 +1,64 @@
 /*
-    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
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-/** @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 <iostream>
+
+#include "i18n.h"
 
-using namespace std;
-using namespace boost;
+using std::string;
+using std::cout;
+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> film, shared_ptr<Content> c)
+	: Job (film)
+	, _content (c)
 {
 
 }
 
 ExamineContentJob::~ExamineContentJob ()
 {
+	stop_thread ();
 }
 
 string
 ExamineContentJob::name () const
 {
-	if (_fs->name().empty ()) {
-		return "Examine content";
-	}
-	
-	return String::compose ("Examine content of %1", _fs->name());
+	return _("Examining content");
+}
+
+string
+ExamineContentJob::json_name () const
+{
+	return N_("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 (_decoder->last_video_frame ());
-	fs->set_audio_delay (-_decoder->audio_to_discard ());
-
-	_log->log (String::compose ("Video length is %1 frames", _decoder->last_video_frame()));
-	_log->log (String::compose ("%1ms of audio to discard", _decoder->audio_to_discard()));
-
-	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 ();
-		
-	} catch (std::exception& e) {
-
-		ascend ();
-		set_progress (1);
-		set_error (e.what ());
-		set_state (FINISHED_ERROR);
-		return;
-		
-	}
-
-	ascend ();
+	_content->examine (_film, shared_from_this());
 	set_progress (1);
 	set_state (FINISHED_OK);
 }
-
-int
-ExamineContentJob::last_video_frame () const
-{
-	return _decoder->last_video_frame ();
-}