Fix horribly broken LV2 event implementation (ticket #378 among other problems).

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2061 a436a847-0d15-0410-975c-d299462d15a1

1 files changed, 7 insertions, 12 deletions

diff --git a/src/engine/InputPort.cpp b/src/engine/InputPort.cpp
index 9b10580f..c42de5c6 100644
--- a/src/engine/InputPort.cpp
+++ b/src/engine/InputPort.cpp
@@ -210,21 +210,15 @@ InputPort::pre_process(ProcessContext& context)
 	if ( ! _fixed_buffers) {
 		// If only one connection, try to use buffer directly (zero copy)
 		if (can_direct()) {
-			for (uint32_t i=0; i < _poly; ++i) {
-				_buffers->at(i)->join(_connections.front()->buffer(i));
-				_connections.front()->buffer(i)->prepare_read(context.start(), context.nframes());
-				_buffers->at(i)->prepare_read(context.start(), context.nframes());
-			}
 			do_mixdown = false;
+			for (uint32_t i=0; i < _poly; ++i)
+				_buffers->at(i)->join(_connections.front()->buffer(i));
 		}
 		connect_buffers();
 	} else {
 		do_mixdown = true;
 	}
 
-	for (uint32_t i=0; i < _poly; ++i)
-		buffer(i)->prepare_read(context.start(), context.nframes());
-
 	/*cerr << path() << " poly = " << _poly << ", mixdown: " << do_mixdown
 		<< ", fixed buffers: " << _fixed_buffers << ", joined: " << _buffers->at(0)->is_joined()
 		<< " to " << _buffers->at(0)->joined_buffer() << endl;*/
@@ -237,10 +231,8 @@ InputPort::pre_process(ProcessContext& context)
 					<< ", joined: " << _buffers->at(i)->is_joined() << endl;*/
 
 	if (!do_mixdown) {
-		/*#ifndef NDEBUG
 		for (uint32_t i=0; i < _poly; ++i)
-			assert(buffer(i) == _connections.front()->buffer(i));
-		#endif*/
+			buffer(i)->prepare_read(context.start(), context.nframes());
 		return;
 	}
 
@@ -266,8 +258,11 @@ InputPort::pre_process(ProcessContext& context)
 			cerr << "WARNING: MIDI mixing not implemented, only first connection used." << endl;
 
 		// Copy first connection
-		_buffers->at(0)->copy(_connections.front()->buffer(0), 0, _buffer_size-1);
+		buffer(0)->copy(_connections.front()->buffer(0), 0, _buffer_size-1);
 	}
+
+	for (uint32_t i=0; i < _poly; ++i)
+		buffer(i)->prepare_read(context.start(), context.nframes());
 }