Work on generic LV2 events.

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

3 files changed, 85 insertions, 10 deletions

diff --git a/src/common/interface/DataType.hpp b/src/common/interface/DataType.hpp
index 60056d2b..7ce76be1 100644
--- a/src/common/interface/DataType.hpp
+++ b/src/common/interface/DataType.hpp
@@ -35,8 +35,7 @@ public:
 		UNKNOWN = 0,
 		AUDIO   = 1,
 		CONTROL = 2,
-		MIDI    = 3,
-		OSC     = 4
+		EVENT   = 3
 	};
 	
 	DataType(const std::string& uri)
@@ -46,10 +45,8 @@ public:
 			_symbol = AUDIO;
 		} else if (uri == type_uri(CONTROL)) {
 			_symbol = CONTROL;
-		} else if (uri == type_uri(MIDI)) {
-			_symbol = MIDI;
-		} else if (uri == type_uri(OSC)) {
-			_symbol = OSC;
+		} else if (uri == type_uri(EVENT)) {
+			_symbol = EVENT;
 		}
 	}
 
@@ -66,8 +63,7 @@ public:
 
 	inline bool is_audio()   { return _symbol == AUDIO; }
 	inline bool is_control() { return _symbol == CONTROL; }
-	inline bool is_midi()    { return _symbol == MIDI; }
-	inline bool is_osc()     { return _symbol == OSC; }
+	inline bool is_event()   { return _symbol == EVENT; }
 
 private:
 	
@@ -75,8 +71,7 @@ private:
 		switch (symbol_num) {
 		case 1:  return "ingen:AudioPort";
 		case 2:  return "ingen:ControlPort";
-		case 3:  return "ingen:MIDIPort";
-		case 4:  return "ingen:OSCPort";
+		case 3:  return "ingen:EventPort";
 		default: return "";
 		}
 	}
diff --git a/src/common/interface/EventType.hpp b/src/common/interface/EventType.hpp
new file mode 100644
index 00000000..d74835e6
--- /dev/null
+++ b/src/common/interface/EventType.hpp
@@ -0,0 +1,79 @@
+/* This file is part of Ingen.
+ * Copyright (C) 2008 Dave Robillard <http://drobilla.net>
+ * 
+ * Ingen is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ * 
+ * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef EVENTTYPE_H
+#define EVENTTYPE_H
+
+namespace Ingen {
+namespace Shared {
+
+
+/** A type of event (that can live in an EventBuffer).
+ */
+class EventType {
+public:
+	
+	enum Symbol {
+		UNKNOWN = 0,
+		MIDI    = 1,
+		OSC     = 2
+	};
+	
+	EventType(const std::string& uri)
+		: _symbol(UNKNOWN)
+	{
+		if (uri == type_uri(MIDI)) {
+			_symbol = MIDI;
+		} else if (uri == type_uri(OSC)) {
+			_symbol = OSC;
+		}
+	}
+
+	EventType(Symbol symbol)
+		: _symbol(symbol)
+	{}
+
+	inline const char* uri() const { return type_uri(_symbol); }
+
+	inline bool operator==(const Symbol& symbol) const { return (_symbol == symbol); }
+	inline bool operator!=(const Symbol& symbol) const { return (_symbol != symbol); }
+	inline bool operator==(const EventType& type) const { return (_symbol == type._symbol); }
+	inline bool operator!=(const EventType& type) const { return (_symbol != type._symbol); }
+
+	inline bool is_midi() { return _symbol == MIDI; }
+	inline bool is_osc()  { return _symbol == OSC; }
+
+private:
+	
+	static inline const char* type_uri(unsigned symbol_num)  {
+		switch (symbol_num) {
+		case 1:  return "ingen:MidiEvent";
+		case 2:  return "ingen:OSCEvent";
+		default: return "";
+		}
+	}
+
+	Symbol _symbol;
+};
+
+
+} // namespace Shared
+} // namespace Ingen
+
+using Ingen::Shared::EventType;
+
+#endif // EVENTTYPE_H
diff --git a/src/common/interface/Makefile.am b/src/common/interface/Makefile.am
index b23e2583..9f56791d 100644
--- a/src/common/interface/Makefile.am
+++ b/src/common/interface/Makefile.am
@@ -3,6 +3,7 @@ EXTRA_DIST = \
 	Connection.hpp \
 	DataType.hpp \
 	EngineInterface.hpp \
+	EventType.hpp \
 	GraphObject.hpp \
 	Node.hpp \
 	Patch.hpp \