diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-01 14:28:04 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-01 14:28:04 +0100 |
| commit | 15f23b356b757a9697bf1a9ec30c243ab8070404 (patch) | |
| tree | 5b86b032ea47f606bbadb0c32801e16064d341a9 /src/lib/player.h | |
| parent | 45e6a6df959188bfdb8dfc4906c35d1a3c234b0a (diff) | |
DCPVideoFrame -> DCPVideo and PlayerVideoFrame -> PlayerVideo.
Diffstat (limited to 'src/lib/player.h')
| -rw-r--r-- | src/lib/player.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/player.h b/src/lib/player.h index 6805dc8c7..04503c27a 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -42,7 +42,7 @@ class Piece; class Image; class Decoder; class Resampler; -class PlayerVideoFrame; +class PlayerVideo; class ImageProxy; class PlayerStatistics @@ -85,7 +85,7 @@ class Player : public boost::enable_shared_from_this<Player>, public boost::nonc public: Player (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist>); - std::list<boost::shared_ptr<PlayerVideoFrame> > get_video (DCPTime time, bool accurate); + std::list<boost::shared_ptr<PlayerVideo> > get_video (DCPTime time, bool accurate); boost::shared_ptr<AudioBuffers> get_audio (DCPTime time, DCPTime length, bool accurate); void set_video_container_size (dcp::Size); @@ -119,7 +119,7 @@ private: VideoFrame dcp_to_content_video (boost::shared_ptr<const Piece> piece, DCPTime t) const; AudioFrame dcp_to_content_audio (boost::shared_ptr<const Piece> piece, DCPTime t) const; ContentTime dcp_to_content_subtitle (boost::shared_ptr<const Piece> piece, DCPTime t) const; - boost::shared_ptr<PlayerVideoFrame> black_player_video_frame () const; + boost::shared_ptr<PlayerVideo> black_player_video_frame () const; /** @return Pieces of content type C that overlap a specified time range in the DCP */ template<class C> |