X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fshuffler.h;h=4d1404560f2dc09ce597273a15b825d3b9137042;hb=678dd30fea0434c6febe4badc47e7aa05ebe58bc;hp=7ac300b478335a9c8e3d24c6708c650944e0626a;hpb=27fbe80bccafe744ca3f96129c9e582f39921891;p=dcpomatic.git

diff --git a/src/lib/shuffler.h b/src/lib/shuffler.h
index 7ac300b47..4d1404560 100644
--- a/src/lib/shuffler.h
+++ b/src/lib/shuffler.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,25 +18,39 @@
 
 */
 
-#include "types.h"
+
+#ifndef DCPOMATIC_SHUFFLER_H
+#define DCPOMATIC_SHUFFLER_H
+
+
 #include "content_video.h"
 #include <boost/signals2.hpp>
 
+
+struct shuffler_test5;
+
 class Piece;
 
+
 class Shuffler
 {
 public:
 	void clear ();
 	void flush ();
-	void video (boost::weak_ptr<Piece>, ContentVideo video);
+	void video (std::weak_ptr<Piece>, ContentVideo video);
 
-	boost::signals2::signal<void (boost::weak_ptr<Piece>, ContentVideo)> Video;
+	boost::signals2::signal<void (std::weak_ptr<Piece>, ContentVideo)> Video;
 
-	typedef std::pair<boost::weak_ptr<Piece>, ContentVideo> Store;
+	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;
 };
+
+
+#endif
+