Try moving subtitle adjustment for crop into the decoder.

1 files changed, 6 insertions, 10 deletions

diff --git a/src/lib/subtitle.h b/src/lib/subtitle.h
index fcb6bc70c..0b82320a1 100644
--- a/src/lib/subtitle.h
+++ b/src/lib/subtitle.h
@@ -45,17 +45,9 @@ private:
 	std::list<boost::shared_ptr<SubtitleImage> > _images;
 };
 
-struct SubtitleTransform
-{
-public:
-	Rectangle crop;
-	Rectangle transformed;
-};
-
-extern SubtitleTransform subtitle_transform (
-	int target_base_width, int target_base_height,
+extern Rectangle transformed_subtitle_area (
 	float target_x_scale, float target_y_scale,
-	Position sub_pos, int sub_width, int sub_height,
+	Rectangle sub_area,
 	boost::shared_ptr<FilmState> fs
 	);
 
@@ -64,6 +56,10 @@ class SubtitleImage
 public:
 	SubtitleImage (AVSubtitleRect const *);
 
+	void set_position (Position p) {
+		_position = p;
+	}
+
 	Position position () const {
 		return _position;
 	}