diff options
Diffstat (limited to 'src/lib/player_video_frame.h')
| -rw-r--r-- | src/lib/player_video_frame.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/player_video_frame.h b/src/lib/player_video_frame.h index ea7e54481..6461134a9 100644 --- a/src/lib/player_video_frame.h +++ b/src/lib/player_video_frame.h @@ -23,6 +23,7 @@ #include "colour_conversion.h" class Image; +class ImageProxy; class Scaler; class Socket; @@ -33,14 +34,14 @@ class Socket; class PlayerVideoFrame { public: - PlayerVideoFrame (boost::shared_ptr<const Image>, Crop, libdcp::Size, libdcp::Size, Scaler const *, Eyes, ColourConversion); + PlayerVideoFrame (boost::shared_ptr<const ImageProxy>, Crop, libdcp::Size, libdcp::Size, Scaler const *, Eyes, Part, ColourConversion); PlayerVideoFrame (boost::shared_ptr<cxml::Node>, boost::shared_ptr<Socket>); void set_subtitle (boost::shared_ptr<const Image>, Position<int>); boost::shared_ptr<Image> image () const; - void add_metadata (xmlpp::Element* node) const; + void add_metadata (xmlpp::Node* node) const; void send_binary (boost::shared_ptr<Socket> socket) const; Eyes eyes () const { @@ -52,12 +53,13 @@ public: } private: - boost::shared_ptr<const Image> _in; + boost::shared_ptr<const ImageProxy> _in; Crop _crop; libdcp::Size _inter_size; libdcp::Size _out_size; Scaler const * _scaler; Eyes _eyes; + Part _part; ColourConversion _colour_conversion; boost::shared_ptr<const Image> _subtitle_image; Position<int> _subtitle_position; |