Split examiner parts off decoder.

1 files changed, 3 insertions, 15 deletions

diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index 73858b58a..e169f9bc3 100644
--- 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,7 +26,7 @@ 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>);
@@ -39,20 +40,7 @@ public:
 	Time position () const;
 	bool done () const;
 
-	/* VideoDecoder */
-
-	float video_frame_rate () const;
-	libdcp::Size video_size () const;
-	ContentVideoFrame video_length () const;
-
-	/* ImageMagickDecoder */
-
-	boost::shared_ptr<const ImageMagickContent> content () const {
-		return _imagemagick_content;
-	}
-
 private:
-	boost::shared_ptr<const ImageMagickContent> _imagemagick_content;
 	boost::shared_ptr<Image> _image;
 	mutable boost::optional<libdcp::Size> _video_size;
 };