diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-04-21 22:41:52 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-04-21 22:41:52 +0100 |
| commit | 47f25009bcbc765e397bcb471dd361a511c99daf (patch) | |
| tree | 356ac924524183047a84e34674985b3a00c5ca24 /src/lib/video_decoder.h | |
| parent | afc495f722f89fea0bcc579046d1a5d362e36f69 (diff) | |
| parent | e8d8a27c7f6861b031b3250b0ad50d04c41a7721 (diff) | |
Untested merge of master.
Diffstat (limited to 'src/lib/video_decoder.h')
| -rw-r--r-- | src/lib/video_decoder.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h index 23817c055..0b05b2f71 100644 --- a/src/lib/video_decoder.h +++ b/src/lib/video_decoder.h @@ -25,7 +25,7 @@ class VideoContent; -class VideoDecoder : public VideoSource, public virtual Decoder +class VideoDecoder : public TimedVideoSource, public virtual Decoder { public: VideoDecoder (boost::shared_ptr<const Film>); @@ -56,21 +56,14 @@ 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_content_time; boost::shared_ptr<TimedSubtitle> _timed_subtitle; - - boost::shared_ptr<Image> _last_image; - boost::shared_ptr<Subtitle> _last_subtitle; }; #endif |