projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Take Film pointer out of Content.
[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 fd574e2d058281dba42c77115ce0b6afacee7634..81088a4416cd0e7a838adaf4578e6c1e14b55d3e 100644
(file)
--- a/
src/lib/examine_content_job.cc
+++ b/
src/lib/examine_content_job.cc
@@
-1,67
+1,59
@@
/*
/*
- 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/>.
*/
*/
-/** @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 "examine_content_job.h"
#include "examine_content_job.h"
-#include "options.h"
-#include "film_state.h"
-#include "decoder_factory.h"
-#include "decoder.h"
+#include "log.h"
+#include "content.h"
+#include "film.h"
+#include <iostream>
+
+#include "i18n.h"
-using namespace std;
-using namespace boost;
+using std::string;
+using std::cout;
+using boost::shared_ptr;
-ExamineContentJob::ExamineContentJob (shared_ptr<const FilmState> fs, Log* l, shared_ptr<Job> req)
- : Job (fs, shared_ptr<Options> (), l, req)
+ExamineContentJob::ExamineContentJob (shared_ptr<const Film> film, shared_ptr<Content> c)
+ : Job (film)
+ , _content (c)
{
}
{
}
-ExamineContentJob::~ExamineContentJob ()
+string
+ExamineContentJob::name () const
{
{
+ return _("Examine content");
}
string
}
string
-ExamineContentJob::name () const
+ExamineContentJob::
json_
name () const
{
{
- return
String::compose ("Examine content of %1", _fs->name()
);
+ return
N_("examine_content"
);
}
void
ExamineContentJob::run ()
{
}
void
ExamineContentJob::run ()
{
- shared_ptr<Options> o (new Options ("", "", ""));
- o->out_size = Size (512, 512);
- o->apply_crop = false;
-
- _decoder = decoder_factory (_fs, o, this, _log, true, true);
- _decoder->go ();
-
+ _content->examine (_film, shared_from_this());
set_progress (1);
set_state (FINISHED_OK);
}
set_progress (1);
set_state (FINISHED_OK);
}
-
-int
-ExamineContentJob::last_video_frame () const
-{
- return _decoder->last_video_frame ();
-}