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 c2bd4f3e0bd7dc8fa35167bc726447bca72958d2..3c93292a166ef8208cda997893a7e54005f5fc79 100644 (file)
--- a/src/lib/subrip_decoder.cc
+++ b/src/lib/subrip_decoder.cc
@@ -20,6 +20,7 @@
 #include <dcp/subtitle_string.h>
 #include "subrip_decoder.h"
 #include "subrip_content.h"
+#include <iostream>
 
 using std::list;
 using std::vector;
@@ -48,7 +49,7 @@ SubRipDecoder::seek (ContentTime time, bool accurate)
 }
 
 bool
-SubRipDecoder::pass ()
+SubRipDecoder::pass (PassReason)
 {
        if (_next >= _subtitles.size ()) {
                return true;
@@ -63,11 +64,11 @@ SubRipDecoder::pass ()
                                dcp::SubtitleString (
                                        SubRipContent::font_id,
                                        j->italic,
-                                       dcp::Colour (255, 255, 255),
+                                       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,
@@ -75,14 +76,15 @@ SubRipDecoder::pass ()
                                        j->text,
                                        dcp::NONE,
                                        dcp::Colour (255, 255, 255),
-                                       0,
-                                       0
+                                       dcp::Time (0, 1000),
+                                       dcp::Time (0, 1000)
                                        )
                                );
                }
        }
 
-       text_subtitle (out);
+       text_subtitle (content_time_period (_subtitles[_next]), out);
+
        ++_next;
        return false;
 }
@@ -101,12 +103,7 @@ SubRipDecoder::text_subtitles_during (ContentTimePeriod p, bool starting) const
        list<ContentTimePeriod> d;
 
        for (vector<sub::Subtitle>::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
-
-               ContentTimePeriod t (
-                       ContentTime::from_seconds (i->from.all_as_seconds()),
-                       ContentTime::from_seconds (i->to.all_as_seconds())
-                       );
-
+               ContentTimePeriod t = content_time_period (*i);
                if ((starting && p.contains (t.from)) || (!starting && p.overlaps (t))) {
                        d.push_back (t);
                }
@@ -114,3 +111,12 @@ SubRipDecoder::text_subtitles_during (ContentTimePeriod p, bool starting) const
 
        return d;
 }
+
+ContentTimePeriod
+SubRipDecoder::content_time_period (sub::Subtitle s) const
+{
+       return ContentTimePeriod (
+               ContentTime::from_seconds (s.from.all_as_seconds()),
+               ContentTime::from_seconds (s.to.all_as_seconds())
+               );
+}