X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fsubtitle_string.h;h=8e798d8ec6fdcb19ebe638efcf7dbba41d2e2ea8;hb=b509d21444a1f486b8713a1a652c0f816b2af0cb;hp=ba975778ae1eced62b197af1cd2b56403d811f83;hpb=1c17602bfc56abbf17c1e974f99477655627725b;p=libdcp.git

diff --git a/src/subtitle_string.h b/src/subtitle_string.h
index ba975778..8e798d8e 100644
--- a/src/subtitle_string.h
+++ b/src/subtitle_string.h
@@ -1,20 +1,34 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 /** @file  src/subtitle_string.h
@@ -25,6 +39,7 @@
 #define LIBDCP_SUBTITLE_STRING_H
 
 #include "types.h"
+#include "subtitle.h"
 #include "dcp_time.h"
 #include <boost/optional.hpp>
 #include <string>
@@ -34,19 +49,24 @@ namespace dcp {
 /** @class SubtitleString
  *  @brief A single line of subtitle text with all the associated attributes.
  */
-class SubtitleString
+class SubtitleString : public Subtitle
 {
 public:
 	SubtitleString (
 		boost::optional<std::string> font,
 		bool italic,
+		bool bold,
+		bool underline,
 		Colour colour,
 		int size,
 		float aspect_adjust,
 		Time in,
 		Time out,
+		float h_position,
+		HAlign h_align,
 		float v_position,
 		VAlign v_align,
+		Direction direction,
 		std::string text,
 		Effect effect,
 		Colour effect_colour,
@@ -63,31 +83,24 @@ public:
 		return _italic;
 	}
 
-	Colour colour () const {
-		return _colour;
+	bool bold () const {
+		return _bold;
 	}
 
-	Time in () const {
-		return _in;
+	bool underline () const {
+		return _underline;
 	}
 
-	Time out () const {
-		return _out;
+	Colour colour () const {
+		return _colour;
 	}
 
 	std::string text () const {
 		return _text;
 	}
 
-	/** @return vertical position as a proportion of the screen height from the top
-	 *  (between 0 and 1)
-	 */
-	float v_position () const {
-		return _v_position;
-	}
-
-	VAlign v_align () const {
-		return _v_align;
+	Direction direction () const {
+		return _direction;
 	}
 
 	Effect effect () const {
@@ -98,14 +111,6 @@ public:
 		return _effect_colour;
 	}
 
-	Time fade_up_time () const {
-		return _fade_up_time;
-	}
-
-	Time fade_down_time () const {
-		return _fade_down_time;
-	}
-
 	int size () const {
 		return _size;
 	}
@@ -120,44 +125,62 @@ public:
 		return _aspect_adjust;
 	}
 
-	/** @param p New vertical position as a proportion of the screen height
-	 *  from the top (between 0 and 1)
-	 */
-	void set_v_position (float p) {
-		_v_position = p;
+	void set_font (std::string id) {
+		_font = id;
+	}
+
+	void unset_font () {
+		_font = boost::optional<std::string>();
 	}
 
 	void set_size (int s) {
 		_size = s;
 	}
 
+	void set_aspect_adjust (float a) {
+		_aspect_adjust = a;
+	}
+
+	void set_text (std::string t) {
+		_text = t;
+	}
+
+	void set_colour (Colour c) {
+		_colour = c;
+	}
+
+	void set_effect (Effect e) {
+		_effect = e;
+	}
+
+	void set_effect_colour (Colour c) {
+		_effect_colour = c;
+	}
+
 private:
 	/** font ID */
 	boost::optional<std::string> _font;
 	/** true if the text is italic */
 	bool _italic;
+	/** true if the weight is bold, false for normal */
+	bool _bold;
+	/** true to enable underlining, false otherwise */
+	bool _underline;
 	/** text colour */
 	Colour _colour;
 	/** Size in points as if the screen height is 11 inches, so a 72pt font
 	 *  would be 1/11th of the screen height.
-	 */ 
+	 */
 	int _size;
 	float _aspect_adjust;
-	Time _in;
-	Time _out;
-	/** Vertical position as a proportion of the screen height from the _v_align
-	 *  (between 0 and 1)
-	 */
-	float _v_position;
-	VAlign _v_align;
+	Direction _direction;
 	std::string _text;
 	Effect _effect;
 	Colour _effect_colour;
-	Time _fade_up_time;
-	Time _fade_down_time;
 };
 
 bool operator== (SubtitleString const & a, SubtitleString const & b);
+bool operator!= (SubtitleString const & a, SubtitleString const & b);
 std::ostream& operator<< (std::ostream& s, SubtitleString const & sub);
 
 }