From a0eff2446835a2a29d751a4810fe182c486a2eb6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 20 Feb 2018 23:34:59 +0000 Subject: 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... --- src/lib/shuffler.cc | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src/lib/shuffler.cc') 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 weak_piece, ContentVideo video) void Shuffler::clear () { + VideoAdjuster::clear (); _last = optional(); } - -void -Shuffler::flush () -{ - BOOST_FOREACH (Store i, _store) { - Video (i.first, i.second); - } -} -- cgit v1.2.3