X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fexamine_content_job.cc;h=baa11ac93218820152ab5f3230d110fa0a9446df;hb=6cac49dc50dae6b173135df101d532f20031ca70;hp=a304ebea09130bfa80894d2ce51e1ca2247d85ed;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc
index a304ebea0..baa11ac93 100644
--- a/src/lib/examine_content_job.cc
+++ b/src/lib/examine_content_job.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,18 +18,21 @@
 
 */
 
-#include <boost/filesystem.hpp>
-#include "examine_content_job.h"
-#include "log.h"
+
 #include "content.h"
+#include "examine_content_job.h"
 #include "film.h"
+#include "log.h"
+#include <boost/filesystem.hpp>
 #include <iostream>
 
 #include "i18n.h"
 
+
 using std::string;
 using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
+
 
 ExamineContentJob::ExamineContentJob (shared_ptr<const Film> film, shared_ptr<Content> c)
 	: Job (film)
@@ -38,26 +41,31 @@ ExamineContentJob::ExamineContentJob (shared_ptr<const Film> film, shared_ptr<Co
 
 }
 
+
 ExamineContentJob::~ExamineContentJob ()
 {
+	stop_thread ();
 }
 
+
 string
 ExamineContentJob::name () const
 {
-	return _("Examine content");
+	return _("Examining content");
 }
 
+
 string
 ExamineContentJob::json_name () const
 {
 	return N_("examine_content");
 }
 
+
 void
 ExamineContentJob::run ()
 {
-	_content->examine (shared_from_this ());
+	_content->examine (_film, shared_from_this());
 	set_progress (1);
 	set_state (FINISHED_OK);
 }