From 2c1079446f0b06559a683a9f4b0192a4f7637770 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Wed, 16 Feb 2011 18:26:57 +0000
Subject: Drop redlandmm for sordmm.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2959 a436a847-0d15-0410-975c-d299462d15a1
---
 src/module/World.cpp | 8 ++++----
 src/module/World.hpp | 6 +++---
 src/module/wscript   | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/module')

diff --git a/src/module/World.cpp b/src/module/World.cpp
index 69c67f96..67bd7aaf 100644
--- a/src/module/World.cpp
+++ b/src/module/World.cpp
@@ -24,7 +24,7 @@
 #include "slv2/slv2.h"
 #endif
 #include "raul/log.hpp"
-#include "redlandmm/World.hpp"
+#include "sord/sordmm.hpp"
 #include "shared/runtime_paths.hpp"
 #include "shared/LV2Features.hpp"
 #include "shared/LV2URIMap.hpp"
@@ -100,7 +100,7 @@ struct WorldImpl : public boost::noncopyable {
 		, argv(a_argv)
 		, conf(conf)
 		, lv2_features(NULL)
-		, rdf_world(new Redland::World())
+		, rdf_world(new Sord::World())
 		, uris(new Shared::LV2URIMap())
 #ifdef HAVE_SLV2
 		, slv2_world(slv2_world_new())
@@ -166,7 +166,7 @@ struct WorldImpl : public boost::noncopyable {
 	char**&                              argv;
 	Raul::Configuration*                 conf;
 	LV2Features*                         lv2_features;
-	Redland::World*                      rdf_world;
+	Sord::World*                         rdf_world;
 	SharedPtr<LV2URIMap>                 uris;
     SharedPtr<EngineInterface>           engine;
 	SharedPtr<Engine>                    local_engine;
@@ -211,7 +211,7 @@ LV2Features*                         World::lv2_features() { return _impl->lv2_f
 #ifdef HAVE_SLV2
 SLV2World            World::slv2_world() { return _impl->slv2_world; }
 #endif
-Redland::World*      World::rdf_world() { return _impl->rdf_world; }
+Sord::World*         World::rdf_world() { return _impl->rdf_world; }
 SharedPtr<LV2URIMap> World::uris()      { return _impl->uris; }
 
 
diff --git a/src/module/World.hpp b/src/module/World.hpp
index 1505d04c..1345f3da 100644
--- a/src/module/World.hpp
+++ b/src/module/World.hpp
@@ -33,7 +33,7 @@
 typedef struct _SLV2World* SLV2World;
 #endif
 
-namespace Redland { class World; }
+namespace Sord { class World; }
 
 namespace Ingen {
 
@@ -53,7 +53,7 @@ struct WorldImpl;
 /** The "world" all Ingen modules may share.
  *
  * All loaded components of Ingen, as well as things requiring shared access
- * and/or locking (e.g. Redland, SLV2).
+ * and/or locking (e.g. Sord, SLV2).
  *
  * Ingen modules are shared libraries which modify the World when loaded
  * using World::load, e.g. loading the "ingen_serialisation" module will
@@ -92,7 +92,7 @@ public:
 	virtual SharedPtr<Serialisation::Parser>     parser();
 	virtual SharedPtr<Store>                     store();
 
-	virtual Redland::World*      rdf_world();
+	virtual Sord::World*         rdf_world();
 	virtual SharedPtr<LV2URIMap> uris();
 
 	virtual int&    argc();
diff --git a/src/module/wscript b/src/module/wscript
index 85446284..41cc752b 100644
--- a/src/module/wscript
+++ b/src/module/wscript
@@ -17,5 +17,5 @@ def build(bld):
 	obj.vnum	    = '0.0.0'
 	obj.use             = 'libingen_shared'
 	obj.install_path    = '${LIBDIR}'
-	autowaf.use_lib(bld, obj, 'GLIBMM LV2CORE SLV2 RAUL REDLANDMM')
+	autowaf.use_lib(bld, obj, 'GLIBMM LV2CORE SLV2 RAUL SORD')
 
-- 
cgit v1.2.1