diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-11-15 20:27:44 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-11-15 20:27:44 +0000 |
| commit | 4e5a8ec686e3fda5c550cf535cb1e0037ea7ec71 (patch) | |
| tree | 843be44a12a0b47eb699ce29e6f32894343c7b93 /src | |
| parent | 374bf4bf68109c52868c30e1a180d4ff91cc99dd (diff) | |
Fix thinko in video signalling.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/decoder.cc | 8 | ||||
| -rw-r--r-- | src/lib/decoder.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc index 8e1e4e3c5..8d087b6ee 100644 --- a/src/lib/decoder.cc +++ b/src/lib/decoder.cc @@ -74,7 +74,7 @@ Decoder::go () } /** Called by subclasses to tell the world that some video data is ready. - * We do some post-processing / filtering then emit it for listeners. + * We find a subtitle then emit it for listeners. * @param frame to decode; caller manages memory. */ void @@ -85,7 +85,7 @@ Decoder::emit_video (shared_ptr<Image> image) sub = _timed_subtitle->subtitle (); } - Video (image, sub); + signal_video (image, sub); } void @@ -96,11 +96,11 @@ Decoder::repeat_last_video () _last_image->make_black (); } - emit_video (_last_image, _last_subtitle); + signal_video (_last_image, _last_subtitle); } void -Decoder::emit_video (shared_ptr<Image> image, shared_ptr<Subtitle> sub) +Decoder::signal_video (shared_ptr<Image> image, shared_ptr<Subtitle> sub) { TIMING ("Decoder emits %1", _video_frame); Video (image, sub); diff --git a/src/lib/decoder.h b/src/lib/decoder.h index 5bb5b574d..805f6e521 100644 --- a/src/lib/decoder.h +++ b/src/lib/decoder.h @@ -117,7 +117,7 @@ protected: std::vector<SubtitleStream> _subtitle_streams; private: - void emit_video (boost::shared_ptr<Image>, boost::shared_ptr<Subtitle>); + void signal_video (boost::shared_ptr<Image>, boost::shared_ptr<Subtitle>); SourceFrame _video_frame; |
