diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2011-03-26 19:01:12 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-03-26 19:01:12 +0000 |
commit | ea9979b4b9b2b0b5d3b50b58b518b0562198fefb (patch) | |
tree | 74608202cc90b520b492405470abff5d99cac9e7 /libs/pbd | |
parent | e25bff1a346993d39baf2d523b1e247227866362 (diff) |
remove Evoral::RingBuffer, which was (a) duplicating PBD::RingBufferNPT and (b) broken; replace it with PBD::RingBufferNPT
git-svn-id: svn://localhost/ardour2/branches/3.0@9212 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/pbd')
-rw-r--r-- | libs/pbd/pbd/abstract_ui.h | 4 | ||||
-rw-r--r-- | libs/pbd/pbd/ringbufferNPT.h | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/libs/pbd/pbd/abstract_ui.h b/libs/pbd/pbd/abstract_ui.h index 0ee61eb7e1..7eb2320230 100644 --- a/libs/pbd/pbd/abstract_ui.h +++ b/libs/pbd/pbd/abstract_ui.h @@ -47,11 +47,11 @@ class AbstractUI : public BaseUI Glib::Mutex request_buffer_map_lock; protected: - struct RequestBuffer : public RingBufferNPT<RequestObject> { + struct RequestBuffer : public PBD::RingBufferNPT<RequestObject> { bool dead; AbstractUI<RequestObject>& ui; RequestBuffer (uint32_t size, AbstractUI<RequestObject>& uir) - : RingBufferNPT<RequestObject> (size) + : PBD::RingBufferNPT<RequestObject> (size) , dead (false) , ui (uir) {} }; diff --git a/libs/pbd/pbd/ringbufferNPT.h b/libs/pbd/pbd/ringbufferNPT.h index 2b6aa03d62..0aed05355d 100644 --- a/libs/pbd/pbd/ringbufferNPT.h +++ b/libs/pbd/pbd/ringbufferNPT.h @@ -25,6 +25,8 @@ #include <cstring> #include <glib.h> +namespace PBD { + /* ringbuffer class where the element size is not required to be a power of two */ template<class T> @@ -54,7 +56,7 @@ class RingBufferNPT } size_t read (T *dest, size_t cnt); - size_t write (T *src, size_t cnt); + size_t write (const T *src, size_t cnt); struct rw_vector { T *buf[2]; @@ -156,7 +158,7 @@ RingBufferNPT<T>::read (T *dest, size_t cnt) } template<class T> size_t -RingBufferNPT<T>::write (T *src, size_t cnt) +RingBufferNPT<T>::write (const T *src, size_t cnt) { size_t free_cnt; size_t cnt2; @@ -271,4 +273,6 @@ RingBufferNPT<T>::get_write_vector (RingBufferNPT<T>::rw_vector *vec) } } +} /* namespace */ + #endif /* __ringbuffer_npt_h__ */ |