summaryrefslogtreecommitdiffstats
path: root/src/server/NodeFactory.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-07-31 00:14:50 +0000
committerDavid Robillard <d@drobilla.net>2012-07-31 00:14:50 +0000
commit629fb50716083c71146340de97eb8651679ca9fb (patch)
tree9c5f25fdfd24f3cdb89924062f291a6647580878 /src/server/NodeFactory.cpp
parent6297b8805c95dd1831ee9a0b9639ae41d00a1473 (diff)
downloadingen-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.cpp')
-rw-r--r--src/server/NodeFactory.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/NodeFactory.cpp b/src/server/NodeFactory.cpp
index f42d32c8..616a1b35 100644
--- a/src/server/NodeFactory.cpp
+++ b/src/server/NodeFactory.cpp
@@ -24,7 +24,7 @@
#include "internals/Delay.hpp"
#include "internals/Note.hpp"
#include "internals/Trigger.hpp"
-#include "ingen/shared/World.hpp"
+#include "ingen/World.hpp"
#include "InternalPlugin.hpp"
#include "LV2Plugin.hpp"
@@ -38,7 +38,7 @@ namespace Server {
using namespace Internals;
-NodeFactory::NodeFactory(Ingen::Shared::World* world)
+NodeFactory::NodeFactory(Ingen::World* world)
: _world(world)
, _lv2_info(new LV2Info(world))
, _has_loaded(false)
@@ -91,7 +91,7 @@ NodeFactory::load_plugins()
void
NodeFactory::load_internal_plugins()
{
- Ingen::Shared::URIs& uris = _world->uris();
+ Ingen::URIs& uris = _world->uris();
InternalPlugin* controller_plug = ControllerNode::internal_plugin(uris);
_plugins.insert(make_pair(controller_plug->uri(), controller_plug));