projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove some old Centos 5 support.
[dcpomatic.git]
/
src
/
lib
/
image_decoder.h
diff --git
a/src/lib/image_decoder.h
b/src/lib/image_decoder.h
index 7978f34c84223006f53bf368d0f99b93a6142296..d575f9021f3e019add9753ac05c3e1b0c703222b 100644
(file)
--- a/
src/lib/image_decoder.h
+++ b/
src/lib/image_decoder.h
@@
-27,18
+27,18
@@
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 (
std::shared_ptr<const Film> film, std::shared_ptr<const ImageContent> c
);
-
boost
::shared_ptr<const ImageContent> content () {
+
std
::shared_ptr<const ImageContent> content () {
return _image_content;
}
return _image_content;
}
-
void
pass ();
- void seek (ContentTime, bool);
+
bool
pass ();
+ void seek (
dcpomatic::
ContentTime, bool);
private:
private:
-
boost
::shared_ptr<const ImageContent> _image_content;
-
boost
::shared_ptr<ImageProxy> _image;
+
std
::shared_ptr<const ImageContent> _image_content;
+
std
::shared_ptr<ImageProxy> _image;
Frame _frame_video_position;
};
Frame _frame_video_position;
};