summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-12-23 00:06:21 +0000
committerDavid Robillard <d@drobilla.net>2012-12-23 00:06:21 +0000
commitfa8d43dab70a975be9af7aebaac8eba682c2048e (patch)
tree4088b328260cb7fc75b0b1211879158752114103 /src/gui
parentf7b865f9ff03b0796ba3c2732b69f70a24faa4d4 (diff)
downloadingen-fa8d43dab70a975be9af7aebaac8eba682c2048e.tar.gz
ingen-fa8d43dab70a975be9af7aebaac8eba682c2048e.tar.bz2
ingen-fa8d43dab70a975be9af7aebaac8eba682c2048e.zip
Use more sensible URI scheme for Ingen paths.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4889 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/App.cpp2
-rw-r--r--src/gui/ConnectWindow.cpp12
2 files changed, 7 insertions, 7 deletions
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");