diff options
author | David Robillard <d@drobilla.net> | 2011-10-21 23:11:27 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2011-10-21 23:11:27 +0000 |
commit | d7bc67f9752a90abf165c875839294befb42ef90 (patch) | |
tree | 1b8bddf242f95592d2ed563cc14a49b511580870 /src/server/events/Disconnect.cpp | |
parent | 221b1bfaec0ba4a9b1067fd16e2fb100e60a93ba (diff) | |
download | ingen-d7bc67f9752a90abf165c875839294befb42ef90.tar.gz ingen-d7bc67f9752a90abf165c875839294befb42ef90.tar.bz2 ingen-d7bc67f9752a90abf165c875839294befb42ef90.zip |
Merge Request into Event.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3574 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server/events/Disconnect.cpp')
-rw-r--r-- | src/server/events/Disconnect.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/server/events/Disconnect.cpp b/src/server/events/Disconnect.cpp index 5fc723b5..aa5c4edb 100644 --- a/src/server/events/Disconnect.cpp +++ b/src/server/events/Disconnect.cpp @@ -32,7 +32,6 @@ #include "PatchImpl.hpp" #include "PortImpl.hpp" #include "ProcessContext.hpp" -#include "Request.hpp" #include "ThreadManager.hpp" #include "events/Disconnect.hpp" @@ -43,12 +42,13 @@ namespace Ingen { namespace Server { namespace Events { -Disconnect::Disconnect(Engine& engine, - SharedPtr<Request> request, - SampleCount timestamp, - const Raul::Path& src_port_path, - const Raul::Path& dst_port_path) - : Event(engine, request, timestamp) +Disconnect::Disconnect(Engine& engine, + ClientInterface* client, + int32_t id, + SampleCount timestamp, + const Raul::Path& src_port_path, + const Raul::Path& dst_port_path) + : Event(engine, client, id, timestamp) , _src_port_path(src_port_path) , _dst_port_path(dst_port_path) , _patch(NULL) @@ -227,8 +227,7 @@ void Disconnect::post_process() { if (_error == NO_ERROR) { - if (_request) - _request->respond_ok(); + respond_ok(); _engine.broadcaster()->disconnect(_src_port->path(), _dst_port->path()); } else { string msg("Unable to disconnect "); @@ -257,8 +256,7 @@ Disconnect::post_process() break; } msg.append(")"); - if (_request) - _request->respond_error(msg); + respond_error(msg); } delete _impl; |