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 b085cb609e659f59b55f6a709c88b046c2a6a078..4c6a9c63008cd6b30f2898b27e8b9e8974dddd8a 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;
@@ -35,10 +36,10 @@ class Log;
 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>, boost::shared_ptr<Log>);
 
-       void set_subtitle (boost::shared_ptr<const Image>, Position<int>);
+       void set_subtitle (PositionImage);
        
        boost::shared_ptr<Image> image () const;
 
@@ -56,12 +57,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;
 };