projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Another attempt to fix back / same-frame seeks.
[dcpomatic.git]
/
src
/
lib
/
decoder.cc
diff --git
a/src/lib/decoder.cc
b/src/lib/decoder.cc
index 7d40850451554f959cdb88258c2b7105b6bf99b3..637e0ddb291101af81f28115327f195a3e128116 100644
(file)
--- a/
src/lib/decoder.cc
+++ b/
src/lib/decoder.cc
@@
-21,44
+21,18
@@
* @brief Parent class for decoders of content.
*/
* @brief Parent class for decoders of content.
*/
-#include <iostream>
-#include <stdint.h>
-#include <boost/lexical_cast.hpp>
#include "film.h"
#include "film.h"
-#include "format.h"
-#include "job.h"
-#include "options.h"
-#include "exceptions.h"
-#include "image.h"
-#include "util.h"
-#include "log.h"
#include "decoder.h"
#include "decoder.h"
-#include "delay_line.h"
-#include "subtitle.h"
-#include "filter_graph.h"
-using std::string;
-using std::stringstream;
-using std::min;
-using std::pair;
-using std::list;
+#include "i18n.h"
+
using boost::shared_ptr;
using boost::shared_ptr;
-using boost::optional;
/** @param f Film.
/** @param f Film.
- * @param o Options.
- * @param j Job that we are running within, or 0
+ * @param o Decode options.
*/
*/
-Decoder::Decoder (
boost::shared_ptr<Film> f, boost::shared_ptr<const DecodeOptions> o, Job* j
)
+Decoder::Decoder (
shared_ptr<const Film> f
)
: _film (f)
: _film (f)
- , _opt (o)
- , _job (j)
{
_film_connection = f->Changed.connect (bind (&Decoder::film_changed, this, _1));
}
{
_film_connection = f->Changed.connect (bind (&Decoder::film_changed, this, _1));
}
-
-bool
-Decoder::seek (SourceFrame f)
-{
- throw DecodeError ("decoder does not support seek");
-}