From 7be6d5d05756a7dea20c494d56f364b4dc064c88 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 11 May 2012 03:01:26 +0000 Subject: Clean up and better document World interface. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4344 a436a847-0d15-0410-975c-d299462d15a1 --- src/gui/ingen_gui_lv2.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/gui/ingen_gui_lv2.cpp') diff --git a/src/gui/ingen_gui_lv2.cpp b/src/gui/ingen_gui_lv2.cpp index 6afe7f68..c785d857 100644 --- a/src/gui/ingen_gui_lv2.cpp +++ b/src/gui/ingen_gui_lv2.cpp @@ -96,7 +96,7 @@ instantiate(const LV2UI_Descriptor* descriptor, ui->world = new Ingen::Shared::World( ui->argc, ui->argv, map, unmap); - ui->forge = new Ingen::Forge(*ui->world->uri_map().get()); + ui->forge = new Ingen::Forge(ui->world->uri_map()); if (!ui->world->load_module("client")) { delete ui; @@ -104,13 +104,12 @@ instantiate(const LV2UI_Descriptor* descriptor, } ui->sink = new IngenLV2AtomSink( - *ui->world->uris().get(), write_function, controller); + ui->world->uris(), write_function, controller); // Set up an engine interface that writes LV2 atoms ui->engine = SharedPtr( - new Ingen::Shared::AtomWriter(*ui->world->uri_map().get(), - *ui->world->uris().get(), - *ui->sink)); + new Ingen::Shared::AtomWriter( + ui->world->uri_map(), ui->world->uris(), *ui->sink)); ui->world->set_interface(ui->engine); @@ -121,8 +120,8 @@ instantiate(const LV2UI_Descriptor* descriptor, ui->app->attach(ui->client); ui->reader = SharedPtr( - new Ingen::Shared::AtomReader(*ui->world->uri_map().get(), - *ui->world->uris().get(), + new Ingen::Shared::AtomReader(ui->world->uri_map(), + ui->world->uris(), ui->world->forge(), *ui->client.get())); -- cgit v1.2.1