Set up seek position correctly when a seek skips over a reel in

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

diff --git a/src/lib/active_subtitles.cc b/src/lib/active_subtitles.cc
index 457f096431553b30ae277eadf3349e3298b5a0ab..bc34a89424b7464af3428ac0285d60d1db2f550a 100644 (file)
--- a/src/lib/active_subtitles.cc
+++ b/src/lib/active_subtitles.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2017-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -29,9 +29,14 @@ using std::pair;
 using std::make_pair;
 using boost::weak_ptr;
 using boost::shared_ptr;
+using boost::optional;
 
+/** Get the subtitles that should be burnt into a given period.
+ *  @param period Period of interest.
+ *  @param always_burn_subtitles Always burn subtitles even if their content is not set to burn.
+ */
 list<PlayerSubtitles>
-ActiveSubtitles::get (DCPTime time, bool always_burn_subtitles) const
+ActiveSubtitles::get_burnt (DCPTimePeriod period, bool always_burn_subtitles) const
 {
        list<PlayerSubtitles> ps;
 
@@ -43,11 +48,14 @@ ActiveSubtitles::get (DCPTime time, bool always_burn_subtitles) const
                }
 
                if (!piece->content->subtitle->use() || (!always_burn_subtitles && !piece->content->subtitle->burn())) {
+                       /* Not burning this piece */
                        continue;
                }
 
                BOOST_FOREACH (Period j, i->second) {
-                       if (j.from <= time && (!j.to || j.to.get() > time)) {
+                       DCPTimePeriod test (j.from, j.to.get_value_or(DCPTime::max()));
+                       optional<DCPTimePeriod> overlap = period.overlap (test);
+                       if (overlap && overlap->duration() > DCPTime(period.duration().get() / 2)) {
                                ps.push_back (j.subs);
                        }
                }
@@ -56,6 +64,9 @@ ActiveSubtitles::get (DCPTime time, bool always_burn_subtitles) const
        return ps;
 }
 
+/** Remove subtitles that finish before a given time from our list.
+ *  @param time Time to remove before.
+ */
 void
 ActiveSubtitles::clear_before (DCPTime time)
 {
@@ -74,6 +85,11 @@ ActiveSubtitles::clear_before (DCPTime time)
        _data = updated;
 }
 
+/** Add a new subtitle with a from time.
+ *  @param piece Piece that the subtitle is from.
+ *  @param ps Subtitles.
+ *  @param from From time for these subtitles.
+ */
 void
 ActiveSubtitles::add_from (weak_ptr<Piece> piece, PlayerSubtitles ps, DCPTime from)
 {
@@ -83,6 +99,11 @@ ActiveSubtitles::add_from (weak_ptr<Piece> piece, PlayerSubtitles ps, DCPTime fr
        _data[piece].push_back (Period (ps, from));
 }
 
+/** Add the to time for the last subtitle added from a piece.
+ *  @param piece Piece that the subtitle is from.
+ *  @param to To time for the last subtitle submitted to add_from for this piece.
+ *  @return Return the corresponding subtitles and their from time.
+ */
 pair<PlayerSubtitles, DCPTime>
 ActiveSubtitles::add_to (weak_ptr<Piece> piece, DCPTime to)
 {
@@ -97,6 +118,9 @@ ActiveSubtitles::add_to (weak_ptr<Piece> piece, DCPTime to)
        return make_pair (_data[piece].back().subs, _data[piece].back().from);
 }
 
+/** @param piece A piece.
+ *  @return true if we have any active subtitles from this piece.
+ */
 bool
 ActiveSubtitles::have (weak_ptr<Piece> piece) const
 {