projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
const correctness.
[dcpomatic.git]
/
src
/
lib
/
examine_content_job.cc
diff --git
a/src/lib/examine_content_job.cc
b/src/lib/examine_content_job.cc
index cbf180ffcb3bf451379e410039d5d28dfed75d80..3be38863d46e4204bf364da3989ee4b1d7e0fe19 100644
(file)
--- 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.
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
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 "log.h"
#include "content.h"
#include "film.h"
+#include <iostream>
#include "i18n.h"
#include "i18n.h"
@@
-29,8
+31,8
@@
using std::string;
using std::cout;
using boost::shared_ptr;
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> f
ilm
, shared_ptr<Content> c)
+ : Job (f
ilm
)
, _content (c)
{
, _content (c)
{
@@
-38,18
+40,25
@@
ExamineContentJob::ExamineContentJob (shared_ptr<const Film> f, shared_ptr<Conte
ExamineContentJob::~ExamineContentJob ()
{
ExamineContentJob::~ExamineContentJob ()
{
+ stop_thread ();
}
string
ExamineContentJob::name () const
{
}
string
ExamineContentJob::name () const
{
- return _("Examine content");
+ return _("Examining content");
+}
+
+string
+ExamineContentJob::json_name () const
+{
+ return N_("examine_content");
}
void
ExamineContentJob::run ()
{
}
void
ExamineContentJob::run ()
{
- _content->examine (
shared_from_this
());
+ _content->examine (
_film, shared_from_this
());
set_progress (1);
set_state (FINISHED_OK);
}
set_progress (1);
set_state (FINISHED_OK);
}