X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.h;h=e16884568555a72b7c384ffa3a29376ed9681910;hb=a93d6e9872f0de79f5d612320837a1fc9d557f63;hp=156ee42221a0d645a1ac8998934afc6c98ccae78;hpb=936ff6927ad24daf0ed20776b19b6faa3df9bf83;p=dcpomatic.git

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 156ee4222..e16884568 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -46,44 +46,23 @@ class VideoDecoder : public DecoderPart
 public:
 	VideoDecoder (Decoder* parent, boost::shared_ptr<const Content> c, boost::shared_ptr<Log> log);
 
-	std::list<ContentVideo> get (Frame frame, bool accurate);
-
-#ifdef DCPOMATIC_DEBUG
-	int test_gaps;
-#endif
-
 	friend struct video_decoder_fill_test1;
 	friend struct video_decoder_fill_test2;
 	friend struct ffmpeg_pts_offset_test;
 	friend void ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int gaps, int video_length);
 
-	void seek (ContentTime time, bool accurate);
-	void give (boost::shared_ptr<const ImageProxy>, Frame frame);
-
-	boost::optional<ContentTime> position () const {
+	ContentTime position () const {
 		return _position;
 	}
 
-	void reset_position () {
-		_position.reset ();
-	}
-
-private:
+	void emit (boost::shared_ptr<const ImageProxy>, Frame frame);
 
-	std::list<ContentVideo> decoded (Frame frame);
-	void fill_one_eye (Frame from, Frame to, Eyes);
-	void fill_both_eyes (VideoFrame from, VideoFrame to);
+	boost::signals2::signal<void (ContentVideo)> Data;
 
+private:
 	boost::shared_ptr<const Content> _content;
-	std::list<ContentVideo> _decoded;
-	boost::shared_ptr<Image> _black_image;
-	boost::optional<ContentTime> _last_seek_time;
-	bool _last_seek_accurate;
-	/** if set, this is a frame for which we got no data because the Decoder said
-	 *  it has no more to give.
-	 */
-	boost::optional<Frame> _no_data_frame;
-	boost::optional<ContentTime> _position;
+	boost::optional<Frame> _last_emitted;
+	ContentTime _position;
 };
 
 #endif