diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-04 11:43:55 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-04 11:43:55 +0100 |
| commit | 9655db97eae5a6137a45ad809dbf42528dc74408 (patch) | |
| tree | 178ecd2e313ceb6aa7d11fbadb950c53381f1280 /src/lib/subtitle_decoder.cc | |
| parent | c88a8a6ec6b396dc90d40a4843160d616a45db76 (diff) | |
Add 'starting' option to subtitles_during().
Diffstat (limited to 'src/lib/subtitle_decoder.cc')
| -rw-r--r-- | src/lib/subtitle_decoder.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc index b8cb3e5c8..e1485e221 100644 --- a/src/lib/subtitle_decoder.cc +++ b/src/lib/subtitle_decoder.cc @@ -49,10 +49,10 @@ SubtitleDecoder::text_subtitle (list<dcp::SubtitleString> s) template <class T> list<T> -SubtitleDecoder::get (list<T> const & subs, ContentTimePeriod period) +SubtitleDecoder::get (list<T> const & subs, ContentTimePeriod period, bool starting) { - /* Get the full periods of the subtitles that are showing during the specified period */ - list<ContentTimePeriod> sp = subtitles_during (period); + /* Get the full periods of the subtitles that are showing or starting during the specified period */ + list<ContentTimePeriod> sp = subtitles_during (period, starting); if (sp.empty ()) { /* Nothing in this period */ return list<T> (); @@ -74,7 +74,7 @@ SubtitleDecoder::get (list<T> const & subs, ContentTimePeriod period) list<T> out; for (typename list<T>::const_iterator i = subs.begin(); i != subs.end(); ++i) { - if (i->period().overlaps (period)) { + if ((starting && period.contains (i->period().from)) || (!starting && period.overlaps (i->period ()))) { out.push_back (*i); } } @@ -83,15 +83,15 @@ SubtitleDecoder::get (list<T> const & subs, ContentTimePeriod period) } list<ContentTextSubtitle> -SubtitleDecoder::get_text_subtitles (ContentTimePeriod period) +SubtitleDecoder::get_text_subtitles (ContentTimePeriod period, bool starting) { - return get<ContentTextSubtitle> (_decoded_text_subtitles, period); + return get<ContentTextSubtitle> (_decoded_text_subtitles, period, starting); } list<ContentImageSubtitle> -SubtitleDecoder::get_image_subtitles (ContentTimePeriod period) +SubtitleDecoder::get_image_subtitles (ContentTimePeriod period, bool starting) { - return get<ContentImageSubtitle> (_decoded_image_subtitles, period); + return get<ContentImageSubtitle> (_decoded_image_subtitles, period, starting); } void |