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/Connect.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/Connect.cpp')
-rw-r--r-- | src/server/events/Connect.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/server/events/Connect.cpp b/src/server/events/Connect.cpp index c8858961..aae84b39 100644 --- a/src/server/events/Connect.cpp +++ b/src/server/events/Connect.cpp @@ -34,7 +34,6 @@ #include "PatchImpl.hpp" #include "PortImpl.hpp" #include "ProcessContext.hpp" -#include "Request.hpp" #include "types.hpp" using namespace std; @@ -44,12 +43,13 @@ namespace Ingen { namespace Server { namespace Events { -Connect::Connect(Engine& engine, - SharedPtr<Request> request, - SampleCount timestamp, - const Path& src_port_path, - const Path& dst_port_path) - : Event(engine, request, timestamp) +Connect::Connect(Engine& engine, + ClientInterface* client, + int32_t id, + SampleCount timestamp, + const Path& src_port_path, + const Path& dst_port_path) + : Event(engine, client, id, timestamp) , _src_port_path(src_port_path) , _dst_port_path(dst_port_path) , _patch(NULL) @@ -177,7 +177,7 @@ Connect::post_process() { std::ostringstream ss; if (_error == NO_ERROR) { - _request->respond_ok(); + respond_ok(); _engine.broadcaster()->connect(_src_port_path, _dst_port_path); return; } @@ -202,7 +202,7 @@ Connect::post_process() ss << "Unknown error"; } ss << ")"; - _request->respond_error(ss.str()); + respond_error(ss.str()); } } // namespace Events |