diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/ControlBindings.cpp | 2 | ||||
| -rw-r--r-- | src/server/Notification.cpp | 2 | ||||
| -rw-r--r-- | src/shared/URIs.cpp | 27 | ||||
| -rw-r--r-- | src/shared/World.cpp | 21 |
4 files changed, 25 insertions, 27 deletions
diff --git a/src/server/ControlBindings.cpp b/src/server/ControlBindings.cpp index 797b3721..e761ddac 100644 --- a/src/server/ControlBindings.cpp +++ b/src/server/ControlBindings.cpp @@ -79,7 +79,7 @@ ControlBindings::binding_key(const Raul::Atom& binding) const } else if (t->second == uris.midi_Controller) { if ((n = dict.find(uris.midi_controllerNumber)) != dict.end()) key = Key(MIDI_CC, n->second.get_int32()); - } else if (t->second == uris.midi_Note) { + } else if (t->second == uris.midi_NoteOn) { if ((n = dict.find(uris.midi_noteNumber)) != dict.end()) key = Key(MIDI_NOTE, n->second.get_int32()); } diff --git a/src/server/Notification.cpp b/src/server/Notification.cpp index a2e8350d..0d78d0b4 100644 --- a/src/server/Notification.cpp +++ b/src/server/Notification.cpp @@ -52,7 +52,7 @@ Notification::post_process(Notification& note, dict[uris.rdf_type] = uris.midi_ChannelPressure; break; case ControlBindings::MIDI_NOTE: - dict[uris.rdf_type] = uris.midi_Note; + dict[uris.rdf_type] = uris.midi_NoteOn; dict[uris.midi_noteNumber] = note.value.get_int32(); break; case ControlBindings::MIDI_RPN: // TODO diff --git a/src/shared/URIs.cpp b/src/shared/URIs.cpp index cd578846..1aaa549f 100644 --- a/src/shared/URIs.cpp +++ b/src/shared/URIs.cpp @@ -26,6 +26,7 @@ #include "ingen/shared/URIs.hpp" #include "lv2/lv2plug.in/ns/ext/atom/atom.h" +#include "lv2/lv2plug.in/ns/ext/midi/midi.h" #include "raul/log.hpp" using namespace std; @@ -46,13 +47,11 @@ URIs::Quark::c_str() const return g_quark_to_string(id); } -#define NS_CTX "http://lv2plug.in/ns/ext/contexts#" -#define NS_INGEN "http://drobilla.net/ns/ingen#" -#define NS_LV2 "http://lv2plug.in/ns/lv2core#" -#define NS_MIDI "http://drobilla.net/ns/ext/midi#" -#define NS_MIDI "http://drobilla.net/ns/ext/midi#" -#define NS_RDF "http://www.w3.org/1999/02/22-rdf-syntax-ns#" -#define NS_RDFS "http://www.w3.org/2000/01/rdf-schema#" +#define NS_CTX "http://lv2plug.in/ns/ext/contexts#" +#define NS_INGEN "http://drobilla.net/ns/ingen#" +#define NS_LV2 "http://lv2plug.in/ns/lv2core#" +#define NS_RDF "http://www.w3.org/1999/02/22-rdf-syntax-ns#" +#define NS_RDFS "http://www.w3.org/2000/01/rdf-schema#" URIs::URIs() : atom_AtomTransfer (LV2_ATOM_URI "#AtomTransfer") @@ -103,13 +102,13 @@ URIs::URIs() , lv2_sampleRate (NS_LV2 "sampleRate") , lv2_symbol (NS_LV2 "symbol") , lv2_toggled (NS_LV2 "toggled") - , midi_Bender (NS_MIDI "Bender") - , midi_ChannelPressure (NS_MIDI "ChannelPressure") - , midi_Controller (NS_MIDI "Controller") - , midi_MidiEvent ("http://lv2plug.in/ns/ext/midi#MidiEvent") - , midi_Note (NS_MIDI "Note") - , midi_controllerNumber (NS_MIDI "controllerNumber") - , midi_noteNumber (NS_MIDI "noteNumber") + , midi_Bender (LV2_MIDI__Bender) + , midi_ChannelPressure (LV2_MIDI__ChannelPressure) + , midi_Controller (LV2_MIDI__Controller) + , midi_MidiEvent (LV2_MIDI__MidiEvent) + , midi_NoteOn (LV2_MIDI__NoteOn) + , midi_controllerNumber (LV2_MIDI__controllerNumber) + , midi_noteNumber (LV2_MIDI__noteNumber) , rdf_instanceOf (NS_RDF "instanceOf") , rdf_type (NS_RDF "type") , rdfs_seeAlso (NS_RDFS "seeAlso") diff --git a/src/shared/World.cpp b/src/shared/World.cpp index dee5b9b6..554c5af2 100644 --- a/src/shared/World.cpp +++ b/src/shared/World.cpp @@ -112,17 +112,16 @@ public: lilv_world_load_all(lilv_world); // Set up RDF namespaces - rdf_world->add_prefix("atom", "http://lv2plug.in/ns/ext/atom#"); - rdf_world->add_prefix("ctx", "http://lv2plug.in/ns/ext/contexts#"); - rdf_world->add_prefix("doap", "http://usefulinc.com/ns/doap#"); - rdf_world->add_prefix("ingen", "http://drobilla.net/ns/ingen#"); - rdf_world->add_prefix("lv2", "http://lv2plug.in/ns/lv2core#"); - rdf_world->add_prefix("lv2ev", "http://lv2plug.in/ns/ext/event#"); - rdf_world->add_prefix("lv2midi", "http://lv2plug.in/ns/ext/midi#"); - rdf_world->add_prefix("midi", "http://drobilla.net/ns/ext/midi#"); - rdf_world->add_prefix("owl", "http://www.w3.org/2002/07/owl#"); - rdf_world->add_prefix("rdfs", "http://www.w3.org/2000/01/rdf-schema#"); - rdf_world->add_prefix("xsd", "http://www.w3.org/2001/XMLSchema#"); + rdf_world->add_prefix("atom", "http://lv2plug.in/ns/ext/atom#"); + rdf_world->add_prefix("ctx", "http://lv2plug.in/ns/ext/contexts#"); + rdf_world->add_prefix("doap", "http://usefulinc.com/ns/doap#"); + rdf_world->add_prefix("ingen", "http://drobilla.net/ns/ingen#"); + rdf_world->add_prefix("lv2", "http://lv2plug.in/ns/lv2core#"); + rdf_world->add_prefix("lv2ev", "http://lv2plug.in/ns/ext/event#"); + rdf_world->add_prefix("midi", "http://lv2plug.in/ns/ext/midi#"); + rdf_world->add_prefix("owl", "http://www.w3.org/2002/07/owl#"); + rdf_world->add_prefix("rdfs", "http://www.w3.org/2000/01/rdf-schema#"); + rdf_world->add_prefix("xsd", "http://www.w3.org/2001/XMLSchema#"); } virtual ~Pimpl() |