From 188e34375827915a9832ddb1db4b94494bbee455 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Wed, 1 Aug 2007 14:10:46 +0000
Subject: Clean up engine/client interfaces. Hide Response, now an internal
 engine implementation detail (and not a problem for script bindings anymore).

git-svn-id: http://svn.drobilla.net/lad/ingen@666 a436a847-0d15-0410-975c-d299462d15a1
---
 src/libs/gui/App.cpp           |  2 ++
 src/libs/gui/ConnectWindow.cpp | 19 +++++++------------
 src/libs/gui/ConnectWindow.hpp |  2 +-
 3 files changed, 10 insertions(+), 13 deletions(-)

(limited to 'src/libs/gui')

diff --git a/src/libs/gui/App.cpp b/src/libs/gui/App.cpp
index add26d8c..c2d835f3 100644
--- a/src/libs/gui/App.cpp
+++ b/src/libs/gui/App.cpp
@@ -138,6 +138,8 @@ App::attach(const SharedPtr<EngineInterface>& engine, const SharedPtr<SigClientI
 	assert( ! _client);
 	assert( ! _store);
 	assert( ! _loader);
+
+	engine->register_client(client.get());
 	
 	_engine = engine;
 	_client = client;
diff --git a/src/libs/gui/ConnectWindow.cpp b/src/libs/gui/ConnectWindow.cpp
index f5a3fdea..2b986b37 100644
--- a/src/libs/gui/ConnectWindow.cpp
+++ b/src/libs/gui/ConnectWindow.cpp
@@ -26,7 +26,6 @@
 #include "interface/EngineInterface.hpp"
 #include "engine/tuning.hpp"
 #include "engine/Engine.hpp"
-#include "engine/DirectResponder.hpp"
 #include "engine/QueuedEngineInterface.hpp"
 #include "client/OSCClientReceiver.hpp"
 #include "client/OSCEngineSender.hpp"
@@ -118,12 +117,10 @@ ConnectWindow::start(SharedPtr<Ingen::Engine> engine, SharedPtr<Shared::EngineIn
 		ThreadedSigClientInterface* tsci = new ThreadedSigClientInterface(Ingen::event_queue_size);
 		SharedPtr<SigClientInterface> client(tsci);
 		
-		if (interface) {
-			App::instance().attach(interface, client);
-			interface->set_responder(SharedPtr<Ingen::Shared::Responder>(new Ingen::DirectResponder(tsci, 1)));
-		}
-
 		engine->activate();
+		
+		if (interface)
+			App::instance().attach(interface, client);
 
 		_connect_stage = 0;
 
@@ -254,9 +251,6 @@ ConnectWindow::connect()
 		
 		App::instance().attach(engine_interface, client);
 
-		engine_interface->set_responder(SharedPtr<Ingen::Shared::Responder>(
-                    new Ingen::DirectResponder(tsci, 1)));
-
 		_engine->activate();
 
 		Glib::signal_timeout().connect(
@@ -357,8 +351,9 @@ ConnectWindow::gtk_callback()
 		_progress_label->set_text("Connecting to engine...");
 		present();
 
-		App::instance().client()->response_sig.connect(sigc::mem_fun(this, &ConnectWindow::response_received));
-
+		App::instance().client()->response_ok_sig.connect(
+				sigc::mem_fun(this, &ConnectWindow::response_ok_received));
+		
 		_ping_id = rand();
 		while (_ping_id == -1)
 			_ping_id = rand();
@@ -387,7 +382,7 @@ ConnectWindow::gtk_callback()
 		// FIXME
 		//auto_ptr<ClientInterface> client(new ThreadedSigClientInterface();
 		// FIXME: client URI
-		App::instance().engine()->register_client("", App::instance().client().get());
+		App::instance().engine()->register_client(App::instance().client().get());
 		App::instance().engine()->load_plugins();
 		++_connect_stage;
 	} else if (_connect_stage == 3) {
diff --git a/src/libs/gui/ConnectWindow.hpp b/src/libs/gui/ConnectWindow.hpp
index f8cd8db8..086da446 100644
--- a/src/libs/gui/ConnectWindow.hpp
+++ b/src/libs/gui/ConnectWindow.hpp
@@ -54,7 +54,7 @@ public:
 	
 	void set_connected_to(SharedPtr<Shared::EngineInterface> e=SharedPtr<Shared::EngineInterface>());
 	void start(SharedPtr<Ingen::Engine> engine, SharedPtr<Shared::EngineInterface> interface);
-	void response_received(int32_t id, bool, string) { if ((id) == _ping_id) _attached = true; }
+	void response_ok_received(int32_t id) { if ((id) == _ping_id) _attached = true; }
 
 private:
 	enum Mode { CONNECT_REMOTE, LAUNCH_REMOTE, INTERNAL };
-- 
cgit v1.2.1