diff options
| author | David Robillard <d@drobilla.net> | 2012-05-11 01:29:18 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2012-05-11 01:29:18 +0000 |
| commit | e77d4fcf31bfdad0b34e184e4743b4750848472c (patch) | |
| tree | dd3e9aa6d8b8d1e54cae56138ab25f92eba8624a /src/server/ingen_jack.cpp | |
| parent | 00957dd74a97252d9a790141cb7f475573da1a91 (diff) | |
| download | ingen-e77d4fcf31bfdad0b34e184e4743b4750848472c.tar.gz ingen-e77d4fcf31bfdad0b34e184e4743b4750848472c.tar.bz2 ingen-e77d4fcf31bfdad0b34e184e4743b4750848472c.zip | |
Use more reasonable names for the world's interface and engine (if present).
Don't require separate Configuration initialisation from World (simplify API).
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4343 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server/ingen_jack.cpp')
| -rw-r--r-- | src/server/ingen_jack.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/server/ingen_jack.cpp b/src/server/ingen_jack.cpp index f47cbff2..a1f068fe 100644 --- a/src/server/ingen_jack.cpp +++ b/src/server/ingen_jack.cpp @@ -26,19 +26,19 @@ using namespace Ingen; struct IngenJackModule : public Ingen::Shared::Module { void load(Ingen::Shared::World* world) { - if (((Server::Engine*)world->local_engine().get())->driver()) { + if (((Server::Engine*)world->engine().get())->driver()) { Raul::warn << "Engine already has a driver" << std::endl; return; } Server::JackDriver* driver = new Server::JackDriver( - *(Server::Engine*)world->local_engine().get()); - const Raul::Configuration::Value& s = world->conf()->option("jack-server"); + *(Server::Engine*)world->engine().get()); + const Raul::Configuration::Value& s = world->conf().option("jack-server"); const std::string server_name = s.is_valid() ? s.get_string() : ""; driver->attach(server_name, - world->conf()->option("jack-client").get_string(), + world->conf().option("jack-client").get_string(), NULL); - ((Server::Engine*)world->local_engine().get())->set_driver( + ((Server::Engine*)world->engine().get())->set_driver( SharedPtr<Server::Driver>(driver)); } }; |