1 files changed, 24 insertions, 45 deletions

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 6e4fd48c0..b47d7fc3a 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -17,67 +17,46 @@
 
 */
 
-#ifndef DVDOMATIC_VIDEO_DECODER_H
-#define DVDOMATIC_VIDEO_DECODER_H
+#ifndef DCPOMATIC_VIDEO_DECODER_H
+#define DCPOMATIC_VIDEO_DECODER_H
 
 #include "video_source.h"
-#include "stream.h"
 #include "decoder.h"
+#include "util.h"
 
-class VideoDecoder : public TimedVideoSource, public virtual Decoder
+class VideoContent;
+
+class VideoDecoder : public VideoSource, public virtual Decoder
 {
 public:
-	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 libdcp::Size native_size () const = 0;
-	/** @return length (in source video frames), according to our content's header */
-	virtual SourceFrame 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>);
+	VideoDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const VideoContent>);
 
-	void set_progress (Job *) const;
+	virtual void seek (Time);
+	virtual void seek_back ();
+	virtual void seek_forward ();
 	
-	int video_frame () const {
-		return _video_frame;
-	}
+	/* Calls for VideoContent to find out about itself */
 
-	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;
-	}
+	/** @return video frame rate second, or 0 if unknown */
+	virtual float video_frame_rate () const = 0;
+	/** @return video size in pixels */
+	virtual libdcp::Size video_size () const = 0;
+	/** @return length according to our content's header */
+	virtual ContentVideoFrame video_length () const = 0;
 
 protected:
 	
-	virtual PixelFormat pixel_format () const = 0;
+	void video (boost::shared_ptr<Image>, bool, Time);
+	void subtitle (boost::shared_ptr<TimedSubtitle>);
+	bool video_done () const;
 
-	void emit_video (boost::shared_ptr<Image>, bool, double);
-	void emit_subtitle (boost::shared_ptr<TimedSubtitle>);
-
-	/** 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;
+	Time _next_video;
+	boost::shared_ptr<const VideoContent> _video_content;
 
 private:
-	int _video_frame;
-	double _last_source_time;
-	
 	boost::shared_ptr<TimedSubtitle> _timed_subtitle;
+	FrameRateConversion _frame_rate_conversion;
+	bool _odd;
 };
 
 #endif