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 e60e7dfd09dce7fc16d31a126ddca4a83698a37e..c94b5a20a5ccdfe9ef720c276428b5b43880e522 100644 (file)
--- a/src/lib/video_source.h
+++ b/src/lib/video_source.h
@@ -21,8 +21,8 @@
  *  @brief Parent class for classes which emit video data.
  */
 
-#ifndef DVDOMATIC_VIDEO_SOURCE_H
-#define DVDOMATIC_VIDEO_SOURCE_H
+#ifndef DCPOMATIC_VIDEO_SOURCE_H
+#define DCPOMATIC_VIDEO_SOURCE_H
 
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
@@ -43,8 +43,9 @@ 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<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>);
 };