diff options
author | David Robillard <d@drobilla.net> | 2008-08-17 03:20:42 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2008-08-17 03:20:42 +0000 |
commit | 3019b09099371b3fe568b7dcc3bb92203d800b1f (patch) | |
tree | eed4a0cb4be627764beb262756085bd51d86add5 /src/libs/gui/ThreadedLoader.cpp | |
parent | d6823fa9b29bcff74ca180e6d389d8a21cf88d1f (diff) | |
download | ingen-3019b09099371b3fe568b7dcc3bb92203d800b1f.tar.gz ingen-3019b09099371b3fe568b7dcc3bb92203d800b1f.tar.bz2 ingen-3019b09099371b3fe568b7dcc3bb92203d800b1f.zip |
Rename 'Loader' 'Parser'.
git-svn-id: http://svn.drobilla.net/lad/ingen@1411 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/gui/ThreadedLoader.cpp')
-rw-r--r-- | src/libs/gui/ThreadedLoader.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libs/gui/ThreadedLoader.cpp b/src/libs/gui/ThreadedLoader.cpp index 0247529d..8c8af828 100644 --- a/src/libs/gui/ThreadedLoader.cpp +++ b/src/libs/gui/ThreadedLoader.cpp @@ -44,16 +44,16 @@ ThreadedLoader::ThreadedLoader(SharedPtr<EngineInterface> engine) world->serialisation_module = Ingen::Shared::load_module("ingen_serialisation"); if (world->serialisation_module) { - Loader* (*new_loader)() = NULL; + Parser* (*new_parser)() = NULL; bool found = App::instance().world()->serialisation_module->get_symbol( - "new_loader", (void*&)new_loader); + "new_parser", (void*&)new_parser); if (found) - _loader = SharedPtr<Loader>(new_loader()); + _parser = SharedPtr<Parser>(new_parser()); } - if (_loader) + if (_parser) start(); else cerr << "WARNING: Failed to load ingen_serialisation module, load disabled." << endl; @@ -99,7 +99,7 @@ ThreadedLoader::load_patch(bool merge, false))); } else { _events.push_back(sigc::hide_return(sigc::bind( - sigc::mem_fun(_loader.get(), &Ingen::Serialisation::Loader::load), + sigc::mem_fun(_parser.get(), &Ingen::Serialisation::Parser::parse), App::instance().world(), App::instance().world()->engine.get(), data_base_uri, |