Merge master.

[dcpomatic.git] / src / lib / player_video_frame.h

diff --git a/src/lib/player_video_frame.h b/src/lib/player_video_frame.h
index 6461134a9c60649cb106292c1633d4fd36ec3c1d..225b0a4bafe43c8dee4be008b8e5bdb5b519fb1b 100644 (file)
--- a/src/lib/player_video_frame.h
+++ b/src/lib/player_video_frame.h
@@ -21,6 +21,7 @@
 #include "types.h"
 #include "position.h"
 #include "colour_conversion.h"
+#include "position_image.h"
 
 class Image;
 class ImageProxy;
@@ -34,10 +35,10 @@ class Socket;
 class PlayerVideoFrame
 {
 public:
-       PlayerVideoFrame (boost::shared_ptr<const ImageProxy>, Crop, libdcp::Size, libdcp::Size, Scaler const *, Eyes, Part, ColourConversion);
+       PlayerVideoFrame (boost::shared_ptr<const ImageProxy>, Crop, dcp::Size, dcp::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>);
+       void set_subtitle (PositionImage);
        
        boost::shared_ptr<Image> image () const;
 
@@ -55,12 +56,11 @@ public:
 private:
        boost::shared_ptr<const ImageProxy> _in;
        Crop _crop;
-       libdcp::Size _inter_size;
-       libdcp::Size _out_size;
+       dcp::Size _inter_size;
+       dcp::Size _out_size;
        Scaler const * _scaler;
        Eyes _eyes;
        Part _part;
        ColourConversion _colour_conversion;
-       boost::shared_ptr<const Image> _subtitle_image;
-       Position<int> _subtitle_position;
+       PositionImage _subtitle;
 };