Merge.

[libsub.git] / src / subtitle.cc

diff --git a/src/subtitle.cc b/src/subtitle.cc
index d8286288f2c64e837c4f3222927882e923d864ce..2b98cb252eb30a51bc029d74a797b42ac023519b 100644 (file)
--- a/src/subtitle.cc
+++ b/src/subtitle.cc
@@ -37,7 +37,8 @@ Subtitle::same_metadata (RawSubtitle s) const
 }
 
 Line::Line (RawSubtitle s)
-       : vertical_position (s.vertical_position)
+       : horizontal_position (s.horizontal_position)
+       , vertical_position (s.vertical_position)
 {
        blocks.push_back (Block (s));
 }
@@ -59,5 +60,24 @@ Block::Block (RawSubtitle s)
        , italic (s.italic)
        , underline (s.underline)
 {
-       
+
+}
+
+bool
+sub::operator== (Subtitle const & a, Subtitle const & b)
+{
+       return a.from == b.from && a.to == b.to && a.fade_up == b.fade_up && a.fade_down == b.fade_down && a.lines == b.lines;
+}
+
+bool
+sub::operator== (Line const & a, Line const & b)
+{
+       return a.horizontal_position == b.horizontal_position && a.vertical_position == b.vertical_position && a.blocks == b.blocks;
+}
+
+bool
+sub::operator== (Block const & a, Block const & b)
+{
+       return a.text == b.text && a.font == b.font && a.font_size == b.font_size && a.effect == b.effect && a.effect_colour == b.effect_colour
+               && a.colour == b.colour && a.bold == b.bold && a.italic == b.italic && a.underline == b.underline;
 }