X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fexamine_content_job.cc;h=3be38863d46e4204bf364da3989ee4b1d7e0fe19;hb=fa5f3a8bf77209da27acc33cf144e2e4500a2600;hp=8f16e2e5c0c069e2ab601c4bf91cec39c1e3cebc;hpb=85c65bd422742813992686c17a5e1b718cc3c449;p=dcpomatic.git

diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc
index 8f16e2e5c..3be38863d 100644
--- a/src/lib/examine_content_job.cc
+++ b/src/lib/examine_content_job.cc
@@ -1,19 +1,20 @@
 /*
-    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/>.
 
 */
 
@@ -22,6 +23,7 @@
 #include "log.h"
 #include "content.h"
 #include "film.h"
+#include <iostream>
 
 #include "i18n.h"
 
@@ -29,8 +31,8 @@ using std::string;
 using std::cout;
 using boost::shared_ptr;
 
-ExamineContentJob::ExamineContentJob (shared_ptr<const Film> f, shared_ptr<Content> c)
-	: Job (f)
+ExamineContentJob::ExamineContentJob (shared_ptr<const Film> film, shared_ptr<Content> c)
+	: Job (film)
 	, _content (c)
 {
 
@@ -38,12 +40,13 @@ ExamineContentJob::ExamineContentJob (shared_ptr<const Film> f, shared_ptr<Conte
 
 ExamineContentJob::~ExamineContentJob ()
 {
+	stop_thread ();
 }
 
 string
 ExamineContentJob::name () const
 {
-	return _("Examine content");
+	return _("Examining content");
 }
 
 string
@@ -55,7 +58,7 @@ ExamineContentJob::json_name () const
 void
 ExamineContentJob::run ()
 {
-	_content->examine (shared_from_this ());
+	_content->examine (_film, shared_from_this());
 	set_progress (1);
 	set_state (FINISHED_OK);
 }