diff options
author | David Robillard <d@drobilla.net> | 2010-02-26 01:39:16 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2010-02-26 01:39:16 +0000 |
commit | 52e49500bb78974d43bdfd30b2ec9b2a4522dd25 (patch) | |
tree | 44a5a46e946c6b43b657ca5733a165943dd947ae /src/engine/PatchImpl.cpp | |
parent | 3d6b047cd19baf9bf5a81b4fe16e1e9e53ed8fef (diff) | |
download | ingen-52e49500bb78974d43bdfd30b2ec9b2a4522dd25.tar.gz ingen-52e49500bb78974d43bdfd30b2ec9b2a4522dd25.tar.bz2 ingen-52e49500bb78974d43bdfd30b2ec9b2a4522dd25.zip |
Perform all mixing for an audio input in a single mix operation (instead of a two step polyphony mixdown (by connections) and connections mixdown (by ports)).
Speed up and inline AudioBuffer::accumulate, to speed up mix().
Remove local buffer from Connection (always mix into destination InputPort's buffers).
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2494 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/engine/PatchImpl.cpp')
-rw-r--r-- | src/engine/PatchImpl.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/engine/PatchImpl.cpp b/src/engine/PatchImpl.cpp index 309ac3f8..c5327e44 100644 --- a/src/engine/PatchImpl.cpp +++ b/src/engine/PatchImpl.cpp @@ -111,8 +111,9 @@ PatchImpl::prepare_internal_poly(BufferFactory& bufs, uint32_t poly) for (List<NodeImpl*>::iterator i = _nodes.begin(); i != _nodes.end(); ++i) (*i)->prepare_poly(bufs, poly); - for (Connections::iterator i = _connections.begin(); i != _connections.end(); ++i) - ((ConnectionImpl*)i->second.get())->prepare_poly(bufs, poly); + for (List<NodeImpl*>::iterator i = _nodes.begin(); i != _nodes.end(); ++i) + for (uint32_t j = 0; j < (*i)->num_ports(); ++j) + (*i)->port_impl(j)->prepare_poly_buffers(bufs); return true; } @@ -128,13 +129,10 @@ PatchImpl::apply_internal_poly(ProcessContext& context, BufferFactory& bufs, Rau for (List<NodeImpl*>::iterator i = _nodes.begin(); i != _nodes.end(); ++i) (*i)->apply_poly(maid, poly); - for (Connections::iterator i = _connections.begin(); i != _connections.end(); ++i) - ((ConnectionImpl*)i->second.get())->apply_poly(maid, poly); - for (List<NodeImpl*>::iterator i = _nodes.begin(); i != _nodes.end(); ++i) { for (uint32_t j = 0; j < (*i)->num_ports(); ++j) { PortImpl* const port = (*i)->port_impl(j); - if (port->is_input() && dynamic_cast<InputPort*>(port)->num_connections() == 1) + if (port->is_input() && dynamic_cast<InputPort*>(port)->direct_connect()) port->setup_buffers(bufs, port->poly()); port->connect_buffers(context.offset()); } |