1 files changed, 10 insertions, 23 deletions

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 283ab5d88..c04874342 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -21,42 +21,33 @@
 #define DVDOMATIC_VIDEO_DECODER_H
 
 #include "video_source.h"
-#include "stream.h"
 #include "decoder.h"
 
+class VideoContent;
+
 class VideoDecoder : public VideoSource, public virtual Decoder
 {
 public:
-	VideoDecoder (boost::shared_ptr<Film>, DecodeOptions);
+	VideoDecoder (boost::shared_ptr<const Film>);
 
-	/** @return video frames per second, or 0 if unknown */
-	virtual float frames_per_second () const = 0;
+	/** @return video frame rate second, or 0 if unknown */
+	virtual float video_frame_rate () const = 0;
 	/** @return native size in pixels */
 	virtual libdcp::Size native_size () const = 0;
-	/** @return length (in source video frames), according to our content's header */
-	virtual SourceFrame length () const = 0;
+	/** @return length according to our content's header */
+	virtual ContentVideoFrame video_length () const = 0;
 
 	virtual int time_base_numerator () const = 0;
 	virtual int time_base_denominator () const = 0;
 	virtual int sample_aspect_ratio_numerator () const = 0;
 	virtual int sample_aspect_ratio_denominator () const = 0;
 
-	virtual void set_subtitle_stream (boost::shared_ptr<SubtitleStream>);
-
 	void set_progress (Job *) const;
 	
 	int video_frame () const {
 		return _video_frame;
 	}
 
-	boost::shared_ptr<SubtitleStream> subtitle_stream () const {
-		return _subtitle_stream;
-	}
-
-	std::vector<boost::shared_ptr<SubtitleStream> > subtitle_streams () const {
-		return _subtitle_streams;
-	}
-
 	double last_source_time () const {
 		return _last_source_time;
 	}
@@ -67,15 +58,11 @@ protected:
 
 	void emit_video (boost::shared_ptr<Image>, double);
 	void emit_subtitle (boost::shared_ptr<TimedSubtitle>);
-	void repeat_last_video ();
-
-	/** Subtitle stream to use when decoding */
-	boost::shared_ptr<SubtitleStream> _subtitle_stream;
-	/** Subtitle streams that this decoder's content has */
-	std::vector<boost::shared_ptr<SubtitleStream> > _subtitle_streams;
+	bool have_last_video () const;
+	void repeat_last_video (double);
 
 private:
-	void signal_video (boost::shared_ptr<Image>, bool, boost::shared_ptr<Subtitle>);
+	void signal_video (boost::shared_ptr<Image>, bool, boost::shared_ptr<Subtitle>, double);
 
 	int _video_frame;
 	double _last_source_time;