Untested merge of master.

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

diff --git a/src/lib/video_sink.h b/src/lib/video_sink.h
index 78500c643a46cb4e8c181775bbb60a848b96e382..167d3980eb020531457f8240ddc99803483f3343 100644 (file)
--- a/src/lib/video_sink.h
+++ b/src/lib/video_sink.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_VIDEO_SINK_H
-#define DVDOMATIC_VIDEO_SINK_H
+#ifndef DCPOMATIC_VIDEO_SINK_H
+#define DCPOMATIC_VIDEO_SINK_H
 
 #include <boost/shared_ptr.hpp>
 #include "util.h"
@@ -31,9 +31,22 @@ class VideoSink
 public:
        /** Call with a frame of video.
         *  @param i Video frame image.
+        *  @param same true if i is the same as last time we were called.
         *  @param s A subtitle that should be on this frame, or 0.
         */
-       virtual void process_video (boost::shared_ptr<Image> i, boost::shared_ptr<Subtitle> s) = 0;
+       virtual void process_video (boost::shared_ptr<Image> i, bool same, boost::shared_ptr<Subtitle> s) = 0;
+};
+
+class TimedVideoSink
+{
+public:
+       /** Call with a frame of video.
+        *  @param i Video frame image.
+        *  @param same true if i is the same as last time we were called.
+        *  @param s A subtitle that should be on this frame, or 0.
+        *  @param t Source timestamp.
+        */
+       virtual void process_video (boost::shared_ptr<Image> i, bool same, boost::shared_ptr<Subtitle> s, double t) = 0;
 };
 
 #endif