Move ScopeGuard into libdcp.

[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 1a216ab33749399fadf51b24eb3392a3b3ee895d..d21f20968d5d087d5e668d95b6cbff6cd1ad1cbf 100644 (file)
--- a/src/lib/audio_ring_buffers.cc
+++ b/src/lib/audio_ring_buffers.cc
@@ -75,7 +75,6 @@ AudioRingBuffers::get (float* out, int channels, int frames)
                                        *out++ = 0;
                                }
                        }
-                       cout << "audio underrun; missing " << frames << "!\n";
                        return time;
                }
 
@@ -85,7 +84,7 @@ AudioRingBuffers::get (float* out, int channels, int frames)
                }
 
                int const to_do = min (frames, front.first->frames() - _used_in_head);
-               float** p = front.first->data();
+               float* const* p = front.first->data();
                int const c = min (front.first->channels(), channels);
                for (int i = 0; i < to_do; ++i) {
                        for (int j = 0; j < c; ++j) {