Extend SubtitleAsset::subtitles_during to allow asking for subtitles either starting during a particular timescale or overllapping it.

2 files changed, 3 insertions, 3 deletions

diff --git a/src/subtitle_asset.cc b/src/subtitle_asset.cc
index 4d411e5a..077b5288 100644
--- a/src/subtitle_asset.cc
+++ b/src/subtitle_asset.cc
@@ -148,11 +148,11 @@ SubtitleAsset::maybe_add_subtitle (string text, ParseState const & parse_state)
 }
 
 list<SubtitleString>
-SubtitleAsset::subtitles_during (Time from, Time to) const
+SubtitleAsset::subtitles_during (Time from, Time to, bool starting) const
 {
 	list<SubtitleString> s;
 	for (list<SubtitleString>::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
-		if (i->out() >= from && i->in() <= to) {
+		if ((starting && from <= i->in() && i->in() < to) || (!starting && i->out() >= from && i->in() <= to)) {
 			s.push_back (*i);
 		}
 	}
diff --git a/src/subtitle_asset.h b/src/subtitle_asset.h
index 44ac455f..69bf40f8 100644
--- a/src/subtitle_asset.h
+++ b/src/subtitle_asset.h
@@ -63,7 +63,7 @@ public:
 		NoteHandler note
 		) const;
 
-	std::list<SubtitleString> subtitles_during (Time from, Time to) const;
+	std::list<SubtitleString> subtitles_during (Time from, Time to, bool starting) const;
 	std::list<SubtitleString> const & subtitles () const {
 		return _subtitles;
 	}