diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-03-06 00:51:44 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-03-06 00:51:44 +0000 |
| commit | 422341d1cb6bc8cbb6be76eac239c40cb4061c79 (patch) | |
| tree | 1a4193e699024bd53f5ef2da5d9958aa74ffbd06 /src/lib/video_decoder.h | |
| parent | 18614dda0d53b713ace5ad1df57298d049dba87f (diff) | |
Revert "Split timed from untimed sinks / sources. Should produce same output, in theory."
This reverts commit 18614dda0d53b713ace5ad1df57298d049dba87f.
Diffstat (limited to 'src/lib/video_decoder.h')
| -rw-r--r-- | src/lib/video_decoder.h | 6 |
1 files changed, 3 insertions, 3 deletions
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; |