Use plain git hash for VERSION when there is no exact tag.

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

diff --git a/src/lib/video_ring_buffers.h b/src/lib/video_ring_buffers.h
index 832837d9422a59fe1a2cbd063f953ab740dd4a30..1514e9bbd2e23e58a7c9b4989abca99e0706a6c6 100644 (file)
--- a/src/lib/video_ring_buffers.h
+++ b/src/lib/video_ring_buffers.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,10 +18,13 @@
 
 */
 
+
+#ifndef DCPOMATIC_VIDEO_RING_BUFFERS_H
+#define DCPOMATIC_VIDEO_RING_BUFFERS_H
+
+
 #include "dcpomatic_time.h"
 #include "player_video.h"
-#include "types.h"
-#include <boost/noncopyable.hpp>
 #include <boost/thread/mutex.hpp>
 #include <utility>
 
@@ -30,9 +33,14 @@ class Film;
 class PlayerVideo;
 
 
-class VideoRingBuffers : public boost::noncopyable
+class VideoRingBuffers
 {
 public:
+       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 ();
 
@@ -46,5 +54,8 @@ public:
 
 private:
        mutable boost::mutex _mutex;
-       std::list<std::pair<std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> > _data;
+       std::list<std::pair<std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime>> _data;
 };
+
+
+#endif