diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-04-12 01:37:00 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-04-12 01:37:00 +0100 |
| commit | 4b8c626b7e66ab1d4d69606e10316542c8873842 (patch) | |
| tree | 94140f93b3911196ab60866fefb5c9f807a7a2ab /src/subtitle_string.cc | |
| parent | 4b8eee1359d817937b84df7e88126fa16040e5c9 (diff) | |
Add direction support for SMPTE subtitles; fix pragma warnings with non-openmp builds.
Diffstat (limited to 'src/subtitle_string.cc')
| -rw-r--r-- | src/subtitle_string.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/subtitle_string.cc b/src/subtitle_string.cc index ea24e37f..7ba6e0e1 100644 --- a/src/subtitle_string.cc +++ b/src/subtitle_string.cc @@ -40,6 +40,7 @@ SubtitleString::SubtitleString ( HAlign h_align, float v_position, VAlign v_align, + Direction direction, string text, Effect effect, Colour effect_colour, @@ -58,6 +59,7 @@ SubtitleString::SubtitleString ( , _h_align (h_align) , _v_position (v_position) , _v_align (v_align) + , _direction (direction) , _text (text) , _effect (effect) , _effect_colour (effect_colour) @@ -94,6 +96,7 @@ dcp::operator== (SubtitleString const & a, SubtitleString const & b) a.h_align() == b.h_align() && a.v_position() == b.v_position() && a.v_align() == b.v_align() && + a.direction() == b.direction() && a.text() == b.text() && a.effect() == b.effect() && a.effect_colour() == b.effect_colour() && @@ -124,6 +127,7 @@ 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()) << ", hpos " << sub.h_position() << ", halign " << ((int) sub.h_align()) + << ", direction " << ((int) sub.direction()) << ", effect " << ((int) sub.effect()) << ", effect colour " << sub.effect_colour(); return s; |