Merge master.

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

diff --git a/src/lib/subrip_decoder.cc b/src/lib/subrip_decoder.cc
index f89f40da4ba706bfd399428a25b040f74519a4a4..47b6ea04410cdc3d477ded4257a331a347789048 100644 (file)
--- a/src/lib/subrip_decoder.cc
+++ b/src/lib/subrip_decoder.cc
@@ -23,10 +23,8 @@
 using std::list;
 using boost::shared_ptr;
 
-SubRipDecoder::SubRipDecoder (shared_ptr<const Film> film, shared_ptr<const SubRipContent> content)
-       : Decoder (film)
-       , SubtitleDecoder (film)
-       , SubRip (content)
+SubRipDecoder::SubRipDecoder (shared_ptr<const SubRipContent> content)
+       : SubRip (content)
        , _next (0)
 {
 
@@ -47,8 +45,8 @@ SubRipDecoder::pass ()
                                i->italic,
                                dcp::Color (255, 255, 255),
                                72,
-                               _subtitles[_next].from,
-                               _subtitles[_next].to,
+                               dcp::Time (rint (_subtitles[_next].from.seconds() * 250)),
+                               dcp::Time (rint (_subtitles[_next].to.seconds() * 250)),
                                0.9,
                                dcp::BOTTOM,
                                i->text,