projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix duplicate frames when padding.
[dcpomatic.git]
/
src
/
lib
/
video_decoder.h
diff --git
a/src/lib/video_decoder.h
b/src/lib/video_decoder.h
index e16884568555a72b7c384ffa3a29376ed9681910..3fc30cf9dab3b9c897cb99844c645058a5e55eef 100644
(file)
--- a/
src/lib/video_decoder.h
+++ b/
src/lib/video_decoder.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-201
6
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
8
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-55,11
+55,15
@@
public:
return _position;
}
return _position;
}
+ void seek ();
+
void emit (boost::shared_ptr<const ImageProxy>, Frame frame);
void emit (boost::shared_ptr<const ImageProxy>, Frame frame);
+ /** @return true if the emitted data was accepted, false if not */
boost::signals2::signal<void (ContentVideo)> Data;
private:
boost::signals2::signal<void (ContentVideo)> Data;
private:
+ /** Time of last thing to be emitted */
boost::shared_ptr<const Content> _content;
boost::optional<Frame> _last_emitted;
ContentTime _position;
boost::shared_ptr<const Content> _content;
boost::optional<Frame> _last_emitted;
ContentTime _position;