From 6ae2018e81e7e81e4906e62dc6224ad34298d9c2 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 14 Nov 2009 20:44:40 +0000 Subject: Object extension. Port resize extension. Sensible extension(s) implementation design for Ingen. Replace string port extension support in Ingen with Object port extension. Implement port resize extension in Ingen. Some test plugins for this stuff. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2260 a436a847-0d15-0410-975c-d299462d15a1 --- src/engine/EventBuffer.cpp | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'src/engine/EventBuffer.cpp') diff --git a/src/engine/EventBuffer.cpp b/src/engine/EventBuffer.cpp index f8b97595..d92ecae1 100644 --- a/src/engine/EventBuffer.cpp +++ b/src/engine/EventBuffer.cpp @@ -18,10 +18,11 @@ #define __STDC_LIMIT_MACROS 1 #include #include -#include "ingen-config.h" -#include "EventBuffer.hpp" #include "event.lv2/event.h" #include "event.lv2/event-helpers.h" +#include "ingen-config.h" +#include "EventBuffer.hpp" +#include "ProcessContext.hpp" using namespace std; @@ -33,11 +34,11 @@ using namespace Shared; * \a capacity is in bytes (not number of events). */ EventBuffer::EventBuffer(size_t capacity) - : Buffer(DataType(DataType::EVENT), capacity) + : Buffer(DataType(DataType::EVENTS), capacity) , _local_buf(new LV2EventBuffer(capacity)) { _buf = _local_buf; - reset(0); + clear(); //cerr << "Creating MIDI Buffer " << _buf << ", capacity = " << _buf->capacity << endl; } @@ -71,22 +72,21 @@ EventBuffer::unjoin() void -EventBuffer::prepare_read(FrameTime start, SampleCount nframes) +EventBuffer::prepare_read(Context& context) { rewind(); - _this_nframes = nframes; } void -EventBuffer::prepare_write(FrameTime start, SampleCount nframes) +EventBuffer::prepare_write(Context& context) { - reset(nframes); + clear(); } -/** FIXME: parameters ignored */ + void -EventBuffer::copy(const Buffer* src_buf, size_t start_sample, size_t end_sample) +EventBuffer::copy(Context& context, const Buffer* src_buf) { const EventBuffer* src = dynamic_cast(src_buf); assert(src); @@ -97,7 +97,6 @@ EventBuffer::copy(const Buffer* src_buf, size_t start_sample, size_t end_sample) src->rewind(); _buf->copy(*src->_buf); - _this_nframes = end_sample - start_sample; assert(event_count() == src->event_count()); } @@ -114,7 +113,7 @@ EventBuffer::merge(const EventBuffer& a, const EventBuffer& b) // Die if a merge isn't necessary as it's expensive assert(a.size() > 0 && b.size() > 0); - reset(_this_nframes); + clear(); a.rewind(); b.rewind(); -- cgit v1.2.1