projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename TYPE_DEBUG_PLAYER to TYPE_DEBUG_VIDEO_VIEW.
[dcpomatic.git]
/
src
/
lib
/
image_decoder.h
diff --git
a/src/lib/image_decoder.h
b/src/lib/image_decoder.h
index 140032317f9fb331147c31ede4e4a998f73607e2..eeec779ba8849129d7b73d2c68d9622e4bcafc42 100644
(file)
--- a/
src/lib/image_decoder.h
+++ b/
src/lib/image_decoder.h
@@
-27,14
+27,14
@@
class ImageProxy;
class ImageDecoder : public Decoder
{
public:
class ImageDecoder : public Decoder
{
public:
- ImageDecoder (boost::shared_ptr<const
ImageContent> c, boost::shared_ptr<Log> log
);
+ ImageDecoder (boost::shared_ptr<const
Film> film, boost::shared_ptr<const ImageContent> c
);
boost::shared_ptr<const ImageContent> content () {
return _image_content;
}
bool pass ();
boost::shared_ptr<const ImageContent> content () {
return _image_content;
}
bool pass ();
- void seek (ContentTime, bool);
+ void seek (
dcpomatic::
ContentTime, bool);
private:
private: