No-op: remove all trailing whitespace.
[dcpomatic.git] / src / lib / subrip_decoder.cc
index dae2e4ab755d8085114b137a2ed83b7b0a9ba187..c2bd4f3e0bd7dc8fa35167bc726447bca72958d2 100644 (file)
@@ -40,7 +40,7 @@ void
 SubRipDecoder::seek (ContentTime time, bool accurate)
 {
        SubtitleDecoder::seek (time, accurate);
-       
+
        _next = 0;
        while (_next < _subtitles.size() && ContentTime::from_seconds (_subtitles[_next].from.all_as_seconds ()) < time) {
                ++_next;
@@ -48,14 +48,14 @@ SubRipDecoder::seek (ContentTime time, bool accurate)
 }
 
 bool
-SubRipDecoder::pass (PassReason)
+SubRipDecoder::pass ()
 {
        if (_next >= _subtitles.size ()) {
                return true;
        }
 
        /* XXX: we are ignoring positioning specified in the file */
-       
+
        list<dcp::SubtitleString> out;
        for (list<sub::Line>::const_iterator i = _subtitles[_next].lines.begin(); i != _subtitles[_next].lines.end(); ++i) {
                for (list<sub::Block>::const_iterator j = i->blocks.begin(); j != i->blocks.end(); ++j) {
@@ -68,8 +68,10 @@ SubRipDecoder::pass (PassReason)
                                        1.0,
                                        dcp::Time (_subtitles[_next].from.all_as_seconds()),
                                        dcp::Time (_subtitles[_next].to.all_as_seconds()),
+                                       0,
+                                       dcp::HALIGN_CENTER,
                                        i->vertical_position.line.get() * (1.5 / 22) + 0.8,
-                                       dcp::TOP,
+                                       dcp::VALIGN_TOP,
                                        j->text,
                                        dcp::NONE,
                                        dcp::Colour (255, 255, 255),