Add empty playlist list and configuration option.

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

diff --git a/src/lib/audio_ring_buffers.h b/src/lib/audio_ring_buffers.h
index cec7c712aee24d663bc2de8dc8859e47568f23fa..53236cb3226f508a46d04b21272ff882dcb0c4e7 100644 (file)
--- a/src/lib/audio_ring_buffers.h
+++ b/src/lib/audio_ring_buffers.h
@@ -34,20 +34,14 @@ public:
        AudioRingBuffers ();
 
        void put (boost::shared_ptr<const AudioBuffers> data, DCPTime time);
-       void get (float* out, int channels, int frames);
+       boost::optional<DCPTime> get (float* out, int channels, int frames);
 
        void clear ();
-       Frame size ();
-
-       DCPTime latest () const {
-               boost::mutex::scoped_lock lm (_mutex);
-               return _latest;
-       }
+       Frame size () const;
 
 private:
        mutable boost::mutex _mutex;
-       std::list<boost::shared_ptr<const AudioBuffers> > _buffers;
-       DCPTime _latest;
+       std::list<std::pair<boost::shared_ptr<const AudioBuffers>, DCPTime> > _buffers;
        int _used_in_head;
 };