From bf6f4d0a409ba76e65d375ef75533d6a6062a228 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 16 Aug 2008 04:29:57 +0000 Subject: 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 --- src/progs/ingen/main.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/progs') 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 client_module; SharedPtr gui_module; SharedPtr bindings_module; - SharedPtr serialisation_module; SharedPtr 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 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(); -- cgit v1.2.1