Drop redlandmm for sordmm.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2959 a436a847-0d15-0410-975c-d299462d15a1

5 files changed, 8 insertions, 13 deletions

diff --git a/src/engine/HTTPClientSender.cpp b/src/engine/HTTPClientSender.cpp
index 79f64cc1..7068911c 100644
--- a/src/engine/HTTPClientSender.cpp
+++ b/src/engine/HTTPClientSender.cpp
@@ -59,14 +59,14 @@ HTTPClientSender::put(const URI&                  uri,
 	const string path     = (uri.substr(0, 6) == "path:/") ? uri.substr(6) : uri.str();
 	const string full_uri = _url + "/" + path;
 
-	Redland::Model model(*_engine.world()->rdf_world());
+	Sord::Model model(*_engine.world()->rdf_world());
 	for (Resource::Properties::const_iterator i = properties.begin(); i != properties.end(); ++i)
 		model.add_statement(
-				Redland::Resource(*_engine.world()->rdf_world(), path),
+				Sord::Resource(*_engine.world()->rdf_world(), path),
 				AtomRDF::atom_to_node(model, i->first.str()),
 				AtomRDF::atom_to_node(model, i->second));
 
-	const string str = model.serialise_to_string("turtle");
+	const string str = model.write_to_string("turtle");
 	send_chunk(str);
 }
 
@@ -111,7 +111,7 @@ void
 HTTPClientSender::set_property(const URI& subject, const URI& key, const Atom& value)
 {
 #if 0
-	Redland::Node node = AtomRDF::atom_to_node(*_engine.world()->rdf_world(), value);
+	Sord::Node node = AtomRDF::atom_to_node(*_engine.world()->rdf_world(), value);
 	const string msg = string(
 			"@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .\n"
 			"@prefix ingen:   <http://drobilla.net/ns/ingen#> .\n"
diff --git a/src/engine/LV2Plugin.cpp b/src/engine/LV2Plugin.cpp
index 80d2b443..faa10e97 100644
--- a/src/engine/LV2Plugin.cpp
+++ b/src/engine/LV2Plugin.cpp
@@ -19,7 +19,7 @@
 #include <string>
 #include <glibmm.h>
 
-#include "redlandmm/World.hpp"
+#include "sord/sordmm.hpp"
 
 #include "shared/LV2URIMap.hpp"
 #include "Driver.hpp"
@@ -75,7 +75,6 @@ LV2Plugin::instantiate(BufferFactory&    bufs,
 
 	load(); // FIXME: unload at some point
 
-	Glib::Mutex::Lock lock(engine.world()->rdf_world()->mutex());
 	LV2Node* n = new LV2Node(this, name, polyphonic, parent, srate);
 
 	if ( ! n->instantiate(bufs) ) {
diff --git a/src/engine/NodeFactory.cpp b/src/engine/NodeFactory.cpp
index 64b6e2b6..08584c81 100644
--- a/src/engine/NodeFactory.cpp
+++ b/src/engine/NodeFactory.cpp
@@ -22,7 +22,7 @@
 #include <float.h>
 #include <cmath>
 #include <glibmm/miscutils.h>
-#include "redlandmm/World.hpp"
+#include "sord/sordmm.hpp"
 #include "raul/log.hpp"
 #include "ingen-config.h"
 #include "module/World.hpp"
@@ -81,8 +81,6 @@ NodeFactory::load_plugins()
 {
 	ThreadManager::assert_thread(THREAD_PRE_PROCESS);
 
-	_world->rdf_world()->mutex().lock();
-
 	// Only load if we havn't already, so every client connecting doesn't cause
 	// this (expensive!) stuff to happen.  Not the best solution - would be nice
 	// if clients could refresh plugins list for whatever reason :/
@@ -97,8 +95,6 @@ NodeFactory::load_plugins()
 
 		_has_loaded = true;
 	}
-
-	_world->rdf_world()->mutex().unlock();
 }
 
 
diff --git a/src/engine/events/CreateNode.cpp b/src/engine/events/CreateNode.cpp
index 9fef8070..e5f8d721 100644
--- a/src/engine/events/CreateNode.cpp
+++ b/src/engine/events/CreateNode.cpp
@@ -18,7 +18,7 @@
 #include "raul/log.hpp"
 #include "raul/Maid.hpp"
 #include "raul/Path.hpp"
-#include "redlandmm/World.hpp"
+#include "sord/sordmm.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "CreateNode.hpp"
 #include "Request.hpp"
diff --git a/src/engine/wscript b/src/engine/wscript
index 42e31d2c..0cbd060c 100644
--- a/src/engine/wscript
+++ b/src/engine/wscript
@@ -70,7 +70,7 @@ def build(bld):
 	obj.target          = 'ingen_engine'
 	obj.install_path    = '${LIBDIR}'
 	obj.use             = 'libingen_shared'
-	core_libs = 'GLIBMM GTHREAD LV2CORE SLV2 RAUL REDLANDMM'
+	core_libs = 'GLIBMM GTHREAD LV2CORE SLV2 RAUL SORD'
 	autowaf.use_lib(bld, obj, core_libs)
 
 	if bld.env['HAVE_SOUP'] == 1: