diff options
Diffstat (limited to 'src/lib/player.h')
| -rw-r--r-- | src/lib/player.h | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/src/lib/player.h b/src/lib/player.h index 4d911a83b..8f7d9a218 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -39,28 +39,7 @@ class AudioContent; class Piece; class Image; class Resampler; - -/** A wrapper for an Image which contains some pending operations; these may - * not be necessary if the receiver of the PlayerImage throws it away. - */ -class PlayerImage -{ -public: - PlayerImage (boost::shared_ptr<const Image>, Crop, libdcp::Size, libdcp::Size, Scaler const *); - - void set_subtitle (boost::shared_ptr<const Image>, Position<int>); - - boost::shared_ptr<Image> image (); - -private: - boost::shared_ptr<const Image> _in; - Crop _crop; - libdcp::Size _inter_size; - libdcp::Size _out_size; - Scaler const * _scaler; - boost::shared_ptr<const Image> _subtitle_image; - Position<int> _subtitle_position; -}; +class PlayerVideoFrame; /** @class Player * @brief A class which can `play' a Playlist; emitting its audio and video. @@ -91,7 +70,7 @@ public: * Fourth parameter is true if the image is the same as the last one that was emitted. * Fifth parameter is the time. */ - boost::signals2::signal<void (boost::shared_ptr<PlayerImage>, Eyes, ColourConversion, bool, Time)> Video; + boost::signals2::signal<void (boost::shared_ptr<PlayerVideoFrame>, Eyes, ColourConversion, bool, Time)> Video; /** Emitted when some audio data is ready */ boost::signals2::signal<void (boost::shared_ptr<const AudioBuffers>, Time)> Audio; @@ -140,7 +119,7 @@ private: AudioMerger<Time, AudioContent::Frame> _audio_merger; libdcp::Size _video_container_size; - boost::shared_ptr<PlayerImage> _black_frame; + boost::shared_ptr<PlayerVideoFrame> _black_frame; std::map<boost::shared_ptr<AudioContent>, boost::shared_ptr<Resampler> > _resamplers; std::list<Subtitle> _subtitles; |