C++11 tidying.

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

diff --git a/src/lib/shuffler.h b/src/lib/shuffler.h
index 3eed3e4f005a1db2bfb92d80d91a07877a127c4d..2b37b70a11149a7d84394134bb8583d273451aec 100644 (file)
--- 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,33 @@
 
 */
 
+
 #include "types.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;
 };