diff options
| author | David Robillard <d@drobilla.net> | 2015-02-24 09:20:22 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2015-02-24 09:20:22 +0000 |
| commit | 9d7c1e971d51561c4bb28fa1064503e5f266908f (patch) | |
| tree | e34b0f84c05020fea44fd7b8cfd55341aff50668 /src/gui/ThreadedLoader.cpp | |
| parent | f408b385c2795359cfacb09032089c8387b74f45 (diff) | |
| download | ingen-9d7c1e971d51561c4bb28fa1064503e5f266908f.tar.gz ingen-9d7c1e971d51561c4bb28fa1064503e5f266908f.tar.bz2 ingen-9d7c1e971d51561c4bb28fa1064503e5f266908f.zip | |
Demodularize Parser and Serialiser.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5606 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui/ThreadedLoader.cpp')
| -rw-r--r-- | src/gui/ThreadedLoader.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp index 93cccdf1..6e57c383 100644 --- a/src/gui/ThreadedLoader.cpp +++ b/src/gui/ThreadedLoader.cpp @@ -49,15 +49,10 @@ ThreadedLoader::~ThreadedLoader() _thread.join(); } -SPtr<Serialisation::Parser> +SPtr<Parser> ThreadedLoader::parser() { - Ingen::World* world = _app.world(); - - if (!world->parser()) - world->load_module("serialisation"); - - return world->parser(); + return _app.world()->parser(); } void @@ -95,7 +90,7 @@ ThreadedLoader::load_graph(bool merge, _events.push_back( sigc::hide_return( sigc::bind(sigc::mem_fun(world->parser().get(), - &Ingen::Serialisation::Parser::parse_file), + &Ingen::Parser::parse_file), _app.world(), _app.world()->interface().get(), document_uri, |