FFmpegContent does not need audio_length().

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

diff --git a/src/lib/subrip_decoder.cc b/src/lib/subrip_decoder.cc
index 22f7b6ba4b27ac23fc1b94a4b53214b9e82bd8a8..6ed2e5254fb5c9be4847fd00c3df4eb31a42b865 100644 (file)
--- a/src/lib/subrip_decoder.cc
+++ b/src/lib/subrip_decoder.cc
@@ -42,13 +42,13 @@ SubRipDecoder::seek (ContentTime time, bool accurate)
        SubtitleDecoder::seek (time, accurate);
        
        _next = 0;
-       while (_next < _subtitles.size() && ContentTime::from_seconds (_subtitles[_next].from.metric().get().all_as_seconds ()) < time) {
+       while (_next < _subtitles.size() && ContentTime::from_seconds (_subtitles[_next].from.all_as_seconds ()) < time) {
                ++_next;
        }
 }
 
 bool
-SubRipDecoder::pass ()
+SubRipDecoder::pass (PassReason)
 {
        if (_next >= _subtitles.size ()) {
                return true;
@@ -65,8 +65,8 @@ SubRipDecoder::pass ()
                                        j->italic,
                                        dcp::Colour (255, 255, 255),
                                        j->font_size.points (72 * 11),
-                                       dcp::Time (rint (_subtitles[_next].from.metric().get().all_as_seconds())),
-                                       dcp::Time (rint (_subtitles[_next].to.metric().get().all_as_seconds())),
+                                       dcp::Time (_subtitles[_next].from.all_as_seconds()),
+                                       dcp::Time (_subtitles[_next].to.all_as_seconds()),
                                        i->vertical_position.line.get() * (1.5 / 22) + 0.8,
                                        dcp::TOP,
                                        j->text,
@@ -85,7 +85,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 */
 
@@ -94,8 +100,8 @@ SubRipDecoder::subtitles_during (ContentTimePeriod p, bool starting) const
        for (vector<sub::Subtitle>::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
 
                ContentTimePeriod t (
-                       ContentTime::from_seconds (i->from.metric().get().all_as_seconds()),
-                       ContentTime::from_seconds (i->to.metric().get().all_as_seconds())
+                       ContentTime::from_seconds (i->from.all_as_seconds()),
+                       ContentTime::from_seconds (i->to.all_as_seconds())
                        );
 
                if ((starting && p.contains (t.from)) || (!starting && p.overlaps (t))) {