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

1 files changed, 5 insertions, 8 deletions

diff --git a/src/server/LV2Info.hpp b/src/server/LV2Info.hpp
index 321561e7..9b6ea9db 100644
--- a/src/server/LV2Info.hpp
+++ b/src/server/LV2Info.hpp
@@ -18,19 +18,16 @@
 #define INGEN_ENGINE_LV2INFO_HPP
 
 #include "lilv/lilv.h"
-#include "ingen/shared/World.hpp"
+#include "ingen/World.hpp"
 
 namespace Ingen {
-
-class Node;
-
 namespace Server {
 
 /** Stuff that may need to be passed to an LV2 plugin (i.e. LV2 features).
  */
 class LV2Info {
 public:
-	explicit LV2Info(Ingen::Shared::World* world);
+	explicit LV2Info(Ingen::World* world);
 	~LV2Info();
 
 	LilvNode* atom_AtomPort;
@@ -50,11 +47,11 @@ public:
 	LilvNode* rsz_minimumSize;
 	LilvNode* work_schedule;
 
-	Ingen::Shared::World& world()     { return *_world; }
-	LilvWorld*            lv2_world() { return _world->lilv_world(); }
+	Ingen::World& world()     { return *_world; }
+	LilvWorld*    lv2_world() { return _world->lilv_world(); }
 
 private:
-	Ingen::Shared::World* _world;
+	Ingen::World* _world;
 };
 
 } // namespace Server