Merge master.

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

diff --git a/src/lib/image_decoder.h b/src/lib/image_decoder.h
index 346fffdf78d5a14d977ae9b3c41afd0c3b30762c..63b4c58e344f42ece958d7a58e75441d00da216c 100644 (file)
--- a/src/lib/image_decoder.h
+++ b/src/lib/image_decoder.h
@@ -34,14 +34,13 @@ public:
                return _image_content;
        }
 
-       /* Decoder */
-
-       void pass ();
-       void seek (DCPTime, bool);
-       bool done () const;
+       void seek (ContentTime, bool);
 
 private:
+       bool pass ();
+       
        boost::shared_ptr<const ImageContent> _image_content;
        boost::shared_ptr<Image> _image;
+       VideoFrame _video_position;
 };