diff options
| author | David Robillard <d@drobilla.net> | 2007-05-01 23:58:38 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-05-01 23:58:38 +0000 |
| commit | 10e23868c8199335ebd360afb62911174075658c (patch) | |
| tree | 5ca362855ca1b2809b1e4ca95ecbcdf3fe8bf60b /src/progs/ingenuity/ThreadedLoader.cpp | |
| parent | 2772d11a284f199342ef86e9169865968577a17c (diff) | |
| download | ingen-10e23868c8199335ebd360afb62911174075658c.tar.gz ingen-10e23868c8199335ebd360afb62911174075658c.tar.bz2 ingen-10e23868c8199335ebd360afb62911174075658c.zip | |
Moved loading out to it's own namespace.
git-svn-id: http://svn.drobilla.net/lad/ingen@490 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/progs/ingenuity/ThreadedLoader.cpp')
| -rw-r--r-- | src/progs/ingenuity/ThreadedLoader.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/progs/ingenuity/ThreadedLoader.cpp b/src/progs/ingenuity/ThreadedLoader.cpp index 118d252f..bf195dce 100644 --- a/src/progs/ingenuity/ThreadedLoader.cpp +++ b/src/progs/ingenuity/ThreadedLoader.cpp @@ -27,8 +27,8 @@ namespace Ingenuity { ThreadedLoader::ThreadedLoader(SharedPtr<ModelEngineInterface> engine) - : _deprecated_loader(engine) - , _loader(engine, App::instance().rdf_world()) + : _engine(engine) + , _deprecated_loader(engine) , _serializer(*App::instance().rdf_world()) { // FIXME: rework this so the thread is only present when it's doing something (save mem) @@ -78,7 +78,8 @@ ThreadedLoader::load_patch(bool merge, false))); } else { _events.push_back(sigc::hide_return(sigc::bind( - sigc::mem_fun(_loader, &Loader::load), + sigc::ptr_fun(&Ingen::Serialisation::load), + App::instance().engine(), App::instance().rdf_world(), data_base_uri, engine_parent, |