Merge 1.0 in.

1 files changed, 27 insertions, 59 deletions

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 7726d2057..142320a04 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -17,73 +17,41 @@
 
 */
 
-#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 <boost/signals2.hpp>
+#include <boost/shared_ptr.hpp>
 #include "decoder.h"
+#include "video_content.h"
+#include "util.h"
 
-class VideoDecoder : public VideoSource, public virtual Decoder
+class VideoContent;
+class Image;
+
+class VideoDecoder : public virtual Decoder
 {
 public:
-	VideoDecoder (boost::shared_ptr<Film>, boost::shared_ptr<const DecodeOptions>, Job *);
-
-	/** @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;
-	/** @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>);
-
-	void set_progress () const;
+	VideoDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const VideoContent>);
+
+	/** Seek so that the next pass() will yield (approximately) the requested frame.
+	 *  Pass accurate = true to try harder to get close to the request.
+	 */
+	virtual void seek (VideoContent::Frame frame, bool accurate) = 0;
+
+	/** Emitted when a video frame is ready.
+	 *  First parameter is the video image.
+	 *  Second parameter is the eye(s) which should see this image.
+	 *  Third parameter is true if the image is the same as the last one that was emitted for this Eyes value.
+	 *  Fourth parameter is the frame within our source.
+	 */
+	boost::signals2::signal<void (boost::shared_ptr<const Image>, Eyes, bool, VideoContent::Frame)> Video;
 	
-	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;
-	}
-
 protected:
-	
-	virtual PixelFormat pixel_format () const = 0;
-
-	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;
-
-private:
-	void signal_video (boost::shared_ptr<Image>, bool, boost::shared_ptr<Subtitle>);
-
-	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;
+	void video (boost::shared_ptr<const Image>, bool, VideoContent::Frame);
+	boost::shared_ptr<const VideoContent> _video_content;
+	VideoContent::Frame _video_position;
 };
 
 #endif