From aae0d7d82bcc60d6977dd11bcdc60579aace04cb Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Thu, 10 Mar 2011 03:09:51 +0000
Subject: Use LV2_EVENT_URI.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3062 a436a847-0d15-0410-975c-d299462d15a1
---
 src/shared/LV2URIMap.cpp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'src/shared')

diff --git a/src/shared/LV2URIMap.cpp b/src/shared/LV2URIMap.cpp
index d72739df..b7ad7b07 100644
--- a/src/shared/LV2URIMap.cpp
+++ b/src/shared/LV2URIMap.cpp
@@ -16,12 +16,19 @@
  */
 
 #define __STDC_LIMIT_MACROS 1
-#include <cassert>
+
+#include <assert.h>
 #include <stdint.h>
+
 #include <glib.h>
+
 #include <boost/shared_ptr.hpp>
+
 #include "raul/log.hpp"
+
 #include "lv2/lv2plug.in/ns/ext/atom/atom.h"
+#include "lv2/lv2plug.in/ns/ext/event/event.h"
+
 #include "LV2URIMap.hpp"
 
 using namespace std;
@@ -132,18 +139,18 @@ LV2URIMap::uri_to_id(const char* map,
                      const char* uri)
 {
 	const uint32_t id = static_cast<uint32_t>(g_quark_from_string(uri));
-	if (map && !strcmp(map, "http://lv2plug.in/ns/ext/event")) {
+	if (map && !strcmp(map, LV2_EVENT_URI)) {
 		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) {
 				error << "Event URI " << uri << " ID out of range." << endl;
-				return NULL;
+				return 0;
 			}
 			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));
+			_global_to_event.insert(make_pair(id,    ev_id));
 			_event_to_global.insert(make_pair(ev_id, id));
 			return ev_id;
 		}
@@ -157,7 +164,7 @@ const char*
 LV2URIMap::id_to_uri(const char*    map,
                      const uint32_t id)
 {
-	if (map && !strcmp(map, "http://lv2plug.in/ns/ext/event")) {
+	if (map && !strcmp(map, LV2_EVENT_URI)) {
 		EventToGlobal::iterator i = _event_to_global.find(id);
 		if (i == _event_to_global.end()) {
 			error << "Failed to unmap event URI " << id << endl;
-- 
cgit v1.2.1