diff options
| author | David Robillard <d@drobilla.net> | 2008-01-23 05:01:08 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-01-23 05:01:08 +0000 |
| commit | b77bc1e6e272a227794013ce05bf07760c1fb845 (patch) | |
| tree | 669473ddf0affea17e5177393956c0d56a1d5328 | |
| parent | 7b19bdc06b244844653eec56ec4f4589d71698b7 (diff) | |
| download | ingen-b77bc1e6e272a227794013ce05bf07760c1fb845.tar.gz ingen-b77bc1e6e272a227794013ce05bf07760c1fb845.tar.bz2 ingen-b77bc1e6e272a227794013ce05bf07760c1fb845.zip | |
Working Jack MIDI -> generic event port input.
git-svn-id: http://svn.drobilla.net/lad/ingen@1098 a436a847-0d15-0410-975c-d299462d15a1
| -rw-r--r-- | src/common/interface/DataType.hpp | 7 | ||||
| -rw-r--r-- | src/libs/engine/EventBuffer.cpp | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/common/interface/DataType.hpp b/src/common/interface/DataType.hpp index 7ce76be1..d6fe7440 100644 --- a/src/common/interface/DataType.hpp +++ b/src/common/interface/DataType.hpp @@ -27,6 +27,8 @@ namespace Shared { * This type refers to the type of the entire buffer, mirroring LV2, * e.g. :AudioPort and :ControlPort both are really 32-bit floating point, * but they are different port types. + * + * FIXME: Event/MIDI/OSC kludges. */ class DataType { public: @@ -45,7 +47,8 @@ public: _symbol = AUDIO; } else if (uri == type_uri(CONTROL)) { _symbol = CONTROL; - } else if (uri == type_uri(EVENT)) { + } else if (uri == type_uri(EVENT) + || (uri == "ingen:MIDIPort") || uri == "ingen:OSCPort") { _symbol = EVENT; } } @@ -72,6 +75,8 @@ private: case 1: return "ingen:AudioPort"; case 2: return "ingen:ControlPort"; case 3: return "ingen:EventPort"; + case 4: return "ingen:EventPort"; // MIDI + case 5: return "ingen:EventPort"; // OSC default: return ""; } } diff --git a/src/libs/engine/EventBuffer.cpp b/src/libs/engine/EventBuffer.cpp index b706012c..28417c31 100644 --- a/src/libs/engine/EventBuffer.cpp +++ b/src/libs/engine/EventBuffer.cpp @@ -250,6 +250,7 @@ EventBuffer::merge(const EventBuffer& a, const EventBuffer& b) a.rewind(); b.rewind(); +#if 0 uint32_t a_frames; uint32_t a_subframes; uint16_t a_type; @@ -261,6 +262,7 @@ EventBuffer::merge(const EventBuffer& a, const EventBuffer& b) uint16_t b_type; uint16_t b_size; uint8_t* b_data; +#endif cout << "FIXME: merge" << endl; #if 0 |