diff options
| author | David Robillard <d@drobilla.net> | 2012-07-31 00:14:50 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2012-07-31 00:14:50 +0000 |
| commit | 629fb50716083c71146340de97eb8651679ca9fb (patch) | |
| tree | 9c5f25fdfd24f3cdb89924062f291a6647580878 /src/gui/ThreadedLoader.cpp | |
| parent | 6297b8805c95dd1831ee9a0b9639ae41d00a1473 (diff) | |
| download | ingen-629fb50716083c71146340de97eb8651679ca9fb.tar.gz ingen-629fb50716083c71146340de97eb8651679ca9fb.tar.bz2 ingen-629fb50716083c71146340de97eb8651679ca9fb.zip | |
Merge Ingen::Shared namespace into Ingen namespace and core libingen library.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4579 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui/ThreadedLoader.cpp')
| -rw-r--r-- | src/gui/ThreadedLoader.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp index 1867b8d5..054838c6 100644 --- a/src/gui/ThreadedLoader.cpp +++ b/src/gui/ThreadedLoader.cpp @@ -16,8 +16,8 @@ #include <string> #include "raul/log.hpp" -#include "ingen/shared/World.hpp" -#include "ingen/shared/Module.hpp" +#include "ingen/World.hpp" +#include "ingen/Module.hpp" #include "App.hpp" #include "ThreadedLoader.hpp" #include "ingen/client/PatchModel.hpp" @@ -43,7 +43,7 @@ ThreadedLoader::ThreadedLoader(App& app, SharedPtr<Interface> engine) SharedPtr<Serialisation::Parser> ThreadedLoader::parser() { - Ingen::Shared::World* world = _app.world(); + Ingen::World* world = _app.world(); if (!world->parser()) world->load_module("serialisation"); @@ -73,7 +73,7 @@ ThreadedLoader::load_patch(bool merge, { _mutex.lock(); - Ingen::Shared::World* world = _app.world(); + Ingen::World* world = _app.world(); Glib::ustring engine_base = ""; if (engine_parent) { |