From b31244ce2606961195b53a8ede61238abcefa69b Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 10 Feb 2008 00:04:37 +0000 Subject: Update LV2 event stuff. Update LV2 UI stuff. git-svn-id: http://svn.drobilla.net/lad/ingen@1141 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/engine/EventBuffer.cpp | 84 +++++++++++++---------------------------- src/libs/engine/EventBuffer.hpp | 21 +++++++---- 2 files changed, 40 insertions(+), 65 deletions(-) diff --git a/src/libs/engine/EventBuffer.cpp b/src/libs/engine/EventBuffer.cpp index 28417c31..a9a6c938 100644 --- a/src/libs/engine/EventBuffer.cpp +++ b/src/libs/engine/EventBuffer.cpp @@ -20,6 +20,7 @@ #include #include "EventBuffer.hpp" #include "lv2ext/lv2_event.h" +#include "lv2ext/lv2_event_helpers.h" using namespace std; @@ -70,9 +71,10 @@ EventBuffer::join(Buffer* buf) { EventBuffer* mbuf = dynamic_cast(buf); if (mbuf) { - _position = mbuf->_position; _buf = mbuf->local_data(); _joined_buf = mbuf; + _iter = mbuf->_iter; + _iter.buf = _buf; return false; } else { return false; @@ -134,21 +136,11 @@ EventBuffer::copy(const Buffer* src_buf, size_t start_sample, size_t end_sample) bool EventBuffer::increment() const { - if (_position + sizeof(LV2_Event) >= _buf->size) { - _position = _buf->size; - return false; - } - - const LV2_Event* ev = (const LV2_Event*)(_buf + sizeof(LV2_Event_Buffer) + _position); - - _position += sizeof(LV2_Event) + ev->size; - - if (_position >= _buf->size) { - _position = _buf->size; - return false; - } else { - ev = (const LV2_Event*)(_buf + sizeof(LV2_Event_Buffer) + _position); + if (lv2_event_is_valid(&_iter)) { + lv2_event_increment(&_iter); return true; + } else { + return false; } } @@ -167,36 +159,23 @@ EventBuffer::append(uint32_t frames, uint16_t size, const uint8_t* data) { - /*cerr << "Append event " << size << " bytes @ " << timestamp << ":" << endl; - for (uint32_t i=0; i < size; ++i) { - fprintf(stderr, "( %X )", *((uint8_t*)data + i)); - }*/ +#ifndef NDEBUG + LV2_Event* last_event = lv2_event_get(&_iter, NULL); + assert(last_event->frames < frames + || (last_event->frames == frames && last_event->subframes <= subframes)); +#endif - if (_buf->capacity - _buf->size < sizeof(LV2_Event) + size) - return false; + bool ret = lv2_event_is_valid(&_iter); + if (ret) + ret = lv2_event_write(&_iter, frames, subframes, type, size, data); - assert(size > 0); - assert(frames > _latest_frames - || (frames == _latest_frames && subframes >= _latest_subframes)); - - LV2_Event* ev = (LV2_Event*)(_buf + sizeof(LV2_Event_Buffer) + _position); - _position += sizeof(LV2_Event) + ev->size; + if (!ret) + cerr << "ERROR: Failed to write event." << endl; - ev = (LV2_Event*)(_buf + sizeof(LV2_Event_Buffer) + _position); - - ev->frames = frames; - ev->subframes = subframes; - ev->type = type; - ev->size = size; - memcpy((uint8_t*)ev + sizeof(LV2_Event), data, size); - - _buf->size += sizeof(LV2_Event) + size; - ++_buf->event_count; - _latest_frames = frames; _latest_subframes = subframes; - - return true; + + return ret; } @@ -211,25 +190,16 @@ EventBuffer::get_event(uint32_t* frames, uint16_t* size, uint8_t** data) const { - const LV2_Event_Buffer* const buf = this->data(); - - if (_position >= buf->size) { - _position = buf->size; - *size = 0; - *data = NULL; + if (lv2_event_is_valid(&_iter)) { + LV2_Event* ev = lv2_event_get(&_iter, data); + *frames = ev->frames; + *subframes = ev->subframes; + *type = ev->type; + *size = ev->size; + return true; + } else { return false; } - - const LV2_Event* const ev = (const LV2_Event*) - (_buf + sizeof(LV2_Event_Buffer) + _position); - - *frames = ev->frames; - *subframes = ev->subframes; - *type = ev->type; - *size = ev->size; - *data = (uint8_t*)ev + sizeof(LV2_Event); - - return true; } diff --git a/src/libs/engine/EventBuffer.hpp b/src/libs/engine/EventBuffer.hpp index 0f8ce485..97ec484c 100644 --- a/src/libs/engine/EventBuffer.hpp +++ b/src/libs/engine/EventBuffer.hpp @@ -20,6 +20,7 @@ #include #include +#include #include "Buffer.hpp" #include "interface/DataType.hpp" @@ -52,15 +53,15 @@ public: void copy(const Buffer* src, size_t start_sample, size_t end_sample); - inline void rewind() const { _position = 0; } + inline void rewind() const { lv2_event_begin(&_iter, _buf); } inline void clear() { reset(_this_nframes); } inline void reset(SampleCount nframes) { //std::cerr << this << " reset" << std::endl; _latest_frames = 0; _latest_subframes = 0; - _position = sizeof(LV2_Event_Buffer); _buf->event_count = 0; _buf->size = 0; + rewind(); } bool increment() const; @@ -83,12 +84,16 @@ public: bool merge(const EventBuffer& a, const EventBuffer& b); private: - uint32_t _latest_frames; ///< Latest time of all events (frames) - uint32_t _latest_subframes; ///< Latest time of all events (subframes) - uint32_t _this_nframes; ///< Current cycle nframes - mutable uint32_t _position; ///< Offset into _buf - LV2_Event_Buffer* _buf; ///< Contents (maybe belong to _joined_buf) - LV2_Event_Buffer* _local_buf; ///< Local contents + LV2_Event_Buffer* _buf; ///< Contents (maybe belong to _joined_buf) + LV2_Event_Buffer* _local_buf; ///< Local contents + + mutable LV2_Event_Iterator _iter; ///< Iterator into _buf + + uint32_t _latest_frames; ///< Latest time of all events (frames) + uint32_t _latest_subframes; ///< Latest time of all events (subframes) + uint32_t _this_nframes; ///< Current cycle nframes + + }; -- cgit v1.2.1