From acaab5ca7ce6869b8192de4f98c9f075fd17690e Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Tue, 24 May 2011 23:29:42 +0000
Subject: Remove dependence on protocol-specific client headers in GUI code.

In other words, remove need for protocol-specific (and library dependent) headers to be in public headers...


git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3318 a436a847-0d15-0410-975c-d299462d15a1
---
 src/client/ingen_client.cpp | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'src/client/ingen_client.cpp')

diff --git a/src/client/ingen_client.cpp b/src/client/ingen_client.cpp
index dc4d7f20..db32b117 100644
--- a/src/client/ingen_client.cpp
+++ b/src/client/ingen_client.cpp
@@ -20,9 +20,11 @@
 #include "shared/Module.hpp"
 #include "shared/World.hpp"
 #ifdef HAVE_LIBLO
+#include "OSCClientReceiver.hpp"
 #include "OSCEngineSender.hpp"
 #endif
 #ifdef HAVE_SOUP
+#include "HTTPClientReceiver.hpp"
 #include "HTTPEngineSender.hpp"
 #endif
 
@@ -30,10 +32,14 @@ using namespace Ingen;
 
 #ifdef HAVE_LIBLO
 SharedPtr<Ingen::ServerInterface>
-new_osc_interface(Ingen::Shared::World* world, const std::string& url)
+new_osc_interface(Ingen::Shared::World*      world,
+                  const std::string&         url,
+                  SharedPtr<ClientInterface> respond_to)
 {
-	Client::OSCEngineSender* oes = Client::OSCEngineSender::create(
-		url, world->conf()->option("packet-size").get_int32());
+	SharedPtr<Client::OSCClientReceiver> receiver(
+		new Client::OSCClientReceiver(16181, respond_to));
+	Client::OSCEngineSender* oes = new Client::OSCEngineSender(
+		url, world->conf()->option("packet-size").get_int32(), receiver);
 	oes->attach(rand(), true);
 	return SharedPtr<ServerInterface>(oes);
 }
@@ -41,9 +47,14 @@ new_osc_interface(Ingen::Shared::World* world, const std::string& url)
 
 #ifdef HAVE_SOUP
 SharedPtr<Ingen::ServerInterface>
-new_http_interface(Ingen::Shared::World* world, const std::string& url)
+new_http_interface(Ingen::Shared::World*      world,
+                   const std::string&         url,
+                   SharedPtr<ClientInterface> respond_to)
 {
-	Client::HTTPEngineSender* hes = new Client::HTTPEngineSender(world, url);
+	SharedPtr<Client::HTTPClientReceiver> receiver(
+		new Client::HTTPClientReceiver(world, url, respond_to));
+	Client::HTTPEngineSender* hes = new Client::HTTPEngineSender(
+		world, url, receiver);
 	hes->attach(rand(), true);
 	return SharedPtr<ServerInterface>(hes);
 }
-- 
cgit v1.2.1