summaryrefslogtreecommitdiff
path: root/src/subtitle_asset.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-11-02 01:26:13 +0000
committerCarl Hetherington <cth@carlh.net>2014-11-02 01:26:13 +0000
commitd9a189571d94e656e137db115c1070ae161984ee (patch)
treee4caa0f0735d9c840942ffa924755da7ef1cbfe6 /src/subtitle_asset.cc
parent6d7dc1a2b650a74f23b772d215bb43d5f7b3e173 (diff)
Tidy operator<= for libdcp::Time somewhat. Change subtitles_at to subtitles_during as it's a better API for dcptocomps.
Diffstat (limited to 'src/subtitle_asset.cc')
-rw-r--r--src/subtitle_asset.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/subtitle_asset.cc b/src/subtitle_asset.cc
index 89269fb0..acd40e9b 100644
--- a/src/subtitle_asset.cc
+++ b/src/subtitle_asset.cc
@@ -216,11 +216,11 @@ SubtitleAsset::maybe_add_subtitle (string text, ParseState const & parse_state)
}
list<shared_ptr<Subtitle> >
-SubtitleAsset::subtitles_at (Time t) const
+SubtitleAsset::subtitles_during (Time from, Time to) const
{
list<shared_ptr<Subtitle> > s;
for (list<shared_ptr<Subtitle> >::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
- if ((*i)->in() <= t && t <= (*i)->out ()) {
+ if ((*i)->out() >= from && (*i)->in() <= to) {
s.push_back (*i);
}
}