X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.h;h=0b05b2f7143690237754d810d8557d8e80cb9d77;hb=47f25009bcbc765e397bcb471dd361a511c99daf;hp=c04874342c07846f81d69ad9f02797165b3977b3;hpb=5859b758e3a6e0191ce12e77b636c7def58bbc3b;p=dcpomatic.git

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index c04874342..0b05b2f71 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -17,15 +17,15 @@
 
 */
 
-#ifndef DVDOMATIC_VIDEO_DECODER_H
-#define DVDOMATIC_VIDEO_DECODER_H
+#ifndef DCPOMATIC_VIDEO_DECODER_H
+#define DCPOMATIC_VIDEO_DECODER_H
 
 #include "video_source.h"
 #include "decoder.h"
 
 class VideoContent;
 
-class VideoDecoder : public VideoSource, public virtual Decoder
+class VideoDecoder : public TimedVideoSource, public virtual Decoder
 {
 public:
 	VideoDecoder (boost::shared_ptr<const Film>);
@@ -48,29 +48,22 @@ public:
 		return _video_frame;
 	}
 
-	double last_source_time () const {
-		return _last_source_time;
+	double last_content_time () const {
+		return _last_content_time;
 	}
 
 protected:
 	
 	virtual PixelFormat pixel_format () const = 0;
 
-	void emit_video (boost::shared_ptr<Image>, double);
+	void emit_video (boost::shared_ptr<Image>, bool, double);
 	void emit_subtitle (boost::shared_ptr<TimedSubtitle>);
-	bool have_last_video () const;
-	void repeat_last_video (double);
 
 private:
-	void signal_video (boost::shared_ptr<Image>, bool, boost::shared_ptr<Subtitle>, double);
-
 	int _video_frame;
-	double _last_source_time;
+	double _last_content_time;
 	
 	boost::shared_ptr<TimedSubtitle> _timed_subtitle;
-
-	boost::shared_ptr<Image> _last_image;
-	boost::shared_ptr<Subtitle> _last_subtitle;
 };
 
 #endif