1 files changed, 17 insertions, 25 deletions

diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc
index 7a9acd9e4..8702c1a33 100644
--- a/src/lib/image_decoder.cc
+++ b/src/lib/image_decoder.cc
@@ -23,7 +23,7 @@
 #include "image_content.h"
 #include "image_decoder.h"
 #include "image.h"
-#include "image_proxy.h"
+#include "magick_image_proxy.h"
 #include "film.h"
 #include "exceptions.h"
 
@@ -31,43 +31,35 @@
 
 using std::cout;
 using boost::shared_ptr;
-using libdcp::Size;
+using dcp::Size;
 
-ImageDecoder::ImageDecoder (shared_ptr<const Film> f, shared_ptr<const ImageContent> c)
-	: Decoder (f)
-	, VideoDecoder (f, c)
+ImageDecoder::ImageDecoder (shared_ptr<const ImageContent> c)
+	: VideoDecoder (c)
 	, _image_content (c)
 {
 
 }
 
-void
+bool
 ImageDecoder::pass ()
 {
-	if (_video_position >= _image_content->video_length ()) {
-		return;
+	if (_video_position >= _image_content->video_length().frames (_image_content->video_frame_rate ())) {
+		return true;
 	}
 
-	if (_image && _image_content->still ()) {
-		video (_image, true, _video_position);
-		return;
+	if (!_image_content->still() || !_image) {
+		/* Either we need an image or we are using moving images, so load one */
+		_image.reset (new MagickImageProxy (_image_content->path (_image_content->still() ? 0 : _video_position), _image_content->film()->log ()));
 	}
-
-	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
-
-	_image.reset (new MagickImageProxy (_image_content->path (_image_content->still() ? 0 : _video_position), film->log ()));
-	video (_image, false, _video_position);
+		
+	video (_image, _video_position);
+	++_video_position;
+	return false;
 }
 
 void
-ImageDecoder::seek (VideoContent::Frame frame, bool)
-{
-	_video_position = frame;
-}
-
-bool
-ImageDecoder::done () const
+ImageDecoder::seek (ContentTime time, bool accurate)
 {
-	return _video_position >= _image_content->video_length ();
+	VideoDecoder::seek (time, accurate);
+	_video_position = time.frames (_image_content->video_frame_rate ());
 }