Add Piece::seek().

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

diff --git a/src/lib/player.cc b/src/lib/player.cc
index e99eb9daee2c87285af5b1ba83e8ec384ba527d5..5951e179db8b9da964762b47efde1d413fce7b5d 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -610,7 +610,7 @@ Player::pass ()
                        /* Given two choices at the same time, pick the one with texts so we see it before
                           the video.
                        */
-                       if (!earliest_time || t < *earliest_time || (t == *earliest_time && !i->decoder->text.empty())) {
+                       if (!earliest_time || t < *earliest_time || (t == *earliest_time && i->has_text())) {
                                earliest_time = t;
                                earliest_content = i;
                        }
@@ -1090,22 +1090,7 @@ Player::seek (DCPTime time, bool accurate)
        }
 
        for (auto i: _pieces) {
-               if (time < i->position()) {
-                       /* Before; seek to the start of the content.  Even if this request is for an inaccurate seek
-                          we must seek this (following) content accurately, otherwise when we come to the end of the current
-                          content we may not start right at the beginning of the next, causing a gap (if the next content has
-                          been trimmed to a point between keyframes, or something).
-                       */
-                       i->decoder->seek (i->dcp_to_content_time(i->position(), _film), true);
-                       i->done = false;
-               } else if (i->position() <= time && time < i->end(_film)) {
-                       /* During; seek to position */
-                       i->decoder->seek (i->dcp_to_content_time(time, _film), accurate);
-                       i->done = false;
-               } else {
-                       /* After; this piece is done */
-                       i->done = true;
-               }
+               i->seek (_film, time, accurate);
        }
 
        if (accurate) {