diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-03 23:32:48 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-03 23:32:48 +0100 |
| commit | e1f53890da6e4be2555a9e17a52edcc03d53656b (patch) | |
| tree | ff148f4d8dc54b1a09fa21ca743fce261f01c021 /src/subtitle_string.cc | |
| parent | 47b52fb54f302d5faf93a19ae2fe28fa610f96ca (diff) | |
Basic HAlign / HPosition support.
Diffstat (limited to 'src/subtitle_string.cc')
| -rw-r--r-- | src/subtitle_string.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/subtitle_string.cc b/src/subtitle_string.cc index c4358381..478bd4aa 100644 --- a/src/subtitle_string.cc +++ b/src/subtitle_string.cc @@ -35,6 +35,8 @@ SubtitleString::SubtitleString ( float aspect_adjust, Time in, Time out, + float h_position, + HAlign h_align, float v_position, VAlign v_align, string text, @@ -50,6 +52,8 @@ SubtitleString::SubtitleString ( , _aspect_adjust (aspect_adjust) , _in (in) , _out (out) + , _h_position (h_position) + , _h_align (h_align) , _v_position (v_position) , _v_align (v_align) , _text (text) @@ -83,6 +87,8 @@ dcp::operator== (SubtitleString const & a, SubtitleString const & b) fabs (a.aspect_adjust() - b.aspect_adjust()) < ASPECT_ADJUST_EPSILON && a.in() == b.in() && a.out() == b.out() && + a.h_position() == b.h_position() && + a.h_align() == b.h_align() && a.v_position() == b.v_position() && a.v_align() == b.v_align() && a.text() == b.text() && @@ -107,7 +113,8 @@ dcp::operator<< (ostream& s, SubtitleString const & sub) } s << ", size " << sub.size() << ", aspect " << sub.aspect_adjust() << ", colour " << sub.colour() - << ", vpos " << sub.v_position() << ", valign " << ((int) sub.v_align()) << ";\n" + << ", vpos " << sub.v_position() << ", valign " << ((int) sub.v_align()) << ",\n" + << ", hpos " << sub.h_position() << ", halign " << ((int) sub.h_align()) << ";\n" << "effect " << ((int) sub.effect()) << ", effect colour " << sub.effect_colour(); return s; |