projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reword again: Text -> Caption and Plain -> Text.
[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 aad7f265e8e9f1465fd58d7ed22b35cdb4cbccdc..a9df63be77daf5b7e7fcf07539a90beadfa8c4cb 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/>.
*/
*/
@@
-21,34
+22,38
@@
#include "examine_content_job.h"
#include "log.h"
#include "content.h"
#include "examine_content_job.h"
#include "log.h"
#include "content.h"
+#include "film.h"
+#include <iostream>
#include "i18n.h"
using std::string;
#include "i18n.h"
using std::string;
+using std::cout;
using boost::shared_ptr;
using boost::shared_ptr;
-ExamineContentJob::ExamineContentJob (shared_ptr<
Film> f, shared_ptr<Content> c, bool q
)
- : Job (f)
+ExamineContentJob::ExamineContentJob (shared_ptr<
const Film> film, shared_ptr<Content> c
)
+ : Job (f
ilm
)
, _content (c)
, _content (c)
- , _quick (q)
{
}
{
}
-ExamineContentJob::~ExamineContentJob ()
+string
+ExamineContentJob::name () const
{
{
+ return _("Examine content");
}
string
}
string
-ExamineContentJob::name () const
+ExamineContentJob::
json_
name () const
{
{
- return
_("Examine
content");
+ return
N_("examine_
content");
}
void
ExamineContentJob::run ()
{
}
void
ExamineContentJob::run ()
{
- _content->examine (
_film, shared_from_this (), _quick
);
+ _content->examine (
shared_from_this ()
);
set_progress (1);
set_state (FINISHED_OK);
}
set_progress (1);
set_state (FINISHED_OK);
}