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_engine.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_engine.cpp')
-rw-r--r-- | src/server/ingen_engine.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/ingen_engine.cpp b/src/server/ingen_engine.cpp index 917e83cf..6e5665cb 100644 --- a/src/server/ingen_engine.cpp +++ b/src/server/ingen_engine.cpp @@ -26,11 +26,11 @@ struct IngenEngineModule : public Ingen::Shared::Module { virtual void load(Ingen::Shared::World* world) { Server::set_denormal_flags(); SharedPtr<Server::Engine> engine(new Server::Engine(world)); - world->set_local_engine(engine); - if (!world->engine()) { - world->set_engine(SharedPtr<Interface>(engine->interface(), NullDeleter<Interface>)); + world->set_engine(engine); + if (!world->interface()) { + world->set_interface(SharedPtr<Interface>(engine->interface(), NullDeleter<Interface>)); } - assert(world->local_engine() == engine); + assert(world->engine() == engine); } }; |