X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_decoder.cc;h=15187b11b6aa27ef084e24ea759c27163603194f;hb=bf0fb7f4f556946c18da151e468f237d9ca96094;hp=e06f6023d54a8d35b1203f81eef72e823ab9ed0d;hpb=72b11d5eb036651b6ff68edf3ed270e8fc52960f;p=dcpomatic.git

diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc
index e06f6023d..15187b11b 100644
--- a/src/lib/image_decoder.cc
+++ b/src/lib/image_decoder.cc
@@ -27,6 +27,7 @@
 #include "film.h"
 #include "exceptions.h"
 #include "video_content.h"
+#include "frame_interval_checker.h"
 #include <boost/filesystem.hpp>
 #include <iostream>
 
@@ -35,12 +36,14 @@
 using std::cout;
 using boost::shared_ptr;
 using dcp::Size;
+using namespace dcpomatic;
 
-ImageDecoder::ImageDecoder (shared_ptr<const ImageContent> c, shared_ptr<Log> log)
-	: _image_content (c)
+ImageDecoder::ImageDecoder (shared_ptr<const Film> film, shared_ptr<const ImageContent> c)
+	: Decoder (film)
+	, _image_content (c)
 	, _frame_video_position (0)
 {
-	video.reset (new VideoDecoder (this, c, log));
+	video.reset (new VideoDecoder (this, c));
 }
 
 bool
@@ -71,7 +74,7 @@ ImageDecoder::pass ()
 		}
 	}
 
-	video->emit (_image, _frame_video_position);
+	video->emit (film(), _image, _frame_video_position);
 	++_frame_video_position;
 	return false;
 }
@@ -80,5 +83,5 @@ void
 ImageDecoder::seek (ContentTime time, bool accurate)
 {
 	Decoder::seek (time, accurate);
-	_frame_video_position = time.frames_round (_image_content->active_video_frame_rate ());
+	_frame_video_position = time.frames_round (_image_content->active_video_frame_rate(film()));
 }