From fa8d43dab70a975be9af7aebaac8eba682c2048e Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 23 Dec 2012 00:06:21 +0000 Subject: Use more sensible URI scheme for Ingen paths. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4889 a436a847-0d15-0410-975c-d299462d15a1 --- src/gui/App.cpp | 2 +- src/gui/ConnectWindow.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/gui') diff --git a/src/gui/App.cpp b/src/gui/App.cpp index b458bc3c..389020e2 100644 --- a/src/gui/App.cpp +++ b/src/gui/App.cpp @@ -197,7 +197,7 @@ void App::request_plugins_if_necessary() { if (!_requested_plugins) { - _world->interface()->get(Raul::URI("ingen:plugins")); + _world->interface()->get(Raul::URI("ingen:/plugins")); _requested_plugins = true; } } diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp index 7951b479..36827489 100644 --- a/src/gui/ConnectWindow.cpp +++ b/src/gui/ConnectWindow.cpp @@ -255,7 +255,7 @@ ConnectWindow::disconnect() void ConnectWindow::activate() { - _app->interface()->set_property(Raul::URI("ingen:driver"), + _app->interface()->set_property(Raul::URI("ingen:/driver"), _app->uris().ingen_enabled, _app->forge().make(true)); } @@ -263,7 +263,7 @@ ConnectWindow::activate() void ConnectWindow::deactivate() { - _app->interface()->set_property(Raul::URI("ingen:driver"), + _app->interface()->set_property(Raul::URI("ingen:/driver"), _app->uris().ingen_enabled, _app->forge().make(false)); } @@ -390,7 +390,7 @@ ConnectWindow::gtk_callback() _ping_id = g_random_int(); _app->interface()->set_response_id(_ping_id); - _app->interface()->get(Raul::URI("ingen:engine")); + _app->interface()->get(Raul::URI("ingen:/engine")); if (_widgets_loaded) { _progress_label->set_text("Connecting to engine..."); @@ -407,7 +407,7 @@ ConnectWindow::gtk_callback() (now.tv_usec - last.tv_usec) * 0.001f; if (ms_since_last > 1000) { _app->interface()->set_response_id(_ping_id); - _app->interface()->get(Raul::URI("ingen:engine")); + _app->interface()->get(Raul::URI("ingen:/engine")); last = now; } } @@ -423,14 +423,14 @@ ConnectWindow::gtk_callback() if (root) { set_connected_to(_app->interface()); _app->window_factory()->present_graph(root); - _app->interface()->get(Raul::URI("ingen:plugins")); + _app->interface()->get(Raul::URI("ingen:/plugins")); if (_widgets_loaded) _progress_label->set_text(string("Loading plugins...")); ++_connect_stage; } } } else if (_connect_stage == 4) { - _app->interface()->get(Raul::URI("ingen:plugins")); + _app->interface()->get(Raul::URI("ingen:/plugins")); hide(); if (_widgets_loaded) _progress_label->set_text("Connected to engine"); -- cgit v1.2.1