Merge master and multifarious hackery.

[dcpomatic.git] / src / lib / video_source.h

diff --git a/src/lib/video_source.h b/src/lib/video_source.h
index 9b4c9b4a2040db794a94b179da4e2c46dcdb7dc8..c94b5a20a5ccdfe9ef720c276428b5b43880e522 100644 (file)
--- 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
 {
@@ -44,29 +43,11 @@ public:
         *  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 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, boost::shared_ptr<Subtitle>, 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