X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.h;h=6e4fd48c0019710a2632e921d35645efa119c239;hb=af671aa256ae0d2fa38a6740cea7fc0f6b45b5b8;hp=685138a58c761d05307a71adb5b5dfdb74fc9889;hpb=e9d0d7bf9871b7e7fa8d154535cf0bbc7e7bd466;p=dcpomatic.git

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 685138a58..6e4fd48c0 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -24,15 +24,15 @@
 #include "stream.h"
 #include "decoder.h"
 
-class VideoDecoder : public VideoSource, public virtual Decoder
+class VideoDecoder : public TimedVideoSource, public virtual Decoder
 {
 public:
-	VideoDecoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *);
+	VideoDecoder (boost::shared_ptr<Film>, DecodeOptions);
 
 	/** @return video frames per second, or 0 if unknown */
 	virtual float frames_per_second () const = 0;
 	/** @return native size in pixels */
-	virtual Size native_size () const = 0;
+	virtual libdcp::Size native_size () const = 0;
 	/** @return length (in source video frames), according to our content's header */
 	virtual SourceFrame length () const = 0;
 
@@ -43,9 +43,9 @@ public:
 
 	virtual void set_subtitle_stream (boost::shared_ptr<SubtitleStream>);
 
-	void set_progress () const;
+	void set_progress (Job *) const;
 	
-	SourceFrame video_frame () const {
+	int video_frame () const {
 		return _video_frame;
 	}
 
@@ -57,13 +57,16 @@ public:
 		return _subtitle_streams;
 	}
 
+	double last_source_time () const {
+		return _last_source_time;
+	}
+
 protected:
 	
 	virtual PixelFormat pixel_format () const = 0;
 
-	void emit_video (boost::shared_ptr<Image>);
+	void emit_video (boost::shared_ptr<Image>, bool, double);
 	void emit_subtitle (boost::shared_ptr<TimedSubtitle>);
-	void repeat_last_video ();
 
 	/** Subtitle stream to use when decoding */
 	boost::shared_ptr<SubtitleStream> _subtitle_stream;
@@ -71,14 +74,10 @@ protected:
 	std::vector<boost::shared_ptr<SubtitleStream> > _subtitle_streams;
 
 private:
-	void signal_video (boost::shared_ptr<Image>, boost::shared_ptr<Subtitle>);
-
-	SourceFrame _video_frame;
-
+	int _video_frame;
+	double _last_source_time;
+	
 	boost::shared_ptr<TimedSubtitle> _timed_subtitle;
-
-	boost::shared_ptr<Image> _last_image;
-	boost::shared_ptr<Subtitle> _last_subtitle;
 };
 
 #endif