X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fsubtitle_content.h;h=e8915fc960636ca9b0d9299613c513f3d556203d;hb=769c71b5c3e050ccfc1c13771d24328fbf76a495;hp=57f5eb9509264d68957ac8f99ef282932cbb28f9;hpb=40b654453c2ce0b266f43c36f1b9a5d1705f983c;p=dcpomatic.git

diff --git a/src/lib/subtitle_content.h b/src/lib/subtitle_content.h
index 57f5eb950..e8915fc96 100644
--- a/src/lib/subtitle_content.h
+++ b/src/lib/subtitle_content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -22,13 +22,18 @@
 
 #include "content.h"
 
+class Font;
+
 class SubtitleContentProperty
 {
 public:
 	static int const SUBTITLE_X_OFFSET;
 	static int const SUBTITLE_Y_OFFSET;
-	static int const SUBTITLE_SCALE;
+	static int const SUBTITLE_X_SCALE;
+	static int const SUBTITLE_Y_SCALE;
 	static int const USE_SUBTITLES;
+	static int const SUBTITLE_LANGUAGE;
+	static int const FONTS;
 };
 
 /** @class SubtitleContent
@@ -53,7 +58,9 @@ public:
 	void set_use_subtitles (bool);
 	void set_subtitle_x_offset (double);
 	void set_subtitle_y_offset (double);
-	void set_subtitle_scale (double);
+	void set_subtitle_x_scale (double);
+	void set_subtitle_y_scale (double);
+	void set_subtitle_language (std::string language);
 
 	bool use_subtitles () const {
 		boost::mutex::scoped_lock lm (_mutex);
@@ -70,13 +77,33 @@ public:
 		return _subtitle_y_offset;
 	}
 
-	double subtitle_scale () const {
+	double subtitle_x_scale () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _subtitle_x_scale;
+	}
+
+	double subtitle_y_scale () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _subtitle_y_scale;
+	}
+
+	std::list<boost::shared_ptr<Font> > fonts () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _fonts;
+	}
+
+	std::string subtitle_language () const {
 		boost::mutex::scoped_lock lm (_mutex);
-		return _subtitle_scale;
+		return _subtitle_language;
 	}
 
+protected:
+	/** subtitle language (e.g. "German") or empty if it is not known */
+	std::string _subtitle_language;
+	std::list<boost::shared_ptr<Font> > _fonts;
+	
 private:
-	friend class ffmpeg_pts_offset_test;
+	friend struct ffmpeg_pts_offset_test;
 
 	bool _use_subtitles;
 	/** x offset for placing subtitles, as a proportion of the container width;
@@ -87,8 +114,10 @@ private:
 	 *  +ve is further down the frame, -ve is further up.
 	 */
 	double _subtitle_y_offset;
-	/** scale factor to apply to subtitles */
-	double _subtitle_scale;
+	/** x scale factor to apply to subtitles */
+	double _subtitle_x_scale;
+	/** y scale factor to apply to subtitles */
+	double _subtitle_y_scale;
 };
 
 #endif