Merge master.

1 files changed, 2 insertions, 21 deletions

diff --git a/src/lib/video_source.h b/src/lib/video_source.h
index 705b0023a..893629160 100644
--- a/src/lib/video_source.h
+++ b/src/lib/video_source.h
@@ -29,12 +29,11 @@
 #include "util.h"
 
 class VideoSink;
-class TimedVideoSink;
 class Subtitle;
 class Image;
 
-/** @class VideoSource
- *  @param A class that emits video data without timestamps.
+/** @class VideoSink
+ *  @param A class that emits video data.
  */
 class VideoSource
 {
@@ -50,22 +49,4 @@ public:
 	void connect_video (boost::shared_ptr<VideoSink>);
 };
 
-/** @class TimedVideoSource
- *  @param A class that emits video data with timestamps.
- */
-class TimedVideoSource
-{
-public:
-
-	/** Emitted when a video frame is ready.
-	 *  First parameter is the video image.
-	 *  Second parameter is true if the image is the same as the last one that was emitted.
-	 *  Third parameter is either 0 or a subtitle that should be on this frame.
-	 *  Fourth parameter is the source timestamp of this frame.
-	 */
-	boost::signals2::signal<void (boost::shared_ptr<Image>, bool, boost::shared_ptr<Subtitle>, double)> Video;
-
-	void connect_video (boost::shared_ptr<TimedVideoSink>);
-};
-
 #endif