Merge master.

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

diff --git a/src/lib/subrip_decoder.cc b/src/lib/subrip_decoder.cc
index 370118d3065debae3aee18dfae4bcf33cc00fa06..e2bdc347b93b202183d483f6a606dfc665324a13 100644 (file)
--- a/src/lib/subrip_decoder.cc
+++ b/src/lib/subrip_decoder.cc
@@ -75,19 +75,19 @@ SubRipDecoder::pass ()
        }
 
        text_subtitle (out);
-       _next++;
+       ++_next;
        return false;
 }
 
 list<ContentTimePeriod>
-SubRipDecoder::subtitles_during (ContentTimePeriod p) const
+SubRipDecoder::subtitles_during (ContentTimePeriod p, bool starting) const
 {
        /* XXX: inefficient */
 
        list<ContentTimePeriod> d;
 
        for (vector<SubRipSubtitle>::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
-               if (p.overlaps (i->period)) {
+               if ((starting && p.contains (i->period.from)) || (!starting && p.overlaps (i->period))) {
                        d.push_back (i->period);
                }
        }