projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Nicer fix for 2D-labelled-3D checking from master.
[dcpomatic.git]
/
src
/
lib
/
decoder_part.h
diff --git
a/src/lib/decoder_part.h
b/src/lib/decoder_part.h
index 1d0473fa5c87eeb538768432f6675a6cbc87a73b..c8e13445a96c42761e3a3fb1f5f65b6c0de3738b 100644
(file)
--- a/
src/lib/decoder_part.h
+++ b/
src/lib/decoder_part.h
@@
-26,14
+26,16
@@
class Decoder;
class Log;
class Decoder;
class Log;
+class Film;
class DecoderPart
{
public:
class DecoderPart
{
public:
- DecoderPart (Decoder* parent
, boost::shared_ptr<Log> log
);
+ DecoderPart (Decoder* parent);
virtual ~DecoderPart () {}
virtual ~DecoderPart () {}
- virtual ContentTime position () const = 0;
+ virtual boost::optional<dcpomatic::ContentTime> position (boost::shared_ptr<const Film> film) const = 0;
+ virtual void seek () = 0;
void set_ignore (bool i) {
_ignore = i;
void set_ignore (bool i) {
_ignore = i;
@@
-45,7
+47,6
@@
public:
protected:
Decoder* _parent;
protected:
Decoder* _parent;
- boost::shared_ptr<Log> _log;
private:
bool _ignore;
private:
bool _ignore;