Correctly implement LV2 event URI mapping (event URI context is restricted to uint16_t).

Implement LV2 URI Unmap extension.


git-svn-id: svn://localhost/ardour2/branches/3.0@8139 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 62 insertions, 20 deletions

diff --git a/libs/ardour/uri_map.cc b/libs/ardour/uri_map.cc
index a551a5b5a4..116236a8b6 100644
--- a/libs/ardour/uri_map.cc
+++ b/libs/ardour/uri_map.cc
@@ -20,7 +20,14 @@
 
 #include <cassert>
 #include <iostream>
+
 #include <stdint.h>
+#include <string.h>
+
+#include <glib.h>
+
+#include "pbd/error.h"
+
 #include "ardour/uri_map.h"
 
 using namespace std;
@@ -29,12 +36,16 @@ namespace ARDOUR {
 
 
 URIMap::URIMap()
-	: next_uri_id(1)
 {
-	uri_map_feature_data.uri_to_id = &URIMap::uri_map_uri_to_id;
+	uri_map_feature_data.uri_to_id     = &URIMap::uri_map_uri_to_id;
 	uri_map_feature_data.callback_data = this;
-	uri_map_feature.URI = LV2_URI_MAP_URI;
-	uri_map_feature.data = &uri_map_feature_data;
+	uri_map_feature.URI                = LV2_URI_MAP_URI;
+	uri_map_feature.data               = &uri_map_feature_data;
+
+	uri_unmap_feature_data.id_to_uri     = &URIMap::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;
 }
 
 
@@ -42,33 +53,64 @@ uint32_t
 URIMap::uri_to_id(const char* map,
                   const char* uri)
 {
-	return uri_map_uri_to_id(this, map, uri);
+	const uint32_t id = static_cast<uint32_t>(g_quark_from_string(uri));
+	if (map && !strcmp(map, "http://lv2plug.in/ns/ext/event")) {
+		GlobalToEvent::iterator i = _global_to_event.find(id);
+		if (i != _global_to_event.end()) {
+			return i->second;
+		} else {
+			if (_global_to_event.size() + 1 > UINT16_MAX) {
+				PBD::error << "Event URI " << uri << " ID out of range." << endl;
+				return NULL;
+			}
+			const uint16_t ev_id = _global_to_event.size() + 1;
+			assert(_event_to_global.find(ev_id) == _event_to_global.end());
+			_global_to_event.insert(make_pair(id, ev_id));
+			_event_to_global.insert(make_pair(ev_id, id));
+			return ev_id;
+		}
+	} else {
+		return id;
+	}
+}
+
+
+const char*
+URIMap::id_to_uri(const char*    map,
+                  const uint32_t id)
+{
+	if (map && !strcmp(map, "http://lv2plug.in/ns/ext/event")) {
+		EventToGlobal::iterator i = _event_to_global.find(id);
+		if (i == _event_to_global.end()) {
+			PBD::error << "Failed to unmap event URI " << id << endl;
+			return NULL;
+		}
+		return g_quark_to_string(i->second);
+	} else {
+		return g_quark_to_string(id);
+	}
+
 }
 
 
 uint32_t
 URIMap::uri_map_uri_to_id(LV2_URI_Map_Callback_Data callback_data,
-                          const char*               /*map*/,
+                          const char*               map,
                           const char*               uri)
 {
-	// TODO: map ignored, < UINT16_MAX assumed
-
 	URIMap* me = (URIMap*)callback_data;
-	uint32_t ret = 0;
+	return me->uri_to_id(map, uri);
 
-	Map::iterator i = me->uri_map.find(uri);
-	if (i != me->uri_map.end()) {
-		ret = i->second;
-	} else {
-		ret = me->next_uri_id++;
-		me->uri_map.insert(make_pair(string(uri), ret));
-	}
+}
 
-	/*cout << "URI MAP (" << (map ? (void*)map : NULL)
-		<< "): " << uri << " -> " << ret << endl;*/
 
-	assert(ret <= UINT16_MAX);
-	return ret;
+const char*
+URIMap::uri_unmap_id_to_uri(LV2_URI_Map_Callback_Data callback_data,
+                            const char*               map,
+                            uint32_t                  id)
+{
+	URIMap* me = (URIMap*)callback_data;
+	return me->id_to_uri(map, id);
 }