diff options
| author | David Robillard <d@drobilla.net> | 2008-08-16 04:29:57 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-08-16 04:29:57 +0000 |
| commit | bf6f4d0a409ba76e65d375ef75533d6a6062a228 (patch) | |
| tree | 9343fe271e8eeb731b80d954ae85d695e25dd667 /src/progs | |
| parent | a8b36b5637acb3fa8eb29ef0f45bd11653f412fa (diff) | |
| download | ingen-bf6f4d0a409ba76e65d375ef75533d6a6062a228.tar.gz ingen-bf6f4d0a409ba76e65d375ef75533d6a6062a228.tar.bz2 ingen-bf6f4d0a409ba76e65d375ef75533d6a6062a228.zip | |
Only load one serialisation module, and store it in the world.
git-svn-id: http://svn.drobilla.net/lad/ingen@1398 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/progs')
| -rw-r--r-- | src/progs/ingen/main.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/progs/ingen/main.cpp b/src/progs/ingen/main.cpp index fe78468f..47f7a038 100644 --- a/src/progs/ingen/main.cpp +++ b/src/progs/ingen/main.cpp @@ -81,7 +81,6 @@ main(int argc, char** argv) SharedPtr<Glib::Module> client_module; SharedPtr<Glib::Module> gui_module; SharedPtr<Glib::Module> bindings_module; - SharedPtr<Glib::Module> serialisation_module; SharedPtr<Shared::EngineInterface> engine_interface; @@ -161,14 +160,14 @@ main(int argc, char** argv) parent_path = args.path_arg; bool found = false; - serialisation_module = Ingen::Shared::load_module("ingen_serialisation"); + world->serialisation_module = Ingen::Shared::load_module("ingen_serialisation"); Serialisation::Loader* (*new_loader)() = NULL; - if (serialisation_module) - found = serialisation_module->get_symbol("new_loader", (void*&)new_loader); + if (world->serialisation_module) + found = world->serialisation_module->get_symbol("new_loader", (void*&)new_loader); - if (serialisation_module && found) { + if (world->serialisation_module && found) { SharedPtr<Serialisation::Loader> loader(new_loader()); // Assumption: Containing ':' means URI, otherwise filename @@ -246,7 +245,7 @@ main(int argc, char** argv) engine_interface.reset(); client_module.reset(); - serialisation_module.reset(); + world->serialisation_module.reset(); gui_module.reset(); engine_module.reset(); |