From 596441a4e8cf03a88113646ca6da2f90e721a38b Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 22 May 2013 17:36:11 +0100
Subject: Various hacks.

---
 src/lib/imagemagick_decoder.h | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

(limited to 'src/lib/imagemagick_decoder.h')

diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index cb68655ce..ba54c0efa 100644
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -30,6 +30,10 @@ class ImageMagickDecoder : public VideoDecoder
 public:
 	ImageMagickDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const ImageMagickContent>);
 
+	bool pass ();
+	bool seek (double);
+	Time next () const;
+
 	float video_frame_rate () const {
 		return 24;
 	}
@@ -37,9 +41,6 @@ public:
 	libdcp::Size native_size () const;
 	ContentVideoFrame video_length () const;
 
-	bool seek (double);
-	bool pass ();
-
 	boost::shared_ptr<const ImageMagickContent> content () const {
 		return _imagemagick_content;
 	}
@@ -47,24 +48,6 @@ public:
 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;
-	}
-
 private:
 	boost::shared_ptr<const ImageMagickContent> _imagemagick_content;
 	boost::shared_ptr<Image> _image;
-- 
cgit v1.2.3