Another try at sorting out the thorny question of timing.

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

diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index 12a40976b5b72e1ab148a3269e798ada81a79775..286f473378396f9bbd44f39f28f08c7eeefaf0dd 100644 (file)
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
 */
 
 #include "video_decoder.h"
+#include "imagemagick.h"
 
 namespace Magick {
        class Image;
@@ -25,45 +26,19 @@ namespace Magick {
 
 class ImageMagickContent;
 
-class ImageMagickDecoder : public VideoDecoder
+class ImageMagickDecoder : public VideoDecoder, public ImageMagick
 {
 public:
        ImageMagickDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const ImageMagickContent>);
 
-       float video_frame_rate () const {
-               return 24;
-       }
+       /* Decoder */
 
-       libdcp::Size native_size () const;
-       ContentVideoFrame video_length () const;
-
-       bool seek (double);
-       bool pass ();
-
-protected:
-       PixelFormat pixel_format () const;
-
-       int time_base_numerator () const {
-               return 0;
-       }
-
-       int time_base_denominator () const {
-               return 0;
-       }
-
-       int sample_aspect_ratio_numerator () const {
-               /* XXX */
-               return 1;
-       }
-
-       int sample_aspect_ratio_denominator () const {
-               /* XXX */
-               return 1;
-       }
+       void pass ();
+       void seek (VideoContent::Frame);
+       void seek_back ();
+       bool done () const;
 
 private:
-       boost::shared_ptr<const ImageMagickContent> _imagemagick_content;
        boost::shared_ptr<Image> _image;
-       ContentVideoFrame _position;
-       mutable boost::optional<libdcp::Size> _native_size;
+       mutable boost::optional<libdcp::Size> _video_size;
 };