Merge writer-thread with original which was time-cleanup.

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

diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index de49c1b566b6ef0a36ae2bb44c0e05d77a65da6c..84a6f15f9aa8b63d762ada2deb5ac94ccd756646 100644 (file)
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -26,14 +26,14 @@ namespace Magick {
 class ImageMagickDecoder : public VideoDecoder
 {
 public:
-       ImageMagickDecoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *);
+       ImageMagickDecoder (boost::shared_ptr<Film>, DecodeOptions, Job *);
 
        float frames_per_second () const {
                /* We don't know */
                return 0;
        }
 
-       Size native_size () const;
+       libdcp::Size native_size () const;
 
        SourceFrame length () const {
                /* We don't know */
@@ -56,6 +56,9 @@ public:
                return false;
        }
 
+       bool seek (double);
+       bool seek_to_last ();
+
 protected:
        bool pass ();
        PixelFormat pixel_format () const;
@@ -79,6 +82,8 @@ protected:
        }
 
 private:
+       void film_changed (Film::Property);
+       
        std::list<std::string> _files;
        std::list<std::string>::iterator _iter;
 };