X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fexamine_content_job.cc;h=baa11ac93218820152ab5f3230d110fa0a9446df;hp=7e0f7692bea02279e8d9a6fecdf6210a60dc718d;hb=da44da6f31f97d39ca91c35955e573e76371f2c2;hpb=70c1332e9476d887dd875c386961c8a33d2496fd

diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc
index 7e0f7692b..baa11ac93 100644
--- a/src/lib/examine_content_job.cc
+++ b/src/lib/examine_content_job.cc
@@ -1,90 +1,71 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 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 "content.h"
 #include "examine_content_job.h"
-#include "options.h"
-#include "decoder_factory.h"
-#include "decoder.h"
-#include "transcoder.h"
-#include "log.h"
 #include "film.h"
-#include "video_decoder.h"
+#include "log.h"
+#include <boost/filesystem.hpp>
+#include <iostream>
+
+#include "i18n.h"
+
 
 using std::string;
-using std::vector;
-using std::pair;
-using boost::shared_ptr;
+using std::cout;
+using std::shared_ptr;
+
 
-ExamineContentJob::ExamineContentJob (shared_ptr<Film> f, shared_ptr<Job> req)
-	: Job (f, 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 (_film->name().empty ()) {
-		return "Examine content";
-	}
-	
-	return String::compose ("Examine content of %1", _film->name());
+	return _("Examining 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 ();
-	
-	shared_ptr<Options> o (new Options ("", "", ""));
-	o->out_size = Size (512, 512);
-	o->apply_crop = false;
-	o->decode_audio = false;
-
-	descend (1);
 
-	pair<shared_ptr<VideoDecoder>, shared_ptr<AudioDecoder> > decoders = decoder_factory (_film, o, this);
-
-	set_progress_unknown ();
-	while (!decoders.first->pass()) {
-		/* keep going */
-	}
-
-	_film->set_length (decoders.first->video_frame());
+string
+ExamineContentJob::json_name () const
+{
+	return N_("examine_content");
+}
 
-	_film->log()->log (String::compose ("Video length is %1 frames", _film->length()));
 
-	ascend ();
+void
+ExamineContentJob::run ()
+{
+	_content->examine (_film, shared_from_this());
 	set_progress (1);
 	set_state (FINISHED_OK);
 }