Copy DCP name layout fix from master.

[dcpomatic.git] / src / lib / image_decoder.h

diff --git a/src/lib/image_decoder.h b/src/lib/image_decoder.h
index 63b4c58e344f42ece958d7a58e75441d00da216c..ec90051daf8e43c45a565d69d9ad43f212636c52 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:
-       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;
        }
 
-       void seek (ContentTime, bool);
-
 private:
-       bool pass ();
+       bool pass (PassReason);
+       void seek (ContentTime, bool);
        
        boost::shared_ptr<const ImageContent> _image_content;
-       boost::shared_ptr<Image> _image;
+       boost::shared_ptr<ImageProxy> _image;
        VideoFrame _video_position;
 };