summaryrefslogtreecommitdiffstats
path: root/src/client
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2010-11-30 23:01:30 +0000
committerDavid Robillard <d@drobilla.net>2010-11-30 23:01:30 +0000
commit27c3aec25ca4eefa88df64b63d50ed4451bec190 (patch)
tree9ec17eeb9ad9080cca2f3a350afe31d696c68638 /src/client
parentd2f94aa4fd3472ff86fea5abe7a58d15a90d3264 (diff)
downloadingen-27c3aec25ca4eefa88df64b63d50ed4451bec190.tar.gz
ingen-27c3aec25ca4eefa88df64b63d50ed4451bec190.tar.bz2
ingen-27c3aec25ca4eefa88df64b63d50ed4451bec190.zip
Consistent naming for URI quarks.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2678 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/client')
-rw-r--r--src/client/DeprecatedLoader.cpp4
-rw-r--r--src/client/PluginUI.cpp6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/client/DeprecatedLoader.cpp b/src/client/DeprecatedLoader.cpp
index a3e13db5..a1e76314 100644
--- a/src/client/DeprecatedLoader.cpp
+++ b/src/client/DeprecatedLoader.cpp
@@ -458,10 +458,10 @@ DeprecatedLoader::load_node(const Path& parent, xmlDocPtr doc, const xmlNodePtr
props.insert(make_pair(_uris->rdf_type, _uris->lv2_ControlPort));
props.insert(make_pair(_uris->rdf_type, _uris->lv2_OutputPort));
} else if (plugin_label == "midi_input") {
- props.insert(make_pair(_uris->rdf_type, _uris->lv2ev_EventPort));
+ props.insert(make_pair(_uris->rdf_type, _uris->ev_EventPort));
props.insert(make_pair(_uris->rdf_type, _uris->lv2_InputPort));
} else if (plugin_label == "midi_output" ) {
- props.insert(make_pair(_uris->rdf_type, _uris->lv2ev_EventPort));
+ props.insert(make_pair(_uris->rdf_type, _uris->ev_EventPort));
props.insert(make_pair(_uris->rdf_type, _uris->lv2_OutputPort));
} else {
is_port = false;
diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp
index e0c7463b..cae67156 100644
--- a/src/client/PluginUI.cpp
+++ b/src/client/PluginUI.cpp
@@ -73,14 +73,14 @@ lv2_ui_write(LV2UI_Controller controller,
ui->world()->engine()->set_property(port->path(), uris.ingen_value, Atom(*(float*)buffer));
- } else if (format == uris.ui_format_events.id) {
+ } else if (format == uris.ui_Events.id) {
LV2_Event_Buffer* buf = (LV2_Event_Buffer*)buffer;
LV2_Event_Iterator iter;
uint8_t* data;
lv2_event_begin(&iter, buf);
while (lv2_event_is_valid(&iter)) {
LV2_Event* const ev = lv2_event_get(&iter, &data);
- if (ev->type == uris.midi_event.id) {
+ if (ev->type == uris.midi_MidiEvent.id) {
// FIXME: bundle multiple events by writing an entire buffer here
ui->world()->engine()->set_property(port->path(), uris.ingen_value,
Atom("http://lv2plug.in/ns/ext/midi#MidiEvent", ev->size, data));
@@ -92,7 +92,7 @@ lv2_ui_write(LV2UI_Controller controller,
lv2_event_increment(&iter);
}
- } else if (format == uris.object_transfer.id) {
+ } else if (format == uris.atom_AtomTransfer.id) {
LV2_Atom* buf = (LV2_Atom*)buffer;
Raul::Atom val;
Shared::LV2Atom::to_atom(uris, buf, val);