Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/lib/subrip_decoder.cc b/src/lib/subrip_decoder.cc
index 2de27248111eb17eaddd8f93f2afcf095522224d..3c93292a166ef8208cda997893a7e54005f5fc79 100644 (file)
--- a/src/lib/subrip_decoder.cc
+++ b/src/lib/subrip_decoder.cc
@@ -49,7 +49,7 @@ SubRipDecoder::seek (ContentTime time, bool accurate)
 }
 
 bool
-SubRipDecoder::pass ()
+SubRipDecoder::pass (PassReason)
 {
        if (_next >= _subtitles.size ()) {
                return true;
@@ -67,8 +67,8 @@ SubRipDecoder::pass ()
                                        dcp::Colour (j->colour.r * 255, j->colour.g * 255, j->colour.b * 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()),
+                                       dcp::Time (_subtitles[_next].from.all_as_seconds(), 1000),
+                                       dcp::Time (_subtitles[_next].to.all_as_seconds(), 1000),
                                        0,
                                        dcp::HALIGN_CENTER,
                                        i->vertical_position.line.get() * (1.5 / 22) + 0.8,
@@ -76,8 +76,8 @@ SubRipDecoder::pass ()
                                        j->text,
                                        dcp::NONE,
                                        dcp::Colour (255, 255, 255),
-                                       0,
-                                       0
+                                       dcp::Time (0, 1000),
+                                       dcp::Time (0, 1000)
                                        )
                                );
                }