summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-03-26 19:35:21 +0000
committerDavid Robillard <d@drobilla.net>2012-03-26 19:35:21 +0000
commitfb451c37b08366e1fa52762fe928e607c599dee4 (patch)
treec4543decc6b0e82282053f7ccc5200c3fd4b42e5
parent8a7e27e70ad3df76cc1fb69820bde805cba18c3e (diff)
downloadlilv-fb451c37b08366e1fa52762fe928e607c599dee4.tar.gz
lilv-fb451c37b08366e1fa52762fe928e607c599dee4.tar.bz2
lilv-fb451c37b08366e1fa52762fe928e607c599dee4.zip
lilv_plugin_get_port_by_parameter() => lilv_plugin_get_port_by_designation().
git-svn-id: http://svn.drobilla.net/lad/trunk/lilv@4109 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--ChangeLog2
-rw-r--r--lilv/lilv.h17
-rw-r--r--src/lilv_internal.h10
-rw-r--r--src/plugin.c10
-rw-r--r--src/world.c8
-rw-r--r--wscript2
6 files changed, 26 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog
index 2d4291c..6f115b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,7 +22,7 @@ lilv (UNRELEASED) unstable; urgency=low
* Update old references to lv2_list (now lv2ls)
* Support compilation as C++ under MSVC++.
* Remove use of wordexp.
- * Add lilv_plugin_get_port_by_property() and lilv_port_get_index() as an
+ * Add lilv_plugin_get_port_by_designation() and lilv_port_get_index() as an
improved generic alternative to lilv_plugin_get_latency_port_index().
-- David Robillard <d@drobilla.net> (UNRELEASED)
diff --git a/lilv/lilv.h b/lilv/lilv.h
index cb9f172..9f77729 100644
--- a/lilv/lilv.h
+++ b/lilv/lilv.h
@@ -899,16 +899,19 @@ lilv_plugin_get_port_by_symbol(const LilvPlugin* plugin,
const LilvNode* symbol);
/**
- Get a port on @c plugin by the parameter it represents.
- If found, the port with matching @a port_class and @a parameter is be
- returned, otherwise NULL is returned. The @a port_class can be used to
- distinguish the input and output ports for a parameter.
+ Get a port on @c plugin by its lv2:designation.
+
+ The designation of a port describes the meaning, assignment, allocation or
+ role of the port, e.g. "left channel" or "gain". If found, the port with
+ matching @a port_class and @a designation is be returned, otherwise NULL is
+ returned. The @a port_class can be used to distinguish the input and output
+ ports for a particular designation.
*/
LILV_API
LilvPort*
-lilv_plugin_get_port_by_parameter(const LilvPlugin* plugin,
- const LilvNode* port_class,
- const LilvNode* parameter);
+lilv_plugin_get_port_by_designation(const LilvPlugin* plugin,
+ const LilvNode* port_class,
+ const LilvNode* designation);
/**
Get the full name of the plugin's author.
diff --git a/src/lilv_internal.h b/src/lilv_internal.h
index a80bfdb..9ae6eed 100644
--- a/src/lilv_internal.h
+++ b/src/lilv_internal.h
@@ -153,25 +153,26 @@ struct LilvWorldImpl {
ZixTree* libs;
struct {
SordNode* dc_replaces;
- SordNode* doap_name;
SordNode* dman_DynManifest;
+ SordNode* doap_name;
+ SordNode* lv2_Plugin;
+ SordNode* lv2_Specification;
SordNode* lv2_appliesTo;
SordNode* lv2_binary;
SordNode* lv2_default;
+ SordNode* lv2_designation;
SordNode* lv2_extensionData;
SordNode* lv2_index;
SordNode* lv2_maximum;
SordNode* lv2_minimum;
SordNode* lv2_name;
SordNode* lv2_optionalFeature;
- SordNode* lv2_Plugin;
SordNode* lv2_port;
SordNode* lv2_portProperty;
SordNode* lv2_reportsLatency;
SordNode* lv2_requiredFeature;
- SordNode* lv2_Specification;
SordNode* lv2_symbol;
- SordNode* lv2_isParameter;
+ SordNode* null_uri;
SordNode* pset_value;
SordNode* rdf_a;
SordNode* rdf_value;
@@ -184,7 +185,6 @@ struct LilvWorldImpl {
SordNode* xsd_decimal;
SordNode* xsd_double;
SordNode* xsd_integer;
- SordNode* null_uri;
} uris;
LilvOptions opt;
};
diff --git a/src/plugin.c b/src/plugin.c
index 164a212..fb181c8 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -611,9 +611,9 @@ lilv_plugin_get_port_by_property(const LilvPlugin* plugin,
LILV_API
LilvPort*
-lilv_plugin_get_port_by_parameter(const LilvPlugin* plugin,
- const LilvNode* port_class,
- const LilvNode* parameter)
+lilv_plugin_get_port_by_designation(const LilvPlugin* plugin,
+ const LilvNode* port_class,
+ const LilvNode* designation)
{
LilvWorld* world = plugin->world;
lilv_plugin_load_ports_if_necessary(plugin);
@@ -622,8 +622,8 @@ lilv_plugin_get_port_by_parameter(const LilvPlugin* plugin,
SordIter* iter = lilv_world_query_internal(
world,
port->node,
- world->uris.lv2_isParameter,
- parameter->val.uri_val);
+ world->uris.lv2_designation,
+ designation->val.uri_val);
const bool found = !sord_iter_end(iter) &&
lilv_port_is_a(plugin, port, port_class);
diff --git a/src/world.c b/src/world.c
index 5ec39e2..3c499f9 100644
--- a/src/world.c
+++ b/src/world.c
@@ -53,25 +53,25 @@ lilv_world_new(void)
#define NEW_URI(uri) sord_new_uri(world->world, (const uint8_t*)uri)
world->uris.dc_replaces = NEW_URI(NS_DCTERMS "replaces");
- world->uris.doap_name = NEW_URI(LILV_NS_DOAP "name");
world->uris.dman_DynManifest = NEW_URI(NS_DYNMAN "DynManifest");
+ world->uris.doap_name = NEW_URI(LILV_NS_DOAP "name");
+ world->uris.lv2_Plugin = NEW_URI(LILV_NS_LV2 "Plugin");
+ world->uris.lv2_Specification = NEW_URI(LILV_NS_LV2 "Specification");
world->uris.lv2_appliesTo = NEW_URI(LILV_NS_LV2 "appliesTo");
world->uris.lv2_binary = NEW_URI(LILV_NS_LV2 "binary");
world->uris.lv2_default = NEW_URI(LILV_NS_LV2 "default");
+ world->uris.lv2_designation = NEW_URI(LILV_NS_LV2 "designation");
world->uris.lv2_extensionData = NEW_URI(LILV_NS_LV2 "extensionData");
world->uris.lv2_index = NEW_URI(LILV_NS_LV2 "index");
world->uris.lv2_maximum = NEW_URI(LILV_NS_LV2 "maximum");
world->uris.lv2_minimum = NEW_URI(LILV_NS_LV2 "minimum");
world->uris.lv2_name = NEW_URI(LILV_NS_LV2 "name");
world->uris.lv2_optionalFeature = NEW_URI(LILV_NS_LV2 "optionalFeature");
- world->uris.lv2_Plugin = NEW_URI(LILV_NS_LV2 "Plugin");
world->uris.lv2_port = NEW_URI(LILV_NS_LV2 "port");
world->uris.lv2_portProperty = NEW_URI(LILV_NS_LV2 "portProperty");
world->uris.lv2_reportsLatency = NEW_URI(LILV_NS_LV2 "reportsLatency");
world->uris.lv2_requiredFeature = NEW_URI(LILV_NS_LV2 "requiredFeature");
- world->uris.lv2_Specification = NEW_URI(LILV_NS_LV2 "Specification");
world->uris.lv2_symbol = NEW_URI(LILV_NS_LV2 "symbol");
- world->uris.lv2_isParameter = NEW_URI(LILV_NS_LV2 "isParameter");
world->uris.pset_value = NEW_URI(NS_PSET "value");
world->uris.rdf_a = NEW_URI(LILV_NS_RDF "type");
world->uris.rdf_value = NEW_URI(LILV_NS_RDF "value");
diff --git a/wscript b/wscript
index a2d8b56..e6d759f 100644
--- a/wscript
+++ b/wscript
@@ -8,7 +8,7 @@ import waflib.Options as Options
import waflib.Logs as Logs
# Version of this package (even if built as a child)
-LILV_VERSION = '0.13.0'
+LILV_VERSION = '0.14.0'
LILV_MAJOR_VERSION = '0'
# Library version (UNIX style major, minor, micro)