X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_ring_buffers.h;h=6fb84e0d76dc8684757827742d183943e7b62a51;hb=1a721b82d4094c00ee89574e17c58c23c0de8cdd;hp=bfaad5ec97074d0077ca9376bb636d4c4bdf55d0;hpb=c4403784febdbdd42e9c32e67fadb147f11fe566;p=dcpomatic.git diff --git a/src/lib/audio_ring_buffers.h b/src/lib/audio_ring_buffers.h index bfaad5ec9..6fb84e0d7 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 + Copyright (C) 2016-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,32 +18,39 @@ */ + #ifndef DCPOMATIC_AUDIO_RING_BUFFERS_H #define DCPOMATIC_AUDIO_RING_BUFFERS_H + #include "audio_buffers.h" #include "types.h" #include "dcpomatic_time.h" -#include #include #include -class AudioRingBuffers : public boost::noncopyable + +class AudioRingBuffers { public: AudioRingBuffers (); - void put (boost::shared_ptr data, dcpomatic::DCPTime time, int frame_rate); + AudioRingBuffers (AudioBuffers const&) = delete; + AudioRingBuffers& operator= (AudioBuffers const&) = delete; + + void put (std::shared_ptr data, dcpomatic::DCPTime time, int frame_rate); boost::optional get (float* out, int channels, int frames); boost::optional peek () const; void clear (); + /** @return number of frames currently available */ Frame size () const; private: mutable boost::mutex _mutex; - std::list, dcpomatic::DCPTime> > _buffers; - int _used_in_head; + std::list, dcpomatic::DCPTime>> _buffers; + int _used_in_head = 0; }; + #endif