summaryrefslogtreecommitdiff
path: root/src/lib/shuffler.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-02-20 23:34:59 +0000
committerCarl Hetherington <cth@carlh.net>2018-02-20 23:37:24 +0000
commita0eff2446835a2a29d751a4810fe182c486a2eb6 (patch)
tree3a6b9e6c6724d2356c97c2cf14810ef79c85af53 /src/lib/shuffler.cc
parentd920b12b4d05fa1b0e95e1178ee21c671e0ae431 (diff)
Add a 2-frame `delay' on content arriving at the player to give
subtitle content the chance to catch up. Fixes problems observed when overlaying a DCP subtitle onto an existing DCP and then seeking into the first subtitle. After the seek the decoder positions were: DCP: 0. subtitle: first subtitle time. This causes the DCP decoder to be pass()ed first and so the subtitle for the video frame has not arrived yet. I hope this does not cause unpredicted side effects...
Diffstat (limited to 'src/lib/shuffler.cc')
-rw-r--r--src/lib/shuffler.cc9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/lib/shuffler.cc b/src/lib/shuffler.cc
index 84bf98ed2..4b8474ab3 100644
--- a/src/lib/shuffler.cc
+++ b/src/lib/shuffler.cc
@@ -78,13 +78,6 @@ Shuffler::video (weak_ptr<Piece> weak_piece, ContentVideo video)
void
Shuffler::clear ()
{
+ VideoAdjuster::clear ();
_last = optional<ContentVideo>();
}
-
-void
-Shuffler::flush ()
-{
- BOOST_FOREACH (Store i, _store) {
- Video (i.first, i.second);
- }
-}