diff options
author | David Robillard <d@drobilla.net> | 2018-01-21 14:28:34 +0100 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2018-01-21 14:29:15 +0100 |
commit | ac778d258e0866d1117aadf576de2ff89df3e84d (patch) | |
tree | 1670fc3a66ec9a4493264421b27e845ef0d65b3d /src/server/Buffer.hpp | |
parent | 95e74234a923dcd7bd7c43f76919c61cf46b4e69 (diff) | |
download | ingen-ac778d258e0866d1117aadf576de2ff89df3e84d.tar.gz ingen-ac778d258e0866d1117aadf576de2ff89df3e84d.tar.bz2 ingen-ac778d258e0866d1117aadf576de2ff89df3e84d.zip |
Clean up Buffer class and factor out allocation
Diffstat (limited to 'src/server/Buffer.hpp')
-rw-r--r-- | src/server/Buffer.hpp | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/src/server/Buffer.hpp b/src/server/Buffer.hpp index 6d42b979..a95fcd3c 100644 --- a/src/server/Buffer.hpp +++ b/src/server/Buffer.hpp @@ -47,6 +47,9 @@ public: bool external = false, void* buf = nullptr); + Buffer(const Buffer&) = delete; + Buffer& operator=(const Buffer&) = delete; + void clear(); void resize(uint32_t capacity); void copy(const RunContext& context, const Buffer* src); @@ -204,6 +207,8 @@ public: void set_buffer(void* buf) { assert(_external); _buf = buf; } + static void* aligned_alloc(size_t size); + template<typename T> const T* get() const { return reinterpret_cast<const T*>(_buf); } template<typename T> T* get() { return reinterpret_cast<T*>(_buf); } @@ -215,28 +220,22 @@ public: } } -protected: - BufferFactory& _factory; - void* _buf; - LV2_URID _type; - LV2_URID _value_type; - uint32_t _capacity; - int64_t _latest_event; - - BufferRef _value_buffer; ///< Value buffer for numeric sequences - +private: friend class BufferFactory; ~Buffer(); -private: - Buffer(const Buffer&) = delete; - Buffer& operator=(const Buffer&) = delete; - void recycle(); - Buffer* _next; ///< Intrusive linked list for BufferFactory - std::atomic<unsigned> _refs; ///< Intrusive reference count - bool _external; ///< Buffer is externally allocated + BufferFactory& _factory; + Buffer* _next; ///< Intrusive linked list for BufferFactory + void* _buf; ///< Actual buffer memory + BufferRef _value_buffer; ///< Value buffer for numeric sequences + int64_t _latest_event; + LV2_URID _type; + LV2_URID _value_type; + uint32_t _capacity; + std::atomic<unsigned> _refs; ///< Intrusive reference count + bool _external; ///< Buffer is externally allocated }; } // namespace Server |