No-op: remove all trailing whitespace.

[dcpomatic.git] / src / lib / subrip_decoder.cc

diff --git a/src/lib/subrip_decoder.cc b/src/lib/subrip_decoder.cc
index 552a96b8f325416fe1b2c60ac0470ddb19422276..c2bd4f3e0bd7dc8fa35167bc726447bca72958d2 100644 (file)
--- a/src/lib/subrip_decoder.cc
+++ b/src/lib/subrip_decoder.cc
@@ -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;
@@ -55,7 +55,7 @@ SubRipDecoder::pass ()
        }
 
        /* 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) {
@@ -65,10 +65,13 @@ SubRipDecoder::pass ()
                                        j->italic,
                                        dcp::Colour (255, 255, 255),
                                        j->font_size.points (72 * 11),
+                                       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),
@@ -85,7 +88,13 @@ SubRipDecoder::pass ()
 }
 
 list<ContentTimePeriod>
-SubRipDecoder::subtitles_during (ContentTimePeriod p, bool starting) const
+SubRipDecoder::image_subtitles_during (ContentTimePeriod, bool) const
+{
+       return list<ContentTimePeriod> ();
+}
+
+list<ContentTimePeriod>
+SubRipDecoder::text_subtitles_during (ContentTimePeriod p, bool starting) const
 {
        /* XXX: inefficient */