Move luminance to Interop/SMPTE metadata and remove the ISDCF metadata dialogue.

[dcpomatic.git] / src / lib / shuffler.h

diff --git a/src/lib/shuffler.h b/src/lib/shuffler.h
index 2c1d0677f9747000de688cf5e70428b8e744e996..b0a416b80f33edb9957919f6dc82d4cc1e6ef3eb 100644 (file)
--- a/src/lib/shuffler.h
+++ b/src/lib/shuffler.h
@@ -20,18 +20,27 @@
 
 #include "types.h"
 #include "content_video.h"
-#include "video_adjuster.h"
 #include <boost/signals2.hpp>
 
+struct shuffler_test5;
+
 class Piece;
 
-class Shuffler : public VideoAdjuster
+class Shuffler
 {
 public:
        void clear ();
+       void flush ();
+       void video (std::weak_ptr<Piece>, ContentVideo video);
+
+       boost::signals2::signal<void (std::weak_ptr<Piece>, ContentVideo)> Video;
 
-       void video (boost::weak_ptr<Piece>, ContentVideo video);
+       typedef std::pair<std::weak_ptr<Piece>, ContentVideo> Store;
 
 private:
+       friend struct ::shuffler_test5;
+
+       std::list<Store> _store;
        boost::optional<ContentVideo> _last;
+       static int const _max_size;
 };