X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fsubtitle_string.cc;h=7ba6e0e112910748f69e6f949d77c9020ba9fffb;hb=4b8c626b7e66ab1d4d69606e10316542c8873842;hp=66869fd59329db90e04343f98b44a633ce8dd921;hpb=ac265d3d008328b9bdaf00c39ebcd86f263605c7;p=libdcp.git

diff --git a/src/subtitle_string.cc b/src/subtitle_string.cc
index 66869fd5..7ba6e0e1 100644
--- a/src/subtitle_string.cc
+++ b/src/subtitle_string.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 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
     it under the terms of the GNU General Public License as published by
@@ -19,37 +19,50 @@
 
 #include "subtitle_string.h"
 #include "xml.h"
+#include <cmath>
 
 using std::string;
 using std::ostream;
+using boost::optional;
 using namespace dcp;
 
+/** @param v_position Vertical position as a fraction of the screen height (between 0 and 1) from v_align */
 SubtitleString::SubtitleString (
-	string font,
+	optional<string> font,
 	bool italic,
-	Color color,
+	bool bold,
+	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,
 	string text,
 	Effect effect,
-	Color effect_color,
+	Colour effect_colour,
 	Time fade_up_time,
 	Time fade_down_time
 	)
 	: _font (font)
 	, _italic (italic)
-	, _color (color)
+	, _bold (bold)
+	, _colour (colour)
 	, _size (size)
+	, _aspect_adjust (aspect_adjust)
 	, _in (in)
 	, _out (out)
+	, _h_position (h_position)
+	, _h_align (h_align)
 	, _v_position (v_position)
 	, _v_align (v_align)
+	, _direction (direction)
 	, _text (text)
 	, _effect (effect)
-	, _effect_color (effect_color)
+	, _effect_colour (effect_colour)
 	, _fade_up_time (fade_up_time)
 	, _fade_down_time (fade_down_time)
 {
@@ -63,7 +76,7 @@ SubtitleString::size_in_pixels (int screen_height) const
 	   height is 11 inches, so a 72pt font would be 1/11th of the screen
 	   height.
 	*/
-	
+
 	return _size * screen_height / (11 * 72);
 }
 
@@ -73,15 +86,20 @@ dcp::operator== (SubtitleString const & a, SubtitleString const & b)
 	return (
 		a.font() == b.font() &&
 		a.italic() == b.italic() &&
-		a.color() == b.color() &&
+		a.bold() == b.bold() &&
+		a.colour() == b.colour() &&
 		a.size() == b.size() &&
+		fabs (a.aspect_adjust() - b.aspect_adjust()) < ASPECT_ADJUST_EPSILON &&
 		a.in() == b.in() &&
 		a.out() == b.out() &&
+		a.h_position() == b.h_position() &&
+		a.h_align() == b.h_align() &&
 		a.v_position() == b.v_position() &&
 		a.v_align() == b.v_align() &&
+		a.direction() == b.direction() &&
 		a.text() == b.text() &&
 		a.effect() == b.effect() &&
-		a.effect_color() == b.effect_color() &&
+		a.effect_colour() == b.effect_colour() &&
 		a.fade_up_time() == b.fade_up_time() &&
 		a.fade_down_time() == b.fade_down_time()
 		);
@@ -92,16 +110,25 @@ dcp::operator<< (ostream& s, SubtitleString const & sub)
 {
 	s << "\n`" << sub.text() << "' from " << sub.in() << " to " << sub.out() << ";\n"
 	  << "fade up " << sub.fade_up_time() << ", fade down " << sub.fade_down_time() << ";\n"
-	  << "font " << sub.font() << ", ";
+	  << "font " << sub.font().get_value_or ("[default]") << ", ";
 
 	if (sub.italic()) {
-		s << "italic";
+		s << "italic, ";
 	} else {
-		s << "non-italic";
+		s << "non-italic, ";
 	}
-	
-	s << ", size " << sub.size() << ", color " << sub.color() << ", vpos " << sub.v_position() << ", valign " << ((int) sub.v_align()) << ";\n"
-	  << "effect " << ((int) sub.effect()) << ", effect color " << sub.effect_color();
+
+	if (sub.bold()) {
+		s << "bold, ";
+	} else {
+		s << "normal, ";
+	}
+
+	s << "size " << sub.size() << ", aspect " << sub.aspect_adjust() << ", colour " << sub.colour()
+	  << ", vpos " << sub.v_position() << ", valign " << ((int) sub.v_align())
+	  << ", hpos " << sub.h_position() << ", halign " << ((int) sub.h_align())
+	  << ", direction " << ((int) sub.direction())
+	  << ", effect " << ((int) sub.effect()) << ", effect colour " << sub.effect_colour();
 
 	return s;
 }