X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer_video.h;h=d24620c7e793b7ebbc8b345cdcedc34dd66151bb;hb=3799e91d126d243d41c44dcb0ca1bfa66b53a57e;hp=8134c8d4e564715dc1f296cac4f6334bedd24806;hpb=7245e46453a82886739a45bd78fcdf9e8401367c;p=dcpomatic.git

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 8134c8d4e..d24620c7e 100644
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -23,11 +23,12 @@
 #define DCPOMATIC_PLAYER_VIDEO_H
 
 
-#include "types.h"
-#include "position.h"
-#include "dcpomatic_time.h"
 #include "colour_conversion.h"
+#include "dcpomatic_time.h"
+#include "image.h"
+#include "position.h"
 #include "position_image.h"
+#include "types.h"
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
@@ -70,10 +71,13 @@ public:
 	std::shared_ptr<PlayerVideo> shallow_copy () const;
 
 	void set_text (PositionImage);
+	boost::optional<PositionImage> text () const {
+		return _text;
+	}
 
-	void prepare (std::function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, bool aligned, bool fast, bool proxy_only);
-	std::shared_ptr<Image> image (std::function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, bool aligned, bool fast) const;
-	std::shared_ptr<Image> raw_image () const;
+	void prepare (std::function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, Image::Alignment alignment, bool fast, bool proxy_only);
+	std::shared_ptr<Image> image (std::function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, Image::Alignment alignment, bool fast) const;
+	std::shared_ptr<const Image> raw_image () const;
 
 	static AVPixelFormat force (AVPixelFormat, AVPixelFormat);
 	static AVPixelFormat keep_xyz_or_rgb (AVPixelFormat);
@@ -106,6 +110,10 @@ public:
 		return _inter_size;
 	}
 
+	dcp::Size out_size () const {
+		return _out_size;
+	}
+
 	bool same (std::shared_ptr<const PlayerVideo> other) const;
 
 	size_t memory_used () const;
@@ -119,7 +127,7 @@ public:
 	}
 
 private:
-	void make_image (std::function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, bool aligned, bool fast) const;
+	void make_image (std::function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, Image::Alignment alignment, bool fast) const;
 
 	std::shared_ptr<const ImageProxy> _in;
 	Crop _crop;