From c65659729265b8795ea76390a3507023ff3164dd Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Fri, 21 Oct 2011 18:28:40 +0000
Subject: Remove implementation of uri-unmap extension.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3563 a436a847-0d15-0410-975c-d299462d15a1
---
 src/shared/LV2URIMap.cpp | 16 ----------------
 src/shared/LV2URIMap.hpp | 26 ++------------------------
 src/shared/World.cpp     |  1 -
 wscript                  |  2 --
 4 files changed, 2 insertions(+), 43 deletions(-)

diff --git a/src/shared/LV2URIMap.cpp b/src/shared/LV2URIMap.cpp
index a65b9644..7019f193 100644
--- a/src/shared/LV2URIMap.cpp
+++ b/src/shared/LV2URIMap.cpp
@@ -124,13 +124,6 @@ LV2URIMap::LV2URIMap()
 	uri_map_feature_data.callback_data = this;
 	uri_map_feature.URI = LV2_URI_MAP_URI;
 	uri_map_feature.data = &uri_map_feature_data;
-
-	uri_unmap_feature_data.id_to_uri = &LV2URIMap::uri_unmap_id_to_uri;
-	uri_unmap_feature_data.callback_data = this;
-	uri_unmap_feature.URI = LV2_URI_UNMAP_URI;
-	uri_unmap_feature.data = &uri_unmap_feature_data;
-
-	_unmap_feature = SharedPtr<UnmapFeature>(new UnmapFeature(*this));
 }
 
 struct null_deleter { void operator()(void const *) const {} };
@@ -205,14 +198,5 @@ LV2URIMap::uri_map_uri_to_id(LV2_URI_Map_Callback_Data callback_data,
 	return me->uri_to_id(map, uri);
 }
 
-const char*
-LV2URIMap::uri_unmap_id_to_uri(LV2_URI_Map_Callback_Data callback_data,
-                               const char*               map,
-                               uint32_t                  id)
-{
-	LV2URIMap* me = (LV2URIMap*)callback_data;
-	return me->id_to_uri(map, id);
-}
-
 } // namespace Shared
 } // namespace Ingen
diff --git a/src/shared/LV2URIMap.hpp b/src/shared/LV2URIMap.hpp
index 8363d341..8c126a0e 100644
--- a/src/shared/LV2URIMap.hpp
+++ b/src/shared/LV2URIMap.hpp
@@ -26,14 +26,13 @@
 #include "raul/URI.hpp"
 
 #include "lv2/lv2plug.in/ns/ext/uri-map/uri-map.h"
-#include "lv2/lv2plug.in/ns/ext/uri-unmap/uri-unmap.h"
 
 #include "LV2Features.hpp"
 
 namespace Ingen {
 namespace Shared {
 
-/** Implementation of the LV2 URI Map and URI Unmap extensions
+/** Implementation of the LV2 URI Map extension
  */
 class LV2URIMap : public boost::noncopyable, public LV2Features::Feature {
 public:
@@ -43,18 +42,6 @@ public:
 		return SharedPtr<LV2_Feature>(&uri_map_feature, NullDeleter<LV2_Feature>);
 	}
 
-	struct UnmapFeature : public LV2Features::Feature {
-		UnmapFeature(const LV2URIMap& map) : _feature(map.uri_unmap_feature) {}
-
-		SharedPtr<LV2_Feature> feature(Shared::World*, Node*) {
-			return SharedPtr<LV2_Feature>(&_feature, NullDeleter<LV2_Feature>);
-		}
-
-		LV2_Feature _feature;
-	};
-
-	SharedPtr<UnmapFeature> unmap_feature() { return _unmap_feature; }
-
 	virtual uint32_t    uri_to_id(const char* map, const char* uri);
 	virtual const char* id_to_uri(const char* map, uint32_t id);
 
@@ -66,19 +53,10 @@ private:
 	                                  const char*               map,
 	                                  const char*               uri);
 
-	static const char* uri_unmap_id_to_uri(LV2_URI_Map_Callback_Data callback_data,
-	                                       const char*               map,
-	                                       const uint32_t            id);
-
 	LV2_Feature         uri_map_feature;
 	LV2_URI_Map_Feature uri_map_feature_data;
 
-	LV2_Feature           uri_unmap_feature;
-	LV2_URI_Unmap_Feature uri_unmap_feature_data;
-
-	SharedPtr<UnmapFeature> _unmap_feature;
-
-	typedef std::map<uint16_t, uint32_t> EventToGlobal;
+typedef std::map<uint16_t, uint32_t> EventToGlobal;
 	typedef std::map<uint32_t, uint16_t> GlobalToEvent;
 
 	EventToGlobal _event_to_global;
diff --git a/src/shared/World.cpp b/src/shared/World.cpp
index c70b9196..ba1e6802 100644
--- a/src/shared/World.cpp
+++ b/src/shared/World.cpp
@@ -108,7 +108,6 @@ public:
 	{
 		lv2_features = new Ingen::Shared::LV2Features();
 		lv2_features->add_feature(uris);
-		lv2_features->add_feature(uris->unmap_feature());
 		lilv_world_load_all(lilv_world);
 
 		// Set up RDF namespaces
diff --git a/wscript b/wscript
index c1f4973f..d314cd8d 100644
--- a/wscript
+++ b/wscript
@@ -94,8 +94,6 @@ def configure(conf):
                       uselib_store='LV2_RESIZE')
     autowaf.check_pkg(conf, 'lv2-lv2plug.in-ns-ext-uri-map',
                       uselib_store='LV2_URI_MAP')
-    autowaf.check_pkg(conf, 'lv2-lv2plug.in-ns-ext-uri-unmap',
-                      uselib_store='LV2_URI_UNMAP')
 
     autowaf.define(conf, 'INGEN_VERSION', INGEN_VERSION)
 
-- 
cgit v1.2.1