From 58e8d1cddd520ae0ddf39f16210f1500868a2b2e Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 14 Aug 2008 04:03:14 +0000 Subject: Lock RDF world mutex in all places slv2 or redland is accessed (fix random segfaults usually on patch loading). git-svn-id: http://svn.drobilla.net/lad/ingen@1367 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/engine/NodeBase.cpp | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) (limited to 'src/libs/engine/NodeBase.cpp') diff --git a/src/libs/engine/NodeBase.cpp b/src/libs/engine/NodeBase.cpp index a6bfa9ce..f8891f68 100644 --- a/src/libs/engine/NodeBase.cpp +++ b/src/libs/engine/NodeBase.cpp @@ -122,9 +122,14 @@ NodeBase::apply_poly(Raul::Maid& maid, uint32_t poly) if (!_polyphonic) return true; - if (_ports) - for (size_t i=0; i < _ports->size(); ++i) - _ports->at(i)->apply_poly(maid, poly); + for (size_t i=0; i < num_ports(); ++i) { + _ports->at(i)->apply_poly(maid, poly); + assert(_ports->at(i)->poly() == poly); + } + + for (uint32_t i=0; i < num_ports(); ++i) + for (uint32_t j=0; j < _polyphony; ++j) + set_port_buffer(j, i, _ports->at(i)->buffer(j)); return true; } @@ -202,9 +207,21 @@ NodeBase::pre_process(ProcessContext& context) assert(ThreadManager::current_thread_id() == THREAD_PROCESS); // Mix down any ports with multiple inputs - if (_ports) - for (size_t i=0; i < _ports->size(); ++i) - _ports->at(i)->pre_process(context); + for (size_t i=0; i < num_ports(); ++i) + _ports->at(i)->pre_process(context); + + // Connect port buffers (FIXME: NOT NECESSARY!) + if (polyphonic()) { + for (uint32_t i=0; i < _polyphony; ++i) { + for (uint32_t j=0; j < num_ports(); ++j) { + assert(_ports->at(j)->poly() == _polyphony); + set_port_buffer(i, j, _ports->at(j)->buffer(i)); + } + } + } else { + for (uint32_t j=0; j < num_ports(); ++j) + set_port_buffer(0, j, _ports->at(j)->buffer(0)); + } } -- cgit v1.2.1