summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-04-18 03:30:02 +0000
committerDavid Robillard <d@drobilla.net>2011-04-18 03:30:02 +0000
commit1776fe75458a11eeaa5ed0c26c6c9aa0e93f6f2c (patch)
tree16f09c2b731d2968a9b2390cf938d164d2920541 /src/gui
parentad02810bb505e823ed7222c785649f668baaa404 (diff)
downloadingen-1776fe75458a11eeaa5ed0c26c6c9aa0e93f6f2c.tar.gz
ingen-1776fe75458a11eeaa5ed0c26c6c9aa0e93f6f2c.tar.bz2
ingen-1776fe75458a11eeaa5ed0c26c6c9aa0e93f6f2c.zip
Saner module loading API.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3157 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/App.cpp2
-rw-r--r--src/gui/ConnectWindow.cpp4
-rw-r--r--src/gui/ThreadedLoader.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index a70014fa..5462116a 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -196,7 +196,7 @@ SharedPtr<Serialiser>
App::serialiser()
{
if (!_world->serialiser())
- _world->load("ingen_serialisation");
+ _world->load_module("serialisation");
return _world->serialiser();
}
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index 8c5a654a..19e5594b 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -242,12 +242,12 @@ ConnectWindow::connect(bool existing)
#endif // defined(HAVE_LIBLO) || defined(HAVE_SOUP)
if (_mode == INTERNAL) {
if (!world->local_engine())
- world->load("ingen_engine");
+ world->load_module("engine");
SharedPtr<SigClientInterface> client(new SigClientInterface());
if (!((Engine*)world->local_engine().get())->driver())
- world->load("ingen_jack");
+ world->load_module("jack");
world->local_engine()->activate();
diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp
index 86d249a6..5338b7ee 100644
--- a/src/gui/ThreadedLoader.cpp
+++ b/src/gui/ThreadedLoader.cpp
@@ -47,7 +47,7 @@ ThreadedLoader::parser()
Ingen::Shared::World* world = App::instance().world();
if (!world->parser())
- world->load("ingen_serialisation");
+ world->load_module("serialisation");
return world->parser();
}