From 422341d1cb6bc8cbb6be76eac239c40cb4061c79 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 6 Mar 2013 00:51:44 +0000
Subject: Revert "Split timed from untimed sinks / sources.  Should produce
 same output, in theory."

This reverts commit 18614dda0d53b713ace5ad1df57298d049dba87f.
---
 src/lib/video_decoder.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/lib/video_decoder.h')

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 5e9c60d08..283ab5d88 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -24,7 +24,7 @@
 #include "stream.h"
 #include "decoder.h"
 
-class VideoDecoder : public TimedVideoSource, public virtual Decoder
+class VideoDecoder : public VideoSource, public virtual Decoder
 {
 public:
 	VideoDecoder (boost::shared_ptr<Film>, DecodeOptions);
@@ -67,7 +67,7 @@ protected:
 
 	void emit_video (boost::shared_ptr<Image>, double);
 	void emit_subtitle (boost::shared_ptr<TimedSubtitle>);
-	void repeat_last_video (double t);
+	void repeat_last_video ();
 
 	/** Subtitle stream to use when decoding */
 	boost::shared_ptr<SubtitleStream> _subtitle_stream;
@@ -75,7 +75,7 @@ protected:
 	std::vector<boost::shared_ptr<SubtitleStream> > _subtitle_streams;
 
 private:
-	void signal_video (boost::shared_ptr<Image>, bool, boost::shared_ptr<Subtitle>, double);
+	void signal_video (boost::shared_ptr<Image>, bool, boost::shared_ptr<Subtitle>);
 
 	int _video_frame;
 	double _last_source_time;
-- 
cgit v1.2.3