summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2018-12-28 11:25:15 -0500
committerDavid Robillard <d@drobilla.net>2021-03-24 10:58:32 -0400
commitccbc5e1993568a3ef27790ebad27b71f3073ca88 (patch)
treecdd952a2b6cb9201150a3cd232f85fcfba36de7c
parent52cd7ee00e64a021128034da5855a88be52f0871 (diff)
downloadlilv-ccbc5e1993568a3ef27790ebad27b71f3073ca88.tar.gz
lilv-ccbc5e1993568a3ef27790ebad27b71f3073ca88.tar.bz2
lilv-ccbc5e1993568a3ef27790ebad27b71f3073ca88.zip
Remove old URI defines
-rw-r--r--include/lilv/lilv.h10
-rw-r--r--meson.build2
-rw-r--r--src/lilv_config.h2
-rw-r--r--src/state.c4
-rw-r--r--utils/lv2info.c4
5 files changed, 6 insertions, 16 deletions
diff --git a/include/lilv/lilv.h b/include/lilv/lilv.h
index 5fd7a9f..c557946 100644
--- a/include/lilv/lilv.h
+++ b/include/lilv/lilv.h
@@ -61,16 +61,6 @@ extern "C" {
#define LILV_NS_RDFS "http://www.w3.org/2000/01/rdf-schema#"
#define LILV_NS_XSD "http://www.w3.org/2001/XMLSchema#"
-#define LILV_URI_ATOM_PORT "http://lv2plug.in/ns/ext/atom#AtomPort"
-#define LILV_URI_AUDIO_PORT "http://lv2plug.in/ns/lv2core#AudioPort"
-#define LILV_URI_CONTROL_PORT "http://lv2plug.in/ns/lv2core#ControlPort"
-#define LILV_URI_CV_PORT "http://lv2plug.in/ns/lv2core#CVPort"
-#define LILV_URI_EVENT_PORT "http://lv2plug.in/ns/ext/event#EventPort"
-#define LILV_URI_INPUT_PORT "http://lv2plug.in/ns/lv2core#InputPort"
-#define LILV_URI_MIDI_EVENT "http://lv2plug.in/ns/ext/midi#MidiEvent"
-#define LILV_URI_OUTPUT_PORT "http://lv2plug.in/ns/lv2core#OutputPort"
-#define LILV_URI_PORT "http://lv2plug.in/ns/lv2core#Port"
-
struct LilvInstanceImpl;
/**
diff --git a/meson.build b/meson.build
index 788142c..26eaae8 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
project('lilv', ['c'],
- version: '0.24.13',
+ version: '1.0.0',
license: 'ISC',
meson_version: '>= 0.49.2',
default_options: [
diff --git a/src/lilv_config.h b/src/lilv_config.h
index 10231c5..1f4412d 100644
--- a/src/lilv_config.h
+++ b/src/lilv_config.h
@@ -29,7 +29,7 @@
#define LILV_CONFIG_H
// Define version unconditionally so a warning will catch a mismatch
-#define LILV_VERSION "0.24.13"
+#define LILV_VERSION "1.0.0"
#if !defined(LILV_NO_DEFAULT_CONFIG)
diff --git a/src/state.c b/src/state.c
index a4a50a9..d34f761 100644
--- a/src/state.c
+++ b/src/state.c
@@ -461,8 +461,8 @@ lilv_state_new_from_instance(const LilvPlugin* plugin,
// Store port values
if (get_value) {
- LilvNode* lv2_ControlPort = lilv_new_uri(world, LILV_URI_CONTROL_PORT);
- LilvNode* lv2_InputPort = lilv_new_uri(world, LILV_URI_INPUT_PORT);
+ LilvNode* lv2_ControlPort = lilv_new_uri(world, LV2_CORE__ControlPort);
+ LilvNode* lv2_InputPort = lilv_new_uri(world, LV2_CORE__InputPort);
for (uint32_t i = 0; i < plugin->num_ports; ++i) {
const LilvPort* const port = plugin->ports[i];
if (lilv_port_is_a(plugin, port, lv2_ControlPort) &&
diff --git a/utils/lv2info.c b/utils/lv2info.c
index 81a3ed4..328219c 100644
--- a/utils/lv2info.c
+++ b/utils/lv2info.c
@@ -399,8 +399,8 @@ main(int argc, char** argv)
}
applies_to_pred = lilv_new_uri(world, LV2_CORE__appliesTo);
- control_class = lilv_new_uri(world, LILV_URI_CONTROL_PORT);
- event_class = lilv_new_uri(world, LILV_URI_EVENT_PORT);
+ control_class = lilv_new_uri(world, LV2_CORE__ControlPort);
+ event_class = lilv_new_uri(world, LV2_EVENT__EventPort);
group_pred = lilv_new_uri(world, LV2_PORT_GROUPS__group);
label_pred = lilv_new_uri(world, LILV_NS_RDFS "label");
preset_class = lilv_new_uri(world, LV2_PRESETS__Preset);