Fix implementation of delay in 7758260; it needs to apply to

anything passed to emit_video(), not just things that come from
decoders.

1 files changed, 7 insertions, 3 deletions

diff --git a/src/lib/shuffler.h b/src/lib/shuffler.h
index 2c1d0677f..3eed3e4f0 100644
--- a/src/lib/shuffler.h
+++ b/src/lib/shuffler.h
@@ -20,18 +20,22 @@
 
 #include "types.h"
 #include "content_video.h"
-#include "video_adjuster.h"
 #include <boost/signals2.hpp>
 
 class Piece;
 
-class Shuffler : public VideoAdjuster
+class Shuffler
 {
 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:
+	std::list<Store> _store;
 	boost::optional<ContentVideo> _last;
 };