diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-03-06 01:04:23 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-03-06 01:04:23 +0000 |
| commit | a0fedb33cab65a1be1c49319b7f14319897991f3 (patch) | |
| tree | fcc516c8958a813339601fbf6fe1097f2ea80ae5 /src/lib | |
| parent | 59de84a29b81ac32477a4b804ca8bb9ec2760e67 (diff) | |
Small simplification.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/video_decoder.cc | 15 | ||||
| -rw-r--r-- | src/lib/video_decoder.h | 2 |
2 files changed, 2 insertions, 15 deletions
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc index 7fff93c45..8461b1635 100644 --- a/src/lib/video_decoder.cc +++ b/src/lib/video_decoder.cc @@ -52,21 +52,10 @@ VideoDecoder::emit_video (shared_ptr<Image> image, double t) sub = _timed_subtitle->subtitle (); } - signal_video (image, false, sub, t); - _last_source_time = t; -} - -/** Emit our signal to say that some video data is ready. - * @param image Video frame. - * @param same true if `image' is the same as the last one we emitted. - * @param sub Subtitle for this frame, or 0. - */ -void -VideoDecoder::signal_video (shared_ptr<Image> image, bool same, shared_ptr<Subtitle> sub, double t) -{ - TIMING (N_("Decoder emits %1"), _video_frame); Video (image, same, sub, t); ++_video_frame; + + _last_source_time = t; } /** Set up the current subtitle. This will be put onto frames that diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h index 7d43c9e82..1a02272a5 100644 --- a/src/lib/video_decoder.h +++ b/src/lib/video_decoder.h @@ -74,8 +74,6 @@ protected: std::vector<boost::shared_ptr<SubtitleStream> > _subtitle_streams; private: - void signal_video (boost::shared_ptr<Image>, bool, boost::shared_ptr<Subtitle>, double); - int _video_frame; double _last_source_time; |
