X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=04503c27a0917c8aaa2e34e6a556fa764b4f3600;hp=6805dc8c7f08be630073fd640f5bcacb38277407;hb=15f23b356b757a9697bf1a9ec30c243ab8070404;hpb=45e6a6df959188bfdb8dfc4906c35d1a3c234b0a 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, public boost::nonc public: Player (boost::shared_ptr, boost::shared_ptr); - std::list > get_video (DCPTime time, bool accurate); + std::list > get_video (DCPTime time, bool accurate); boost::shared_ptr 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 piece, DCPTime t) const; AudioFrame dcp_to_content_audio (boost::shared_ptr piece, DCPTime t) const; ContentTime dcp_to_content_subtitle (boost::shared_ptr piece, DCPTime t) const; - boost::shared_ptr black_player_video_frame () const; + boost::shared_ptr black_player_video_frame () const; /** @return Pieces of content type C that overlap a specified time range in the DCP */ template