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/gui/App.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/gui/App.cpp')
-rw-r--r-- | src/gui/App.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/gui/App.cpp b/src/gui/App.cpp index 3b3fa6f9..f56f6f41 100644 --- a/src/gui/App.cpp +++ b/src/gui/App.cpp @@ -159,13 +159,13 @@ App::attach(SharedPtr<SigClientInterface> client) assert(!_store); assert(!_loader); - if (_world->local_engine()) { - _world->local_engine()->register_client(client->uri(), client); + if (_world->engine()) { + _world->engine()->register_client(client->uri(), client); } _client = client; - _store = SharedPtr<ClientStore>(new ClientStore(_world->uris(), _world->engine(), client)); - _loader = SharedPtr<ThreadedLoader>(new ThreadedLoader(*this, _world->engine())); + _store = SharedPtr<ClientStore>(new ClientStore(_world->uris(), _world->interface(), client)); + _loader = SharedPtr<ThreadedLoader>(new ThreadedLoader(*this, _world->interface())); _patch_tree_window->init(*this, *_store); @@ -180,14 +180,14 @@ App::attach(SharedPtr<SigClientInterface> client) void App::detach() { - if (_world->engine()) { + if (_world->interface()) { _window_factory->clear(); _store->clear(); _loader.reset(); _store.reset(); _client.reset(); - _world->set_engine(SharedPtr<Interface>()); + _world->set_interface(SharedPtr<Interface>()); } } @@ -292,8 +292,8 @@ App::gtk_main_iteration() if (!_client) return false; - if (_world->local_engine()) { - if (!_world->local_engine()->main_iteration()) { + if (_world->engine()) { + if (!_world->engine()->main_iteration()) { Gtk::Main::quit(); return false; } @@ -320,7 +320,7 @@ bool App::quit(Gtk::Window* dialog_parent) { bool quit = true; - if (_world->local_engine()) { + if (_world->engine()) { Gtk::MessageDialog d( "The engine is running in this process. Quitting will terminate Ingen." "\n\n" "Are you sure you want to quit?", |