Write config.xml with CR/LF terminators on Windows.

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

diff --git a/src/lib/image_decoder.h b/src/lib/image_decoder.h
index 9b8cf73bbba6461a5da786d312338b35c25144de..9f1484e47a33c8fe83a9a1b004592f5dd7057ab8 100644 (file)
--- a/src/lib/image_decoder.h
+++ b/src/lib/image_decoder.h
@@ -27,17 +27,18 @@ class ImageProxy;
 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;
        }
 
-private:
-       bool pass (Decoder::PassReason, bool);
+       bool pass ();
        void seek (ContentTime, bool);
 
+private:
+
        boost::shared_ptr<const ImageContent> _image_content;
        boost::shared_ptr<ImageProxy> _image;
-       Frame _video_position;
+       Frame _frame_video_position;
 };