X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.h;h=142320a049c8e7a23bf7aff2d618149d6259941d;hb=11325f810e214935e4115248223c186a6e4cc184;hp=8de76c10f7a2653b2d79702b9a10301bfce5b221;hpb=f1bf21a9c2581591ab80bfc997a22b93046f8c56;p=dcpomatic.git

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 8de76c10f..142320a04 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -20,37 +20,38 @@
 #ifndef DCPOMATIC_VIDEO_DECODER_H
 #define DCPOMATIC_VIDEO_DECODER_H
 
-#include "video_source.h"
+#include <boost/signals2.hpp>
+#include <boost/shared_ptr.hpp>
 #include "decoder.h"
+#include "video_content.h"
 #include "util.h"
 
 class VideoContent;
+class Image;
 
-class VideoDecoder : public VideoSource, public virtual Decoder
+class VideoDecoder : public virtual Decoder
 {
 public:
 	VideoDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const VideoContent>);
 
-	virtual void seek (Time);
-	virtual void seek_back ();
-	virtual void seek_forward ();
+	/** 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;
 	
-	void set_video_container_size (libdcp::Size);
-
 protected:
-	
-	void video (boost::shared_ptr<Image>, bool, Time);
-	void subtitle (boost::shared_ptr<TimedSubtitle>);
-	bool video_done () const;
 
-	Time _next_video;
+	void video (boost::shared_ptr<const Image>, bool, VideoContent::Frame);
 	boost::shared_ptr<const VideoContent> _video_content;
-
-private:
-	boost::shared_ptr<TimedSubtitle> _timed_subtitle;
-	FrameRateConversion _frame_rate_conversion;
-	bool _odd;
-	boost::optional<libdcp::Size> _video_container_size;
+	VideoContent::Frame _video_position;
 };
 
 #endif