diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-05-10 14:37:57 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | 0758d834992f0adb8aa8d4d9908a64ce8708f05c (patch) | |
| tree | 9fc3f639376ce1389f046807e9b089d526494d14 /src/lib/video_decoder.h | |
| parent | 504c63b3d62038bc486ca8a09e77fbb403907edd (diff) | |
Rename some methods.
Diffstat (limited to 'src/lib/video_decoder.h')
| -rw-r--r-- | src/lib/video_decoder.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h index c14a877f2..712ea5060 100644 --- a/src/lib/video_decoder.h +++ b/src/lib/video_decoder.h @@ -44,11 +44,11 @@ class VideoDecoder public: VideoDecoder (Decoder* parent, boost::shared_ptr<const Content> c, boost::shared_ptr<Log> log); - std::list<ContentVideo> get_video (Frame frame, bool accurate); + std::list<ContentVideo> get (Frame frame, bool accurate); - void set_ignore_video (); - bool ignore_video () const { - return _ignore_video; + void set_ignore (); + bool ignore () const { + return _ignore; } #ifdef DCPOMATIC_DEBUG @@ -61,23 +61,23 @@ public: friend void ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int gaps, int video_length); void seek (ContentTime time, bool accurate); - void video (boost::shared_ptr<const ImageProxy>, Frame frame); + void give (boost::shared_ptr<const ImageProxy>, Frame frame); private: - std::list<ContentVideo> decoded_video (Frame frame); + std::list<ContentVideo> decoded (Frame frame); void fill_one_eye (Frame from, Frame to, Eyes); void fill_both_eyes (Frame from, Frame to, Eyes); Decoder* _parent; - boost::shared_ptr<const Content> _video_content; + boost::shared_ptr<const Content> _content; boost::shared_ptr<Log> _log; - std::list<ContentVideo> _decoded_video; + std::list<ContentVideo> _decoded; boost::shared_ptr<Image> _black_image; boost::optional<ContentTime> _last_seek_time; bool _last_seek_accurate; /** true if this decoder should ignore all video; i.e. never produce any */ - bool _ignore_video; + bool _ignore; /** if set, this is a frame for which we got no data because the Decoder said * it has no more to give. */ |