Bump libdcp.

[libsub.git] / src / subtitle.h

diff --git a/src/subtitle.h b/src/subtitle.h
index 6afdc512505d72d5b416d3186f834a9f0c86a0bc..fba0cf40543b75079e7e71235f216503c65b5acd 100644 (file)
--- a/src/subtitle.h
+++ b/src/subtitle.h
@@ -20,18 +20,16 @@
 #ifndef LIBSUB_SUBTITLE_H
 #define LIBSUB_SUBTITLE_H
 
-#include "frame_time.h"
-#include "metric_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 "raw_subtitle.h"
 #include <boost/optional.hpp>
 #include <string>
-#include <list>
+#include <vector>
 
 namespace sub {
 
@@ -52,23 +50,25 @@ public:
 
        /** Construct a Block taking any relevant information from a RawSubtitle */
        Block (RawSubtitle s);
-       
+
        /** 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
 };
 
+extern bool operator== (Block const & a, Block const & b);
+
 /** @class Line
  *  @brief A line of text within a subtitle.
  *
@@ -77,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.
  *
@@ -104,20 +111,22 @@ public:
 
        /** Construct a Line taking any relevant information from a RawSubtitle */
        Subtitle (RawSubtitle s);
-       
+
        /** from time */
-       TimePair from;
+       Time from;
        /** to time */
-       TimePair to;
-       
-       boost::optional<MetricTime> fade_up;
-       boost::optional<MetricTime> fade_down;
+       Time to;
 
-       std::list<Line> lines;
+       boost::optional<Time> fade_up;
+       boost::optional<Time> fade_down;
+
+       std::vector<Line> lines;
 
        bool same_metadata (RawSubtitle) const;
 };
 
+extern bool operator== (Subtitle const & a, Subtitle const & b);
+
 }
 
 #endif