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/server/NodeFactory.hpp | |
| 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/server/NodeFactory.hpp')
| -rw-r--r-- | src/server/NodeFactory.hpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/server/NodeFactory.hpp b/src/server/NodeFactory.hpp index 2188266b..a6811c9c 100644 --- a/src/server/NodeFactory.hpp +++ b/src/server/NodeFactory.hpp @@ -22,7 +22,7 @@ #include "raul/SharedPtr.hpp" #include "raul/URI.hpp" -#include "ingen/shared/World.hpp" +#include "ingen/World.hpp" namespace Ingen { namespace Server { @@ -39,7 +39,7 @@ class LV2Info; class NodeFactory { public: - explicit NodeFactory(Ingen::Shared::World* world); + explicit NodeFactory(Ingen::World* world); ~NodeFactory(); void load_plugin(const Raul::URI& uri); @@ -54,10 +54,10 @@ private: void load_lv2_plugins(); void load_internal_plugins(); - Plugins _plugins; - Ingen::Shared::World* _world; - SharedPtr<LV2Info> _lv2_info; - bool _has_loaded; + Plugins _plugins; + Ingen::World* _world; + SharedPtr<LV2Info> _lv2_info; + bool _has_loaded; }; } // namespace Server |