projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FFmpegContent does not need audio_length().
[dcpomatic.git]
/
src
/
lib
/
image_decoder.h
diff --git
a/src/lib/image_decoder.h
b/src/lib/image_decoder.h
index f4d81dfb507a5ef545c0f573542904472d023956..0453f7e7e8c6b447947bc0f61cf8e51ba68fe1a6 100644
(file)
--- a/
src/lib/image_decoder.h
+++ b/
src/lib/image_decoder.h
@@
-28,19
+28,18
@@
class ImageContent;
class ImageDecoder : public VideoDecoder
{
public:
class ImageDecoder : public VideoDecoder
{
public:
- ImageDecoder (boost::shared_ptr<const
Film>, boost::shared_ptr<const ImageContent>
);
+ ImageDecoder (boost::shared_ptr<const
ImageContent> c
);
boost::shared_ptr<const ImageContent> content () {
return _image_content;
}
boost::shared_ptr<const ImageContent> content () {
return _image_content;
}
- void seek (ContentTime, bool);
-
private:
private:
- bool pass ();
+ bool pass (PassReason);
+ void seek (ContentTime, bool);
boost::shared_ptr<const ImageContent> _image_content;
boost::shared_ptr<const ImageContent> _image_content;
- boost::shared_ptr<Image> _image;
-
ContentTi
me _video_position;
+ boost::shared_ptr<Image
Proxy
> _image;
+
Fra
me _video_position;
};
};