summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-04-30 01:40:20 +0000
committerDavid Robillard <d@drobilla.net>2011-04-30 01:40:20 +0000
commit054c39b12cb610d79006f0b51153cb2c4aa5a0b7 (patch)
tree3f96f5d9f17a61bba50f12227e510a033cda5e8a /utils
parent2aebf86c27288254da4765116686101a88840cbd (diff)
downloadlilv-054c39b12cb610d79006f0b51153cb2c4aa5a0b7.tar.gz
lilv-054c39b12cb610d79006f0b51153cb2c4aa5a0b7.tar.bz2
lilv-054c39b12cb610d79006f0b51153cb2c4aa5a0b7.zip
Cache port RDF node on load instead of searching for it repeatedly.
Consistent namespace and URI define names. git-svn-id: http://svn.drobilla.net/lad/trunk/lilv@3240 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'utils')
-rw-r--r--utils/lv2info.c4
-rw-r--r--utils/lv2jack.c16
2 files changed, 10 insertions, 10 deletions
diff --git a/utils/lv2info.c b/utils/lv2info.c
index f1f3fab..53d9b05 100644
--- a/utils/lv2info.c
+++ b/utils/lv2info.c
@@ -327,8 +327,8 @@ main(int argc, char** argv)
#define NS_PSET "http://lv2plug.in/ns/ext/presets#"
#define NS_EV "http://lv2plug.in/ns/ext/event#"
- control_class = lilv_new_uri(world, LILV_PORT_CLASS_CONTROL);
- event_class = lilv_new_uri(world, LILV_PORT_CLASS_EVENT);
+ control_class = lilv_new_uri(world, LILV_URI_CONTROL_PORT);
+ event_class = lilv_new_uri(world, LILV_URI_EVENT_PORT);
in_group_pred = lilv_new_uri(world, NS_PG "inGroup");
preset_pred = lilv_new_uri(world, NS_PSET "hasPreset");
role_pred = lilv_new_uri(world, NS_PG "role");
diff --git a/utils/lv2jack.c b/utils/lv2jack.c
index 8a388f3..88e41d8 100644
--- a/utils/lv2jack.c
+++ b/utils/lv2jack.c
@@ -83,7 +83,7 @@ uri_to_id(LV2_URI_Map_Callback_Data callback_data,
const char* uri)
{
/* Note a non-trivial host needs to use an actual dictionary here */
- if (!strcmp(map, LV2_EVENT_URI) && !strcmp(uri, LILV_EVENT_CLASS_MIDI))
+ if (!strcmp(map, LV2_EVENT_URI) && !strcmp(uri, LILV_URI_MIDI_EVENT))
return MIDI_EVENT_ID;
else
return 0; /* Refuse to map ID */
@@ -310,13 +310,13 @@ main(int argc, char** argv)
const LilvPlugins* plugins = lilv_world_get_all_plugins(world);
/* Set up the port classes this app supports */
- host.input_class = lilv_new_uri(world, LILV_PORT_CLASS_INPUT);
- host.output_class = lilv_new_uri(world, LILV_PORT_CLASS_OUTPUT);
- host.control_class = lilv_new_uri(world, LILV_PORT_CLASS_CONTROL);
- host.audio_class = lilv_new_uri(world, LILV_PORT_CLASS_AUDIO);
- host.event_class = lilv_new_uri(world, LILV_PORT_CLASS_EVENT);
- host.midi_class = lilv_new_uri(world, LILV_EVENT_CLASS_MIDI);
- host.optional = lilv_new_uri(world, LILV_NAMESPACE_LV2
+ host.input_class = lilv_new_uri(world, LILV_URI_INPUT_PORT);
+ host.output_class = lilv_new_uri(world, LILV_URI_OUTPUT_PORT);
+ host.control_class = lilv_new_uri(world, LILV_URI_CONTROL_PORT);
+ host.audio_class = lilv_new_uri(world, LILV_URI_AUDIO_PORT);
+ host.event_class = lilv_new_uri(world, LILV_URI_EVENT_PORT);
+ host.midi_class = lilv_new_uri(world, LILV_URI_MIDI_EVENT);
+ host.optional = lilv_new_uri(world, LILV_NS_LV2
"connectionOptional");
#ifdef LILV_JACK_SESSION