diff options
Diffstat (limited to 'src/server/events/Connect.cpp')
-rw-r--r-- | src/server/events/Connect.cpp | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/src/server/events/Connect.cpp b/src/server/events/Connect.cpp index 39438d43..edd004c3 100644 --- a/src/server/events/Connect.cpp +++ b/src/server/events/Connect.cpp @@ -56,7 +56,6 @@ Connect::Connect(Engine& engine, , _src_output_port(NULL) , _dst_input_port(NULL) , _compiled_patch(NULL) - , _port_listnode(NULL) , _buffers(NULL) {} @@ -129,8 +128,6 @@ Connect::pre_process() _connection = SharedPtr<ConnectionImpl>( new ConnectionImpl(*_engine.buffer_factory(), _src_output_port, _dst_input_port)); - _port_listnode = new InputPort::Connections::Node(_connection); - rlock.release(); { @@ -149,13 +146,9 @@ Connect::pre_process() _dst_input_port->increment_num_connections(); } - /*if ((_dst_input_port->num_connections() == 1 - && (_connection->must_mix() || _connection->must_queue())) - || _dst_input_port->num_connections() == 2) {*/ - _buffers = new Raul::Array<BufferFactory::Ref>(_dst_input_port->poly()); - _dst_input_port->get_buffers(*_engine.buffer_factory(), - _buffers, _dst_input_port->poly()); - //} + _buffers = new Raul::Array<BufferFactory::Ref>(_dst_input_port->poly()); + _dst_input_port->get_buffers(*_engine.buffer_factory(), + _buffers, _dst_input_port->poly()); if (_patch->enabled()) _compiled_patch = _patch->compile(); @@ -170,12 +163,9 @@ Connect::execute(ProcessContext& context) if (_error == NO_ERROR) { // This must be inserted here, since they're actually used by the audio thread - _dst_input_port->add_connection(_port_listnode); + _dst_input_port->add_connection(_connection.get()); assert(_buffers); - //if (_buffers) - _engine.maid()->push(_dst_input_port->set_buffers(_buffers)); - //else - // _dst_input_port->setup_buffers(*_engine.buffer_factory(), _dst_input_port->poly()); + _engine.maid()->push(_dst_input_port->set_buffers(_buffers)); _dst_input_port->connect_buffers(); _engine.maid()->push(_patch->compiled_patch()); _patch->compiled_patch(_compiled_patch); |