X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_ring_buffers.h;h=47fda01f7fd7b9c503a84d6cffc7c2dde60b15a3;hb=6cac49dc50dae6b173135df101d532f20031ca70;hp=f728247fe8aa5213ec4fd72a1b2729922cbff0ce;hpb=4f9cb03792e85cbb5b4d554ab8ec0a3275fa7524;p=dcpomatic.git

diff --git a/src/lib/video_ring_buffers.h b/src/lib/video_ring_buffers.h
index f728247fe..47fda01f7 100644
--- a/src/lib/video_ring_buffers.h
+++ b/src/lib/video_ring_buffers.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,28 +18,38 @@
 
 */
 
+
 #include "dcpomatic_time.h"
 #include "player_video.h"
 #include "types.h"
-#include <boost/noncopyable.hpp>
 #include <boost/thread/mutex.hpp>
-#include <boost/shared_ptr.hpp>
 #include <utility>
 
+
+class Film;
 class PlayerVideo;
 
-class VideoRingBuffers : public boost::noncopyable
+
+class VideoRingBuffers
 {
 public:
-	void put (boost::shared_ptr<PlayerVideo> frame, DCPTime time);
-	std::pair<boost::shared_ptr<PlayerVideo>, DCPTime> get ();
+	VideoRingBuffers () {}
+
+	VideoRingBuffers (VideoRingBuffers const&) = delete;
+	VideoRingBuffers& operator= (VideoRingBuffers const&) = delete;
+
+	void put (std::shared_ptr<PlayerVideo> frame, dcpomatic::DCPTime time);
+	std::pair<std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> get ();
 
 	void clear ();
 	Frame size () const;
+	bool empty () const;
+
+	void reset_metadata (std::shared_ptr<const Film> film, dcp::Size player_video_container_size);
 
-	boost::optional<DCPTime> latest () const;
+	std::pair<size_t, std::string> memory_used () const;
 
 private:
 	mutable boost::mutex _mutex;
-	std::list<std::pair<boost::shared_ptr<PlayerVideo>, DCPTime> > _data;
+	std::list<std::pair<std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime>> _data;
 };