From 3019b09099371b3fe568b7dcc3bb92203d800b1f Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 17 Aug 2008 03:20:42 +0000 Subject: Rename 'Loader' 'Parser'. git-svn-id: http://svn.drobilla.net/lad/ingen@1411 a436a847-0d15-0410-975c-d299462d15a1 --- src/progs/ingen/main.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/progs') diff --git a/src/progs/ingen/main.cpp b/src/progs/ingen/main.cpp index 9715e12f..657e942d 100644 --- a/src/progs/ingen/main.cpp +++ b/src/progs/ingen/main.cpp @@ -33,7 +33,7 @@ #include "module/World.hpp" #include "engine/Engine.hpp" #include "engine/QueuedEngineInterface.hpp" -#include "serialisation/Loader.hpp" +#include "serialisation/Parser.hpp" #include "cmdline.h" #ifdef WITH_BINDINGS @@ -164,13 +164,13 @@ main(int argc, char** argv) if (!world->serialisation_module) world->serialisation_module = Ingen::Shared::load_module("ingen_serialisation"); - Serialisation::Loader* (*new_loader)() = NULL; + Serialisation::Parser* (*new_parser)() = NULL; if (world->serialisation_module) - found = world->serialisation_module->get_symbol("new_loader", (void*&)new_loader); + found = world->serialisation_module->get_symbol("new_parser", (void*&)new_parser); if (world->serialisation_module && found) { - SharedPtr loader(new_loader()); + SharedPtr parser(new_parser()); // Assumption: Containing ':' means URI, otherwise filename string uri = args.load_arg; @@ -184,7 +184,7 @@ main(int argc, char** argv) engine_interface->load_plugins(); - loader->load(world, engine_interface.get(), uri, parent_path, ""); + parser->parse(world, engine_interface.get(), uri, parent_path, ""); } else { cerr << "Unable to load serialisation module, aborting." << endl; -- cgit v1.2.1