diff options
| -rw-r--r-- | lilv/lilv.h | 44 | ||||
| -rw-r--r-- | src/collections.c | 2 | ||||
| -rw-r--r-- | src/instance.c | 11 | ||||
| -rw-r--r-- | src/lilv_internal.h | 2 | ||||
| -rw-r--r-- | src/plugin.c | 10 | ||||
| -rw-r--r-- | src/pluginclass.c | 2 | ||||
| -rw-r--r-- | src/port.c | 4 | ||||
| -rw-r--r-- | src/query.c | 4 | ||||
| -rw-r--r-- | src/util.c | 6 | ||||
| -rw-r--r-- | src/world.c | 3 | ||||
| -rw-r--r-- | utils/lilv-bench.c (renamed from utils/lilv_bench.c) | 0 | ||||
| -rw-r--r-- | utils/lv2info.c (renamed from utils/lv2_inspect.c) | 0 | ||||
| -rw-r--r-- | utils/lv2jack.c (renamed from utils/lv2_jack_host.c) | 0 | ||||
| -rw-r--r-- | utils/lv2ls.c (renamed from utils/lv2_list.c) | 0 | ||||
| -rw-r--r-- | wscript | 10 |
15 files changed, 50 insertions, 48 deletions
diff --git a/lilv/lilv.h b/lilv/lilv.h index 0f3e998..d3b3782 100644 --- a/lilv/lilv.h +++ b/lilv/lilv.h @@ -62,7 +62,7 @@ typedef struct LilvPluginClassImpl LilvPluginClass; /**< Plugin Class. */ typedef struct LilvPortImpl LilvPort; /**< Port. */ typedef struct LilvScalePointImpl LilvScalePoint; /**< Scale Point (Notch). */ typedef struct LilvUIImpl LilvUI; /**< Plugin UI. */ -typedef struct LilvNodeImpl LilvNode; /**< Typed Value. */ +typedef struct LilvNodeImpl LilvNode; /**< Typed Value. */ typedef struct LilvWorldImpl LilvWorld; /**< Lilv World. */ typedef struct LilvInstanceImpl LilvInstance; /**< Plugin instance. */ @@ -71,7 +71,7 @@ typedef void LilvPluginClasses; /**< set<PluginClass>. */ typedef void LilvPlugins; /**< set<Plugin>. */ typedef void LilvScalePoints; /**< set<ScalePoint>. */ typedef void LilvUIs; /**< set<UI>. */ -typedef void LilvNodes; /**< set<Value>. */ +typedef void LilvNodes; /**< set<Value>. */ /** @defgroup lilv Lilv @@ -481,7 +481,7 @@ lilv_plugins_is_end(const LilvPlugins* collection, LilvIter* i); LILV_API const LilvPlugin* lilv_plugins_get_by_uri(const LilvPlugins* plugins, - const LilvNode* uri); + const LilvNode* uri); /** @} @@ -525,8 +525,8 @@ lilv_world_new(void); */ LILV_API void -lilv_world_set_option(LilvWorld* world, - const char* uri, +lilv_world_set_option(LilvWorld* world, + const char* uri, const LilvNode* value); /** @@ -569,7 +569,7 @@ lilv_world_load_all(LilvWorld* world); LILV_API void lilv_world_load_bundle(LilvWorld* world, - LilvNode* bundle_uri); + LilvNode* bundle_uri); /** Get the parent of all other plugin classes, lv2:Plugin. @@ -709,7 +709,7 @@ lilv_plugin_get_class(const LilvPlugin* plugin); LILV_API LilvNodes* lilv_plugin_get_value(const LilvPlugin* p, - const LilvNode* predicate); + const LilvNode* predicate); /** Get a value associated with some subject in a plugin's data files. @@ -729,8 +729,8 @@ lilv_plugin_get_value(const LilvPlugin* p, LILV_API LilvNodes* lilv_plugin_get_value_for_subject(const LilvPlugin* p, - const LilvNode* subject_uri, - const LilvNode* predicate_uri); + const LilvNode* subject_uri, + const LilvNode* predicate_uri); /** Return whether a feature is supported by a plugin. @@ -740,7 +740,7 @@ lilv_plugin_get_value_for_subject(const LilvPlugin* p, LILV_API bool lilv_plugin_has_feature(const LilvPlugin* p, - const LilvNode* feature_uri); + const LilvNode* feature_uri); /** Get the LV2 Features supported (required or optionally) by a plugin. @@ -820,7 +820,7 @@ lilv_plugin_get_port_ranges_float(const LilvPlugin* p, LILV_API uint32_t lilv_plugin_get_num_ports_of_class(const LilvPlugin* p, - const LilvNode* class_1, ...); + const LilvNode* class_1, ...); /** Return whether or not the plugin introduces (and reports) latency. @@ -860,7 +860,7 @@ lilv_plugin_get_port_by_index(const LilvPlugin* plugin, LILV_API const LilvPort* lilv_plugin_get_port_by_symbol(const LilvPlugin* plugin, - const LilvNode* symbol); + const LilvNode* symbol); /** Get the full name of the plugin's author. @@ -912,7 +912,7 @@ LILV_API LilvNodes* lilv_port_get_value(const LilvPlugin* plugin, const LilvPort* port, - const LilvNode* predicate); + const LilvNode* predicate); /** Return the LV2 port properties of a port. @@ -929,7 +929,7 @@ LILV_API bool lilv_port_has_property(const LilvPlugin* p, const LilvPort* port, - const LilvNode* property_uri); + const LilvNode* property_uri); /** Return whether a port is an event port and supports a certain event type. @@ -938,7 +938,7 @@ LILV_API bool lilv_port_supports_event(const LilvPlugin* p, const LilvPort* port, - const LilvNode* event_uri); + const LilvNode* event_uri); /** Get the symbol of a port. @@ -985,7 +985,7 @@ LILV_API bool lilv_port_is_a(const LilvPlugin* plugin, const LilvPort* port, - const LilvNode* port_class); + const LilvNode* port_class); /** Get the default, minimum, and maximum values of a port. @@ -999,9 +999,9 @@ LILV_API void lilv_port_get_range(const LilvPlugin* plugin, const LilvPort* port, - LilvNode** deflt, - LilvNode** min, - LilvNode** max); + LilvNode** deflt, + LilvNode** min, + LilvNode** max); /** Get the scale points (enumeration values) of a port. @@ -1172,7 +1172,7 @@ lilv_instance_activate(LilvInstance* instance) */ static inline void lilv_instance_run(LilvInstance* instance, - uint32_t sample_count) + uint32_t sample_count) { instance->lv2_descriptor->run(instance->lv2_handle, sample_count); } @@ -1298,8 +1298,8 @@ LILV_API unsigned lilv_ui_is_supported(const LilvUI* ui, LilvUISupportedFunc supported_func, - const LilvNode* container_type, - const LilvNode** ui_type); + const LilvNode* container_type, + const LilvNode** ui_type); /** Get the URI for a Plugin UI's bundle. diff --git a/src/collections.c b/src/collections.c index 11f3bfc..6439f09 100644 --- a/src/collections.c +++ b/src/collections.c @@ -201,5 +201,5 @@ LILV_API LilvNode* lilv_nodes_get_first(const LilvNodes* collection) { return (LilvNode*)lilv_collection_get(collection, - lilv_collection_begin(collection)); + lilv_collection_begin(collection)); } diff --git a/src/instance.c b/src/instance.c index 9f99534..717bdb6 100644 --- a/src/instance.c +++ b/src/instance.c @@ -61,14 +61,14 @@ lilv_plugin_instantiate(const LilvPlugin* plugin, } else { // Search for plugin by URI - const char* bundle_path = lilv_uri_to_path(lilv_node_as_uri( - lilv_plugin_get_bundle_uri(plugin))); + const char* bundle_path = lilv_uri_to_path( + lilv_node_as_uri(lilv_plugin_get_bundle_uri(plugin))); for (uint32_t i = 0; true; ++i) { const LV2_Descriptor* ld = df(i); if (!ld) { LILV_ERRORF("Did not find plugin %s in %s\n", - lilv_node_as_uri(lilv_plugin_get_uri(plugin)), lib_path); + lilv_node_as_uri(lilv_plugin_get_uri(plugin)), lib_path); dlclose(lib); break; // return NULL } else { @@ -96,8 +96,9 @@ lilv_plugin_instantiate(const LilvPlugin* plugin, // Create LilvInstance to return result = malloc(sizeof(struct LilvInstanceImpl)); result->lv2_descriptor = ld; - result->lv2_handle = ld->instantiate(ld, sample_rate, (char*)bundle_path, - (features) ? features : local_features); + result->lv2_handle = ld->instantiate( + ld, sample_rate, (char*)bundle_path, + (features) ? features : local_features); result->pimpl = lib; serd_node_free(&abs_uri_node); break; diff --git a/src/lilv_internal.h b/src/lilv_internal.h index 78b377d..32c3420 100644 --- a/src/lilv_internal.h +++ b/src/lilv_internal.h @@ -354,7 +354,7 @@ static inline bool lilv_matches_end(SordIter* matches) { } LilvNodes* lilv_nodes_from_stream_objects(LilvWorld* w, - SordIter* stream); + SordIter* stream); /* ********* Utilities ********* */ diff --git a/src/plugin.c b/src/plugin.c index 3682896..b13bbb8 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -337,7 +337,7 @@ lilv_plugin_get_class(const LilvPlugin* const_p) if ( ! lilv_node_equals(class, p->world->lv2_plugin_class->uri)) { const LilvPluginClass* plugin_class = lilv_plugin_classes_get_by_uri( - p->world->plugin_classes, class); + p->world->plugin_classes, class); if (plugin_class) { ((LilvPlugin*)p)->plugin_class = plugin_class; @@ -390,7 +390,7 @@ LilvNode* lilv_plugin_get_name(const LilvPlugin* plugin) { LilvNodes* results = lilv_plugin_get_value(plugin, - plugin->world->doap_name_val); + plugin->world->doap_name_val); LilvNode* ret = NULL; if (results) { @@ -437,9 +437,9 @@ lilv_plugin_get_value_for_subject(const LilvPlugin* p, (const uint8_t*)lilv_node_as_blank(subject)); LilvNodes* ret = lilv_world_query_values(p->world, - subject_node, - predicate->val.uri_val, - NULL); + subject_node, + predicate->val.uri_val, + NULL); sord_node_free(p->world->world, subject_node); return ret; diff --git a/src/pluginclass.c b/src/pluginclass.c index cceda49..eb6923d 100644 --- a/src/pluginclass.c +++ b/src/pluginclass.c @@ -90,7 +90,7 @@ lilv_plugin_class_get_children(const LilvPluginClass* plugin_class) const LilvPluginClass* c = g_sequence_get(i); const LilvNode* parent = lilv_plugin_class_get_parent_uri(c); if (parent && lilv_node_equals(lilv_plugin_class_get_uri(plugin_class), - parent)) + parent)) lilv_sequence_insert(result, (LilvPluginClass*)c); } @@ -73,7 +73,7 @@ lilv_port_get_node(const LilvPlugin* p, p->world->lv2_symbol_node); const bool matches = lilv_node_equals(symbol, - lilv_port_get_symbol(p, port)); + lilv_port_get_symbol(p, port)); lilv_node_free(symbol); if (matches) { @@ -173,7 +173,7 @@ lilv_port_get_name(const LilvPlugin* p, const LilvPort* port) { LilvNodes* results = lilv_port_get_value(p, port, - p->world->lv2_name_val); + p->world->lv2_name_val); LilvNode* ret = NULL; if (results) { diff --git a/src/query.c b/src/query.c index c64b8c4..1155e44 100644 --- a/src/query.c +++ b/src/query.c @@ -55,7 +55,7 @@ lilv_lang_matches(const char* a, const char* b) LilvNodes* lilv_nodes_from_stream_objects_i18n(LilvWorld* world, - SordIter* stream) + SordIter* stream) { LilvNodes* values = lilv_nodes_new(); const SordNode* nolang = NULL; // Untranslated value @@ -118,7 +118,7 @@ lilv_nodes_from_stream_objects_i18n(LilvWorld* world, LilvNodes* lilv_nodes_from_stream_objects(LilvWorld* world, - SordIter* stream) + SordIter* stream) { if (lilv_matches_end(stream)) { lilv_match_end(stream); @@ -65,13 +65,13 @@ lilv_uri_to_path(const char* uri) #ifdef __WIN32__ if (!strncmp(uri, "file:///", (size_t)8)) { return (char*)(uri + 8); + } #else if (!strncmp(uri, "file://", (size_t)7)) { return (char*)(uri + 7); -#endif - } else { - return NULL; } +#endif + return NULL; } /** Return the current LANG converted to Turtle (i.e. RFC3066) style. diff --git a/src/world.c b/src/world.c index 9d6ac45..7d1c307 100644 --- a/src/world.c +++ b/src/world.c @@ -228,7 +228,8 @@ lilv_world_query_values(LilvWorld* world, const SordNode* predicate, const SordNode* object) { - return lilv_nodes_from_stream_objects(world, + return lilv_nodes_from_stream_objects( + world, lilv_world_query(world, subject, predicate, object)); } diff --git a/utils/lilv_bench.c b/utils/lilv-bench.c index b9e72db..b9e72db 100644 --- a/utils/lilv_bench.c +++ b/utils/lilv-bench.c diff --git a/utils/lv2_inspect.c b/utils/lv2info.c index 48d2935..48d2935 100644 --- a/utils/lv2_inspect.c +++ b/utils/lv2info.c diff --git a/utils/lv2_jack_host.c b/utils/lv2jack.c index 8a388f3..8a388f3 100644 --- a/utils/lv2_jack_host.c +++ b/utils/lv2jack.c diff --git a/utils/lv2_list.c b/utils/lv2ls.c index c8db8aa..c8db8aa 100644 --- a/utils/lv2_list.c +++ b/utils/lv2ls.c @@ -230,9 +230,9 @@ def build(bld): # Utilities if bld.env['BUILD_UTILS']: utils = ''' - utils/lv2_inspect - utils/lv2_list - utils/lilv_bench + utils/lv2info + utils/lv2ls + utils/lilv-bench ''' for i in utils.split(): obj = bld(features = 'c cprogram', @@ -245,11 +245,11 @@ def build(bld): # JACK Host if bld.is_defined('LILV_USE_JACK'): obj = bld(features = 'c cprogram', - source = 'utils/lv2_jack_host.c', + source = 'utils/lv2jack.c', includes = ['.', './src', './utils'], uselib = 'JACK', use = 'liblilv', - target = 'utils/lv2_jack_host', + target = 'utils/lv2jack', install_path = '${BINDIR}') if bld.is_defined('LILV_JACK_SESSION'): autowaf.use_lib(bld, obj, 'GLIB GTHREAD') |