Fix incorrect container size when loading a VF/OV combination into the player.

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

diff --git a/src/lib/audio_ring_buffers.cc b/src/lib/audio_ring_buffers.cc
index b4fea485e8d795ea79052139fffc6923551ac234..42115efa3e786835cfb7e62b20e31b80d8095f1f 100644 (file)
--- a/src/lib/audio_ring_buffers.cc
+++ b/src/lib/audio_ring_buffers.cc
@@ -22,6 +22,7 @@
 #include "dcpomatic_assert.h"
 #include "exceptions.h"
 #include <boost/foreach.hpp>
+#include <iostream>
 
 using std::min;
 using std::cout;
@@ -34,7 +35,7 @@ AudioRingBuffers::AudioRingBuffers ()
 }
 
 void
-AudioRingBuffers::put (shared_ptr<const AudioBuffers> data, DCPTime time)
+AudioRingBuffers::put (shared_ptr<const AudioBuffers> data)
 {
        boost::mutex::scoped_lock lm (_mutex);
 
@@ -43,10 +44,10 @@ AudioRingBuffers::put (shared_ptr<const AudioBuffers> data, DCPTime time)
        }
 
        _buffers.push_back (data);
-       _latest = time;
 }
 
-void
+/** @return true if there was an underrun, otherwise false */
+bool
 AudioRingBuffers::get (float* out, int channels, int frames)
 {
        boost::mutex::scoped_lock lm (_mutex);
@@ -59,7 +60,7 @@ AudioRingBuffers::get (float* out, int channels, int frames)
                                }
                        }
                        cout << "audio underrun; missing " << frames << "!\n";
-                       return;
+                       return true;
                }
 
                shared_ptr<const AudioBuffers> front = _buffers.front ();
@@ -83,6 +84,8 @@ AudioRingBuffers::get (float* out, int channels, int frames)
                        _used_in_head = 0;
                }
        }
+
+       return false;
 }
 
 void
@@ -91,11 +94,10 @@ AudioRingBuffers::clear ()
        boost::mutex::scoped_lock lm (_mutex);
        _buffers.clear ();
        _used_in_head = 0;
-       _latest = DCPTime ();
 }
 
 Frame
-AudioRingBuffers::size ()
+AudioRingBuffers::size () const
 {
        boost::mutex::scoped_lock lm (_mutex);
        Frame s = 0;