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...

1 files changed, 2 insertions, 7 deletions

diff --git a/src/lib/shuffler.h b/src/lib/shuffler.h
index 54e13d486..2c1d0677f 100644
--- a/src/lib/shuffler.h
+++ b/src/lib/shuffler.h
@@ -20,23 +20,18 @@
 
 #include "types.h"
 #include "content_video.h"
+#include "video_adjuster.h"
 #include <boost/signals2.hpp>
 
 class Piece;
 
-class Shuffler
+class Shuffler : public VideoAdjuster
 {
 public:
 	void clear ();
-	void flush ();
 
 	void video (boost::weak_ptr<Piece>, ContentVideo video);
-	boost::signals2::signal<void (boost::weak_ptr<Piece>, ContentVideo)> Video;
-
-	typedef std::pair<boost::weak_ptr<Piece>, ContentVideo> Store;
 
 private:
-
 	boost::optional<ContentVideo> _last;
-	std::list<Store> _store;
 };