From 1776fe75458a11eeaa5ed0c26c6c9aa0e93f6f2c Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 18 Apr 2011 03:30:02 +0000 Subject: Saner module loading API. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3157 a436a847-0d15-0410-975c-d299462d15a1 --- src/gui/App.cpp | 2 +- src/gui/ConnectWindow.cpp | 4 ++-- src/gui/ThreadedLoader.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/gui') 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 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 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(); } -- cgit v1.2.1