X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fshuffler.h;h=476f571b4571d88fef4d14eba5e5aaf56afef15d;hb=ff639b3cf30afcc097bfd21d39c8d15f466cadd6;hp=80754a5e0b2854f7058e29aa8e7cf02bf5de3252;hpb=af7fe636291ee7f75f86b19d55713a595b24636c;p=dcpomatic.git

diff --git a/src/lib/shuffler.h b/src/lib/shuffler.h
index 80754a5e0..476f571b4 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,24 +18,31 @@
 
 */
 
-#include "types.h"
+
+#ifndef DCPOMATIC_SHUFFLER_H
+#define DCPOMATIC_SHUFFLER_H
+
+
 #include "content_video.h"
+#include "types.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;
@@ -44,3 +51,7 @@ private:
 	boost::optional<ContentVideo> _last;
 	static int const _max_size;
 };
+
+
+#endif
+