From d7bc67f9752a90abf165c875839294befb42ef90 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Fri, 21 Oct 2011 23:11:27 +0000
Subject: Merge Request into Event.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3574 a436a847-0d15-0410-975c-d299462d15a1
---
 src/server/events/UnregisterClient.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'src/server/events/UnregisterClient.cpp')

diff --git a/src/server/events/UnregisterClient.cpp b/src/server/events/UnregisterClient.cpp
index e5ba1b4f..64c37fb8 100644
--- a/src/server/events/UnregisterClient.cpp
+++ b/src/server/events/UnregisterClient.cpp
@@ -16,7 +16,6 @@
  */
 
 #include "ingen/ClientInterface.hpp"
-#include "Request.hpp"
 #include "UnregisterClient.hpp"
 #include "Engine.hpp"
 #include "ClientBroadcaster.hpp"
@@ -27,8 +26,12 @@ namespace Ingen {
 namespace Server {
 namespace Events {
 
-UnregisterClient::UnregisterClient(Engine& engine, SharedPtr<Request> request, SampleCount timestamp, const URI& uri)
-	: Event(engine, request, timestamp)
+UnregisterClient::UnregisterClient(Engine&          engine,
+                                   ClientInterface* client,
+                                   int32_t          id,
+                                   SampleCount      timestamp,
+                                   const URI&       uri)
+	: Event(engine, client, id, timestamp)
 	, _uri(uri)
 {
 }
@@ -37,9 +40,9 @@ void
 UnregisterClient::post_process()
 {
 	if (_engine.broadcaster()->unregister_client(_uri))
-		_request->respond_ok();
+		respond_ok();
 	else
-		_request->respond_error("Unable to unregister client");
+		respond_error("Unable to unregister client");
 }
 
 } // namespace Server
-- 
cgit v1.2.1