From 77d22f06129e91f51e37c09c71c0917a0136dd7d Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Thu, 28 Apr 2011 22:14:04 +0000
Subject: Switch to Lilv from SLV2.

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

(limited to 'src/shared')

diff --git a/src/shared/World.cpp b/src/shared/World.cpp
index 4c06a8f6..235bda91 100644
--- a/src/shared/World.cpp
+++ b/src/shared/World.cpp
@@ -20,8 +20,8 @@
 #include <glibmm/module.h>
 #include <glibmm/miscutils.h>
 #include <glibmm/fileutils.h>
-#ifdef HAVE_SLV2
-#include "slv2/slv2.h"
+#ifdef HAVE_LILV
+#include "lilv/lilv.h"
 #endif
 #include "raul/log.hpp"
 #include "sord/sordmm.hpp"
@@ -104,17 +104,17 @@ public:
 		, lv2_features(NULL)
 		, rdf_world(new Sord::World())
 		, uris(new Shared::LV2URIMap())
-#ifdef HAVE_SLV2
-		, slv2_world(slv2_world_new())
+#ifdef HAVE_LILV
+		, lilv_world(lilv_world_new())
 #else
-		, slv2_world(NULL)
+		, lilv_world(NULL)
 #endif
 	{
-#ifdef HAVE_SLV2
+#ifdef HAVE_LILV
 		lv2_features = new Ingen::Shared::LV2Features();
 		lv2_features->add_feature(LV2_URI_MAP_URI, uris);
 		lv2_features->add_feature(LV2_URI_UNMAP_URI, uris->unmap_feature());
-		slv2_world_load_all(slv2_world);
+		lilv_world_load_all(lilv_world);
 #endif
 
 		// Set up RDF namespaces
@@ -142,9 +142,9 @@ public:
 		interface_factories.clear();
 		script_runners.clear();
 
-#ifdef HAVE_SLV2
-		slv2_world_free(slv2_world);
-		slv2_world = NULL;
+#ifdef HAVE_LILV
+		lilv_world_free(lilv_world);
+		lilv_world = NULL;
 #endif
 
 		delete rdf_world;
@@ -177,7 +177,7 @@ public:
     SharedPtr<Serialisation::Serialiser> serialiser;
     SharedPtr<Serialisation::Parser>     parser;
     SharedPtr<Store>                     store;
-    SLV2World                            slv2_world;
+    LilvWorld                            lilv_world;
 	std::string                          jack_uuid;
 };
 
@@ -209,8 +209,8 @@ SharedPtr<Store>                     World::store()        { return _impl->store
 Raul::Configuration*                 World::conf()         { return _impl->conf; }
 LV2Features*                         World::lv2_features() { return _impl->lv2_features; }
 
-#ifdef HAVE_SLV2
-SLV2World            World::slv2_world() { return _impl->slv2_world; }
+#ifdef HAVE_LILV
+LilvWorld            World::lilv_world() { return _impl->lilv_world; }
 #endif
 Sord::World*         World::rdf_world() { return _impl->rdf_world; }
 SharedPtr<LV2URIMap> World::uris()      { return _impl->uris; }
diff --git a/src/shared/World.hpp b/src/shared/World.hpp
index a0603bf0..44e2478e 100644
--- a/src/shared/World.hpp
+++ b/src/shared/World.hpp
@@ -29,7 +29,7 @@
 #include "raul/Configuration.hpp"
 #include "raul/SharedPtr.hpp"
 
-typedef struct _SLV2World* SLV2World;
+typedef struct _LilvWorld* LilvWorld;
 
 namespace Sord { class World; }
 
@@ -49,7 +49,7 @@ class Store;
 /** The "world" all Ingen modules may share.
  *
  * All loaded components of Ingen, as well as things requiring shared access
- * and/or locking (e.g. Sord, SLV2).
+ * and/or locking (e.g. Sord, Lilv).
  *
  * Ingen modules are shared libraries which modify the World when loaded
  * using World::load, e.g. loading the "ingen_serialisation" module will
@@ -99,7 +99,7 @@ public:
 
 	virtual LV2Features* lv2_features();
 
-	virtual SLV2World slv2_world();
+	virtual LilvWorld lilv_world();
 
 	virtual void        set_jack_uuid(const std::string& uuid);
 	virtual std::string jack_uuid();
diff --git a/src/shared/wscript b/src/shared/wscript
index 763be120..3bff61bb 100644
--- a/src/shared/wscript
+++ b/src/shared/wscript
@@ -30,4 +30,4 @@ def build(bld):
     obj.vnum            = '0.0.0'
     obj.install_path    = '${LIBDIR}'
     obj.linkflags       = '-ldl'
-    autowaf.use_lib(bld, obj, 'GLIBMM LV2CORE SLV2 RAUL SORD LIBLO')
+    autowaf.use_lib(bld, obj, 'GLIBMM LV2CORE LILV RAUL SORD LIBLO')
-- 
cgit v1.2.1