summaryrefslogtreecommitdiff
path: root/src/lib/audio_ring_buffers.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-02-16 10:40:12 +0100
committerCarl Hetherington <cth@carlh.net>2021-02-16 10:40:12 +0100
commitbb949ec65adf95f4a2c7dd5ee7e97b9daaaf3d3f (patch)
tree09153b297f7cebd3f13ab58188982366185298f6 /src/lib/audio_ring_buffers.h
parent39d51cddeeea82e602ab1925430b0dfb5752ac79 (diff)
C++11 tidying.
Diffstat (limited to 'src/lib/audio_ring_buffers.h')
-rw-r--r--src/lib/audio_ring_buffers.h13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/lib/audio_ring_buffers.h b/src/lib/audio_ring_buffers.h
index 2cfc0a30b..be8a616e2 100644
--- a/src/lib/audio_ring_buffers.h
+++ b/src/lib/audio_ring_buffers.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2016-2019 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2016-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
@@ -18,20 +18,26 @@
*/
+
#ifndef DCPOMATIC_AUDIO_RING_BUFFERS_H
#define DCPOMATIC_AUDIO_RING_BUFFERS_H
+
#include "audio_buffers.h"
#include "types.h"
#include "dcpomatic_time.h"
#include <boost/thread.hpp>
#include <list>
-class AudioRingBuffers : public boost::noncopyable
+
+class AudioRingBuffers
{
public:
AudioRingBuffers ();
+ AudioRingBuffers (AudioBuffers const&) = delete;
+ AudioRingBuffers& operator= (AudioBuffers const&) = delete;
+
void put (std::shared_ptr<const AudioBuffers> data, dcpomatic::DCPTime time, int frame_rate);
boost::optional<dcpomatic::DCPTime> get (float* out, int channels, int frames);
boost::optional<dcpomatic::DCPTime> peek () const;
@@ -42,7 +48,8 @@ public:
private:
mutable boost::mutex _mutex;
std::list<std::pair<std::shared_ptr<const AudioBuffers>, dcpomatic::DCPTime> > _buffers;
- int _used_in_head;
+ int _used_in_head = 0;
};
+
#endif