diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-04-15 22:00:15 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-04-15 22:00:15 +0100 |
| commit | 6d21165ff96f354933ee32ce2ce31ee5ecc48598 (patch) | |
| tree | 6d4435a60e259964d398a604f3f0e03dc24ff9f9 /src/lib/video_decoder.h | |
| parent | 76abad0130469d45253286486eae7361e45671a4 (diff) | |
| parent | f166fa19db164653e8229133a18f2e53dd722333 (diff) | |
Merge branch 'fix-early-audio-take2' into staging
Diffstat (limited to 'src/lib/video_decoder.h')
| -rw-r--r-- | src/lib/video_decoder.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h index 283ab5d88..6e4fd48c0 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 VideoSource, public virtual Decoder +class VideoDecoder : public TimedVideoSource, public virtual Decoder { public: VideoDecoder (boost::shared_ptr<Film>, DecodeOptions); @@ -65,9 +65,8 @@ 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>); - void repeat_last_video (); /** Subtitle stream to use when decoding */ boost::shared_ptr<SubtitleStream> _subtitle_stream; @@ -75,15 +74,10 @@ protected: std::vector<boost::shared_ptr<SubtitleStream> > _subtitle_streams; private: - void signal_video (boost::shared_ptr<Image>, bool, boost::shared_ptr<Subtitle>); - int _video_frame; double _last_source_time; boost::shared_ptr<TimedSubtitle> _timed_subtitle; - - boost::shared_ptr<Image> _last_image; - boost::shared_ptr<Subtitle> _last_subtitle; }; #endif |