Merge.

[libsub.git] / src / subtitle.cc

diff --git a/src/subtitle.cc b/src/subtitle.cc
index 5eb5784898143a5b3ef19ef975206c450be0cba7..2b98cb252eb30a51bc029d74a797b42ac023519b 100644 (file)
--- a/src/subtitle.cc
+++ b/src/subtitle.cc
@@ -21,62 +21,63 @@
 
 using namespace sub;
 
-bool
-sub::operator< (Subtitle const & a, Subtitle const & b)
+Subtitle::Subtitle (RawSubtitle s)
+       : from (s.from)
+       , to (s.to)
+       , fade_up (s.fade_up)
+       , fade_down (s.fade_down)
 {
-       if (a.from.frame() && b.from.frame()) {
-               return a.from.frame().get() < b.from.frame().get();
-       }
-
-       if (a.from.metric() && b.from.metric()) {
-               return a.from.metric().get() < b.from.metric().get();
-       }
-
-       assert (false);
+       lines.push_back (Line (s));
 }
 
+bool
+Subtitle::same_metadata (RawSubtitle s) const
+{
+       return from == s.from && to == s.to && fade_up == s.fade_up && fade_down == s.fade_down;
+}
 
-float
-Block::FontSize::proportional (int screen_height_in_points) const
+Line::Line (RawSubtitle s)
+       : horizontal_position (s.horizontal_position)
+       , vertical_position (s.vertical_position)
 {
-       if (_proportional) {
-               return _proportional.get ();
-       }
+       blocks.push_back (Block (s));
+}
 
-       return float (_points.get ()) / screen_height_in_points;
+bool
+Line::same_metadata (RawSubtitle s) const
+{
+       return vertical_position == s.vertical_position;
 }
 
-int
-Block::FontSize::points (int screen_height_in_points) const
+Block::Block (RawSubtitle s)
+       : text (s.text)
+       , font (s.font)
+       , font_size (s.font_size)
+       , effect (s.effect)
+       , effect_colour (s.effect_colour)
+       , colour (s.colour)
+       , bold (s.bold)
+       , italic (s.italic)
+       , underline (s.underline)
 {
-       if (_points) {
-               return _points.get ();
-       }
 
-       return _proportional.get() * screen_height_in_points;
 }
 
 bool
-Subtitle::same_metadata (Subtitle const & other) const
+sub::operator== (Subtitle const & a, Subtitle const & b)
 {
-       return (
-               vertical_position == other.vertical_position &&
-               from == other.from &&
-               to == other.to &&
-               fade_up == other.fade_up &&
-               fade_down == other.fade_down
-               );
+       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
-Subtitle::VerticalPosition::operator== (Subtitle::VerticalPosition const & other) const
+sub::operator== (Line const & a, Line const & b)
 {
-       if (proportional && reference && other.proportional && other.reference) {
-               return proportional.get() == other.proportional.get() && reference.get() == other.reference.get();
-       } else if (line && other.line) {
-               return line.get() == other.line.get();
-       }
-
-       return false;
+       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;
+}