class PlayerImage
{
public:
- PlayerImage (boost::shared_ptr<const Image>, Crop, libdcp::Size, libdcp::Size, Scaler const *);
+ PlayerImage (boost::shared_ptr<const Image>, Crop, dcp::Size, dcp::Size, Scaler const *);
void set_subtitle (boost::shared_ptr<const Image>, Position<int>);
private:
boost::shared_ptr<const Image> _in;
Crop _crop;
- libdcp::Size _inter_size;
- libdcp::Size _out_size;
+ dcp::Size _inter_size;
+ dcp::Size _out_size;
Scaler const * _scaler;
boost::shared_ptr<const Image> _subtitle_image;
Position<int> _subtitle_position;
return _video_position;
}
- void set_video_container_size (libdcp::Size);
+ void set_video_container_size (dcp::Size);
void set_approximate_size ();
bool repeat_last_video ();
void emit_black ();
void emit_silence (AudioFrame);
void film_changed (Film::Property);
- void update_subtitle ();
+ void update_subtitle_from_image ();
+ void update_subtitle_from_text ();
void emit_video (boost::weak_ptr<Piece>, boost::shared_ptr<DecodedVideo>);
void emit_audio (boost::weak_ptr<Piece>, boost::shared_ptr<DecodedAudio>);
void step_video_position (boost::shared_ptr<DecodedVideo>);
AudioMerger<DCPTime, AudioFrame> _audio_merger;
- libdcp::Size _video_container_size;
+ dcp::Size _video_container_size;
boost::shared_ptr<PlayerImage> _black_frame;
struct {
boost::weak_ptr<Piece> piece;
- boost::shared_ptr<DecodedSubtitle> subtitle;
- } _in_subtitle;
+ boost::shared_ptr<DecodedImageSubtitle> subtitle;
+ } _image_subtitle;
+ struct {
+ boost::weak_ptr<Piece> piece;
+ boost::shared_ptr<DecodedTextSubtitle> subtitle;
+ } _text_subtitle;
+
struct {
Position<int> position;
boost::shared_ptr<Image> image;