fix compiler warnings.

[ardour.git] / libs / pbd / pbd / ringbuffer.h

diff --git a/libs/pbd/pbd/ringbuffer.h b/libs/pbd/pbd/ringbuffer.h
index a84ed73e7f951db51b84d53fbaac244873ceb72e..652457b4937ada5ff5b39ce67e7be054f10f15c1 100644 (file)
--- a/libs/pbd/pbd/ringbuffer.h
+++ b/libs/pbd/pbd/ringbuffer.h
@@ -30,14 +30,13 @@ class RingBuffer
        RingBuffer (guint sz) {
 //     size = ffs(sz); /* find first [bit] set is a single inlined assembly instruction. But it looks like the API rounds up so... */
        guint power_of_two;
-       for (power_of_two = 1; 1U<<power_of_two < sz; power_of_two++);
-               size = 1<<power_of_two;
-               size_mask = size;
-               size_mask -= 1;
-               buf = new T[size];
-               reset ();
-
-       };
+       for (power_of_two = 1; 1U<<power_of_two < sz; power_of_two++) {}
+       size = 1<<power_of_two;
+       size_mask = size;
+       size_mask -= 1;
+       buf = new T[size];
+       reset ();
+       }
        
        virtual ~RingBuffer() {
                delete [] buf;
@@ -56,7 +55,7 @@ class RingBuffer
        }
        
        guint read  (T *dest, guint cnt);
-       guint write (T *src,  guint cnt);
+       guint write (T const * src,  guint cnt);
 
        struct rw_vector {
            T *buf[2];
@@ -159,7 +158,7 @@ RingBuffer<T>::read (T *dest, guint cnt)
 }
 
 template<class T> guint
-RingBuffer<T>::write (T *src, guint cnt)
+RingBuffer<T>::write (T const *src, guint cnt)
 
 {
         guint free_cnt;
@@ -234,6 +233,7 @@ RingBuffer<T>::get_read_vector (RingBuffer<T>::rw_vector *vec)
                
                vec->buf[0] = &buf[r];
                vec->len[0] = free_cnt;
+               vec->buf[1] = 0;
                vec->len[1] = 0;
        }
 }