X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fvideo_source.h;h=9242af444c381467307039889af142d0e7086efd;hb=0b97307b78b1d5e017e97ff90d5d05102cb70c1c;hp=9b4c9b4a2040db794a94b179da4e2c46dcdb7dc8;hpb=cd4a82d90677cec80e891ac190000cb70767446f;p=dcpomatic.git

diff --git a/src/lib/video_source.h b/src/lib/video_source.h
index 9b4c9b4a2..9242af444 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.
+ *  @param A class that emits video data.
  */
 class VideoSource
 {
@@ -43,30 +42,11 @@ 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.
+	 *  Third parameter is the time relative to the start of this source's content.
 	 */
-	boost::signals2::signal<void (boost::shared_ptr<const Image>, bool, boost::shared_ptr<Subtitle>)> Video;
+	boost::signals2::signal<void (boost::shared_ptr<const Image>, bool, Time)> Video;
 
 	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<const Image>, bool, boost::shared_ptr<Subtitle>, double)> Video;
-
-	void connect_video (boost::shared_ptr<VideoSink>);
-	void connect_video (boost::shared_ptr<TimedVideoSink>);
-};
-
 #endif