1 files changed, 26 insertions, 22 deletions

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 42add42aa..2c0028fd1 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,6 +17,10 @@
 
 */
 
+/** @file  src/lib/video_decoder.h
+ *  @brief VideoDecoder class.
+ */
+
 #ifndef DCPOMATIC_VIDEO_DECODER_H
 #define DCPOMATIC_VIDEO_DECODER_H
 
@@ -25,37 +29,37 @@
 #include "decoder.h"
 #include "video_content.h"
 #include "util.h"
+#include "content_video.h"
 
 class VideoContent;
 class ImageProxy;
 
+/** @class VideoDecoder
+ *  @brief Parent for classes which decode video.
+ */
 class VideoDecoder : public virtual Decoder
 {
 public:
-	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 the part of this image that should be used.
-	 *  Fourth 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 ImageProxy>, Eyes, Part, bool, VideoContent::Frame)> Video;
-	
+	VideoDecoder (boost::shared_ptr<const VideoContent> c);
+
+	std::list<ContentVideo> get_video (VideoFrame frame, bool accurate);
+
+	boost::shared_ptr<const VideoContent> video_content () const {
+		return _video_content;
+	}
+
+#ifdef DCPOMATIC_DEBUG
+	int test_gaps;
+#endif
+
 protected:
 
-	void video (boost::shared_ptr<const ImageProxy>, bool, VideoContent::Frame);
+	void seek (ContentTime time, bool accurate);
+	void video (boost::shared_ptr<const ImageProxy>, VideoFrame frame);
+	std::list<ContentVideo> decoded_video (VideoFrame frame);
+
 	boost::shared_ptr<const VideoContent> _video_content;
-	/** This is in frames without taking 3D into account (e.g. if we are doing 3D alternate,
-	 *  this would equal 2 on the left-eye second frame (not 1)).
-	 */
-	VideoContent::Frame _video_position;
+	std::list<ContentVideo> _decoded_video;
 };
 
 #endif