X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fraw_subtitle.h;h=a3ee5caa2f116eec3ea62e660bac416bc8fd83c6;hb=c3fe2237a985bf7ef929251a0e10c906125ab4c3;hp=ffdc66954b36e5b45b9f9baea8570f770915eb42;hpb=38a5ff713757b9dc0cb67cb09613182c46dc9657;p=libsub.git

diff --git a/src/raw_subtitle.h b/src/raw_subtitle.h
index ffdc669..a3ee5ca 100644
--- a/src/raw_subtitle.h
+++ b/src/raw_subtitle.h
@@ -20,20 +20,22 @@
 #ifndef LIBSUB_RAW_SUBTITLE_H
 #define LIBSUB_RAW_SUBTITLE_H
 
-#include "frame_time.h"
-#include "metric_time.h"
+#include "sub_time.h"
 #include "colour.h"
 #include "vertical_reference.h"
 #include "effect.h"
-#include "time_pair.h"
 #include "font_size.h"
 #include "vertical_position.h"
+#include "horizontal_position.h"
 #include <boost/optional.hpp>
 #include <string>
-#include <list>
+#include <vector>
 
 namespace sub {
 
+/** @class RawSubtitle
+ *  @brief A bit of a subtitle, created with no regard for any nearby bits.
+ */
 class RawSubtitle
 {
 public:
@@ -46,32 +48,34 @@ public:
 
 	/** Subtitle text in UTF-8 */
 	std::string text;
-	std::string font;
+	boost::optional<std::string> font;
 
 	/** font size */
 	FontSize font_size;
 
 	boost::optional<Effect> effect;
 	boost::optional<Colour> effect_colour;
-	
+
 	Colour colour;
 	bool bold;      ///< true to use a bold version of font
 	bool italic;    ///< true to use an italic version of font
 	bool underline; ///< true to underline
 
+	HorizontalPosition horizontal_position;
+
 	/** vertical position of the baseline of the text */
 	VerticalPosition vertical_position;
 
 	/** from time */
-	TimePair from;
+	Time from;
 	/** to time */
-	TimePair to;
-	
-	boost::optional<MetricTime> fade_up;
-	boost::optional<MetricTime> fade_down;
+	Time to;
+
+	boost::optional<Time> fade_up;
+	boost::optional<Time> fade_down;
 };
 
-bool operator< (RawSubtitle const &, RawSubtitle const &);	
+bool operator< (RawSubtitle const &, RawSubtitle const &);
 
 }