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/ingen_gui_lv2.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/ingen_gui_lv2.cpp')
| -rw-r--r-- | src/gui/ingen_gui_lv2.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/gui/ingen_gui_lv2.cpp b/src/gui/ingen_gui_lv2.cpp index 3448f4a9..6afe7f68 100644 --- a/src/gui/ingen_gui_lv2.cpp +++ b/src/gui/ingen_gui_lv2.cpp @@ -55,15 +55,12 @@ struct IngenLV2AtomSink : public Ingen::Shared::AtomSink { struct IngenLV2UI { IngenLV2UI() - : conf() - , sink(NULL) - { - } + : sink(NULL) + {} int argc; char** argv; Ingen::Forge* forge; - Ingen::Shared::Configuration conf; Ingen::Shared::World* world; IngenLV2AtomSink* sink; SharedPtr<Ingen::GUI::App> app; @@ -97,7 +94,7 @@ instantiate(const LV2UI_Descriptor* descriptor, } ui->world = new Ingen::Shared::World( - &ui->conf, ui->argc, ui->argv, map, unmap); + ui->argc, ui->argv, map, unmap); ui->forge = new Ingen::Forge(*ui->world->uri_map().get()); @@ -115,7 +112,7 @@ instantiate(const LV2UI_Descriptor* descriptor, *ui->world->uris().get(), *ui->sink)); - ui->world->set_engine(ui->engine); + ui->world->set_interface(ui->engine); // Create App and client ui->app = Ingen::GUI::App::create(ui->world); |