summaryrefslogtreecommitdiffstats
path: root/src/server/events/Get.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-10-21 23:11:27 +0000
committerDavid Robillard <d@drobilla.net>2011-10-21 23:11:27 +0000
commitd7bc67f9752a90abf165c875839294befb42ef90 (patch)
tree1b8bddf242f95592d2ed563cc14a49b511580870 /src/server/events/Get.cpp
parent221b1bfaec0ba4a9b1067fd16e2fb100e60a93ba (diff)
downloadingen-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/Get.cpp')
-rw-r--r--src/server/events/Get.cpp32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/server/events/Get.cpp b/src/server/events/Get.cpp
index 7cb85db4..c13054dc 100644
--- a/src/server/events/Get.cpp
+++ b/src/server/events/Get.cpp
@@ -23,7 +23,6 @@
#include "Get.hpp"
#include "ObjectSender.hpp"
#include "PluginImpl.hpp"
-#include "Request.hpp"
using namespace Raul;
@@ -31,11 +30,12 @@ namespace Ingen {
namespace Server {
namespace Events {
-Get::Get(Engine& engine,
- SharedPtr<Request> request,
- SampleCount timestamp,
- const URI& uri)
- : Event(engine, request, timestamp)
+Get::Get(Engine& engine,
+ ClientInterface* client,
+ int32_t id,
+ SampleCount timestamp,
+ const URI& uri)
+ : Event(engine, client, id, timestamp)
, _uri(uri)
, _object(NULL)
, _plugin(NULL)
@@ -63,23 +63,23 @@ void
Get::post_process()
{
if (_uri == "ingen:plugins") {
- _request->respond_ok();
- if (_request->client()) {
- _engine.broadcaster()->send_plugins_to(_request->client(), _plugins);
+ respond_ok();
+ if (_request_client) {
+ _engine.broadcaster()->send_plugins_to(_request_client, _plugins);
}
} else if (!_object && !_plugin) {
- _request->respond_error("Unable to find object requested.");
- } else if (_request->client()) {
- _request->respond_ok();
- if (_request->client()) {
+ respond_error("Unable to find object requested.");
+ } else if (_request_client) {
+ respond_ok();
+ if (_request_client) {
if (_object) {
- ObjectSender::send_object(_request->client(), _object, true);
+ ObjectSender::send_object(_request_client, _object, true);
} else if (_plugin) {
- _request->client()->put(_uri, _plugin->properties());
+ _request_client->put(_uri, _plugin->properties());
}
}
} else {
- _request->respond_error("Unable to find client to send object.");
+ respond_error("Unable to find client to send object.");
}
_lock.release();