Merge master.

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

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index a12f45a30f81d20d6af73fb97e0b62f805a54a54..a1992102c9e55e8e539f3757ba55208153ef86b6 100644 (file)
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -396,20 +396,22 @@ FFmpegContent::audio_analysis_path () const
        return p;
 }
 
-bool
-FFmpegContent::has_subtitle_during (ContentTimePeriod period) const
+list<ContentTimePeriod>
+FFmpegContent::subtitles_during (ContentTimePeriod period, bool starting) const
 {
+       list<ContentTimePeriod> d;
+       
        shared_ptr<FFmpegSubtitleStream> stream = subtitle_stream ();
        if (!stream) {
-               return false;
+               return d;
        }
 
        /* XXX: inefficient */
        for (vector<ContentTimePeriod>::const_iterator i = stream->periods.begin(); i != stream->periods.end(); ++i) {
-               if (i->from <= period.to && i->to >= period.from) {
-                       return true;
+               if ((starting && period.contains (i->from)) || (!starting && period.overlaps (*i))) {
+                       d.push_back (*i);
                }
        }
 
-       return false;
+       return d;
 }