summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/server/ConnectionImpl.cpp7
-rw-r--r--src/server/ConnectionImpl.hpp10
-rw-r--r--src/server/events/Connect.cpp2
3 files changed, 8 insertions, 11 deletions
diff --git a/src/server/ConnectionImpl.cpp b/src/server/ConnectionImpl.cpp
index 9bb0d4f5..006a157d 100644
--- a/src/server/ConnectionImpl.cpp
+++ b/src/server/ConnectionImpl.cpp
@@ -41,11 +41,10 @@ namespace Server {
* This handles both polyphonic and monophonic nodes, transparently to the
* user (InputPort).
*/
-ConnectionImpl::ConnectionImpl(BufferFactory& bufs, PortImpl* src_port, PortImpl* dst_port)
- : _queue(NULL)
- , _bufs(bufs)
- , _src_port(src_port)
+ConnectionImpl::ConnectionImpl(PortImpl* src_port, PortImpl* dst_port)
+ : _src_port(src_port)
, _dst_port(dst_port)
+ , _queue(NULL)
, _pending_disconnection(false)
{
assert(src_port);
diff --git a/src/server/ConnectionImpl.hpp b/src/server/ConnectionImpl.hpp
index 35441d7d..36eb545f 100644
--- a/src/server/ConnectionImpl.hpp
+++ b/src/server/ConnectionImpl.hpp
@@ -59,7 +59,7 @@ class ConnectionImpl : public Raul::Deletable
, public boost::intrusive::list_base_hook<>
{
public:
- ConnectionImpl(BufferFactory& bufs, PortImpl* src_port, PortImpl* dst_port);
+ ConnectionImpl(PortImpl* src_port, PortImpl* dst_port);
PortImpl* src_port() const { return _src_port; }
PortImpl* dst_port() const { return _dst_port; }
@@ -97,12 +97,10 @@ public:
protected:
void dump() const;
+ PortImpl* const _src_port;
+ PortImpl* const _dst_port;
Raul::RingBuffer* _queue;
-
- BufferFactory& _bufs;
- PortImpl* const _src_port;
- PortImpl* const _dst_port;
- bool _pending_disconnection;
+ bool _pending_disconnection;
};
} // namespace Server
diff --git a/src/server/events/Connect.cpp b/src/server/events/Connect.cpp
index edd004c3..551b3a29 100644
--- a/src/server/events/Connect.cpp
+++ b/src/server/events/Connect.cpp
@@ -126,7 +126,7 @@ Connect::pre_process()
}
_connection = SharedPtr<ConnectionImpl>(
- new ConnectionImpl(*_engine.buffer_factory(), _src_output_port, _dst_input_port));
+ new ConnectionImpl(_src_output_port, _dst_input_port));
rlock.release();