projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
[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 36b4cbabc95f453e52656dc7a62c7071e42d449b..42aad981c897965fdd1145ca9831853f9a66c916 100644
(file)
--- a/
src/lib/examine_content_job.cc
+++ b/
src/lib/examine_content_job.cc
@@
-1,5
+1,5
@@
/*
/*
- 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
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-17,21
+17,22
@@
*/
*/
-/** @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)
{
}
{
}
@@
-43,25
+44,19
@@
ExamineContentJob::~ExamineContentJob ()
string
ExamineContentJob::name () const
{
string
ExamineContentJob::name () const
{
- return String::compose ("Examine content of %1", _fs->name);
+ return _("Examine content");
+}
+
+string
+ExamineContentJob::json_name () const
+{
+ 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 (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 ();
-}