From 161d33090fdf8db67aa8c3a84b2cea01d8b9ac9e Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 20 May 2008 03:55:46 +0000 Subject: Write individual events from UIs over OSC instead of entire event buffer. git-svn-id: http://svn.drobilla.net/lad/ingen@1221 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/engine/EventBuffer.cpp | 1 - src/libs/engine/InputPort.cpp | 13 ++++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'src/libs/engine') diff --git a/src/libs/engine/EventBuffer.cpp b/src/libs/engine/EventBuffer.cpp index d11989ab..c9b4f249 100644 --- a/src/libs/engine/EventBuffer.cpp +++ b/src/libs/engine/EventBuffer.cpp @@ -102,7 +102,6 @@ void EventBuffer::prepare_read(SampleCount nframes) { //cerr << "\t" << this << " prepare_read: " << event_count() << endl; - rewind(); _this_nframes = nframes; } diff --git a/src/libs/engine/InputPort.cpp b/src/libs/engine/InputPort.cpp index 6e216384..7a90bc21 100644 --- a/src/libs/engine/InputPort.cpp +++ b/src/libs/engine/InputPort.cpp @@ -20,6 +20,7 @@ #include #include #include "AudioBuffer.hpp" +#include "EventBuffer.hpp" #include "ConnectionImpl.hpp" #include "OutputPort.hpp" #include "NodeImpl.hpp" @@ -184,17 +185,19 @@ InputPort::pre_process(ProcessContext& context) /*cerr << path() << " poly = " << _poly << ", mixdown: " << do_mixdown << ", fixed buffers: " << _fixed_buffers << ", joined: " << _buffers->at(0)->is_joined() - << " to " << _buffers->at(0)->joined_buffer() << endl; + << " to " << _buffers->at(0)->joined_buffer() << endl;*/ - if (type() == DataType::MIDI) + /*if (type() == DataType::EVENT) for (uint32_t i=0; i < _poly; ++i) - cerr << path() << " (" << buffer(i) << ") # events: " << ((MidiBuffer*)buffer(i))->event_count() << ", joined: " << _buffers->at(i)->is_joined() << endl;*/ + cerr << path() << " (" << buffer(i) << ") # events: " + << ((EventBuffer*)buffer(i))->event_count() + << ", joined: " << _buffers->at(i)->is_joined() << endl;*/ if (!do_mixdown) { -/*#ifndef NDEBUG + /*#ifndef NDEBUG for (uint32_t i=0; i < _poly; ++i) assert(buffer(i) == (*_connections.begin())->buffer(i)); -#endif*/ + #endif*/ return; } -- cgit v1.2.1