Remove activity from interface and use set_property() instead.

Move client registration stuff to Engine and remove corresponding events.
Simply response ID interface.


git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4066 a436a847-0d15-0410-975c-d299462d15a1

2 files changed, 6 insertions, 3 deletions

diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index e23ef5a6..5ef4575d 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -159,7 +159,9 @@ App::attach(SharedPtr<SigClientInterface> client)
 	assert(!_store);
 	assert(!_loader);
 
-	_world->engine()->register_client(client.get());
+	if (_world->local_engine()) {
+		_world->local_engine()->register_client(client->uri(), client.get());
+	}
 
 	_client = client;
 	_store  = SharedPtr<ClientStore>(new ClientStore(_world->uris(), _world->engine(), client));
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index b14e388e..2d1516cd 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -380,7 +380,7 @@ ConnectWindow::gtk_callback()
 			sigc::mem_fun(this, &ConnectWindow::ingen_response));
 
 		_ping_id = abs(rand()) / 2 * 2; // avoid -1
-		_app->engine()->respond_to(_app->client().get(), _ping_id);
+		_app->engine()->set_response_id(_ping_id);
 		_app->engine()->ping();
 
 		if (_widgets_loaded) {
@@ -397,12 +397,13 @@ ConnectWindow::gtk_callback()
 			const float ms_since_last = (now.tv_sec - last.tv_sec) * 1000.0f +
 				(now.tv_usec - last.tv_usec) * 0.001f;
 			if (ms_since_last > 1000) {
-				_app->engine()->respond_to(_app->client().get(), _ping_id);
+				_app->engine()->set_response_id(_ping_id);
 				_app->engine()->ping();
 				last = now;
 			}
 		}
 	} else if (_connect_stage == 2) {
+		_app->engine()->get("ingen:engine");
 		_app->engine()->get(Path("/"));
 		if (_widgets_loaded)
 			_progress_label->set_text(string("Requesting root patch..."));