Merge.

[libsub.git] / src / subtitle.h

diff --git a/src/subtitle.h b/src/subtitle.h
index 2d22dac651bf1965200df7114caeb3356aa7edee..fba0cf40543b75079e7e71235f216503c65b5acd 100644 (file)
--- a/src/subtitle.h
+++ b/src/subtitle.h
@@ -25,10 +25,11 @@
 #include "effect.h"
 #include "font_size.h"
 #include "vertical_position.h"
+#include "horizontal_position.h"
 #include "raw_subtitle.h"
 #include <boost/optional.hpp>
 #include <string>
-#include <list>
+#include <vector>
 
 namespace sub {
 
@@ -66,6 +67,8 @@ public:
        bool underline; ///< true to underline
 };
 
+extern bool operator== (Block const & a, Block const & b);
+
 /** @class Line
  *  @brief A line of text within a subtitle.
  *
@@ -74,19 +77,26 @@ public:
 class Line
 {
 public:
-       Line () {}
+       Line ()
+       {
+               horizontal_position.reference = HORIZONTAL_CENTRE_OF_SCREEN;
+       }
 
        /** Construct a Line taking any relevant information from a RawSubtitle */
        Line (RawSubtitle s);
 
+       HorizontalPosition horizontal_position;
+
        /** vertical position of the baseline of the text */
        VerticalPosition vertical_position;
 
-       std::list<Block> blocks;
+       std::vector<Block> blocks;
 
        bool same_metadata (RawSubtitle) const;
 };
 
+extern bool operator== (Line const & a, Line const & b);
+
 /** @class Subtitle
  *  @brief A subtitle which has been collected into lines and blocks.
  *
@@ -110,11 +120,13 @@ public:
        boost::optional<Time> fade_up;
        boost::optional<Time> fade_down;
 
-       std::list<Line> lines;
+       std::vector<Line> lines;
 
        bool same_metadata (RawSubtitle) const;
 };
 
+extern bool operator== (Subtitle const & a, Subtitle const & b);
+
 }
 
 #endif