diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/collections.c | 1 | ||||
| -rw-r--r-- | src/plugin.c | 2 | ||||
| -rw-r--r-- | src/pluginuiinstance.c | 4 | ||||
| -rw-r--r-- | src/port.c | 6 | ||||
| -rw-r--r-- | src/query.c | 2 | ||||
| -rw-r--r-- | src/slv2_internal.h | 18 | ||||
| -rw-r--r-- | src/util.c | 2 | ||||
| -rw-r--r-- | src/world.c | 4 |
8 files changed, 13 insertions, 26 deletions
diff --git a/src/collections.c b/src/collections.c index 4c3ae5e..a13ceb2 100644 --- a/src/collections.c +++ b/src/collections.c @@ -136,7 +136,6 @@ slv2_plugins_get_by_uri(SLV2Plugins list, SLV2Value uri) return (SLV2Plugin)slv2_sequence_get_by_uri(list, uri); } - /* Values */ SLV2_API diff --git a/src/plugin.c b/src/plugin.c index a4f9338..ea48507 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -805,7 +805,7 @@ slv2_plugin_get_uis(SLV2Plugin p) SLV2_ERROR("Corrupt UI\n"); continue; } - + SLV2UI slv2_ui = slv2_ui_new( p->world, slv2_value_new_from_node(p->world, ui), diff --git a/src/pluginuiinstance.c b/src/pluginuiinstance.c index 189ae6e..6231705 100644 --- a/src/pluginuiinstance.c +++ b/src/pluginuiinstance.c @@ -46,7 +46,7 @@ slv2_ui_instantiate(SLV2Plugin plugin, const LV2_Feature* const* features) { SLV2UIHost ui_host = slv2_ui_host_new(write_function, NULL, NULL, NULL); - + SLV2UIInstance ret = slv2_ui_instance_new( plugin, ui, NULL, ui_host, controller, features); @@ -75,7 +75,7 @@ slv2_ui_host_free(SLV2UIHost ui_host) { free(ui_host); } - + SLV2_API SLV2UIInstance slv2_ui_instance_new(SLV2Plugin plugin, @@ -187,7 +187,7 @@ slv2_port_get_value(SLV2Plugin p, } return slv2_port_get_value_by_node( - p, port, + p, port, slv2_value_as_node(predicate)); } @@ -206,7 +206,7 @@ slv2_port_get_name(SLV2Plugin p, { SLV2Values results = slv2_port_get_value(p, port, p->world->lv2_name_val); - + SLV2Value ret = NULL; if (results) { SLV2Value val = slv2_values_get_first(results); @@ -218,7 +218,7 @@ slv2_port_get_name(SLV2Plugin p, if (!ret) SLV2_WARNF("<%s> has no (mandatory) doap:name\n", slv2_value_as_string(slv2_plugin_get_uri(p))); - + return ret; } diff --git a/src/query.c b/src/query.c index ab32c1c..aa0e8c4 100644 --- a/src/query.c +++ b/src/query.c @@ -96,7 +96,7 @@ slv2_values_from_stream_objects_i18n(SLV2Plugin p, lm = SLV2_LANG_MATCH_EXACT; } } - + if (lm == SLV2_LANG_MATCH_EXACT) { // Exact language match, add to results slv2_array_append(values, slv2_value_new_from_node(p->world, value)); diff --git a/src/slv2_internal.h b/src/slv2_internal.h index e2a6807..f49f404 100644 --- a/src/slv2_internal.h +++ b/src/slv2_internal.h @@ -88,8 +88,6 @@ slv2_match_end(SLV2Matches iter) sord_iter_free(iter); } - - /* ********* PORT ********* */ /** Reference to a port on some plugin. */ @@ -99,11 +97,9 @@ struct _SLV2Port { SLV2Values classes; ///< rdf:type }; - SLV2Port slv2_port_new(SLV2World world, uint32_t index, const char* symbol); void slv2_port_free(SLV2Port port); - /* ********* Plugin ********* */ /** Header of an SLV2Plugin, SLV2PluginClass, or SLV2UI. @@ -114,7 +110,7 @@ struct _SLV2Header { struct _SLV2World* world; SLV2Value uri; }; - + /** Record of an installed/available plugin. * * A simple reference to a plugin somewhere on the system. This just holds @@ -145,7 +141,6 @@ slv2_plugin_get_unique(SLV2Plugin p, /* ********* Plugins ********* */ - SLV2Plugins slv2_plugins_new(); @@ -165,7 +160,7 @@ slv2_collection_size(SLV2Collection collection); /** Get an element from @a collection by index. - + @a index has no significance other than as an index into @a collection. Any @a index not less than the size of the collection will return NULL, @@ -174,7 +169,7 @@ slv2_collection_size(SLV2Collection collection); Note this function is a search, and not constant time. This function is deprecated, use iterators instead. - + @return NULL if @a index is out of range. */ SLV2_DEPRECATED @@ -190,7 +185,6 @@ struct _SLV2InstanceImpl { void* lib_handle; }; - /* ********* UI Instance ********* */ struct _SLV2UIInstance { @@ -220,13 +214,11 @@ SLV2PluginClass slv2_plugin_class_new(SLV2World world, void slv2_plugin_class_free(SLV2PluginClass plugin_class); - /* ********* Plugin Classes ********* */ SLV2PluginClasses slv2_plugin_classes_new(); void slv2_plugin_classes_free(); - /* ********* World ********* */ typedef struct { @@ -280,7 +272,6 @@ slv2_world_blank_node_prefix(SLV2World world); void slv2_world_load_file(SLV2World world, const char* file_uri); - /* ********* Plugin UI ********* */ struct _SLV2UI { @@ -353,7 +344,6 @@ static inline void slv2_node_free(SLV2World world, SLV2Node node) { sord_node_free(world->world, node); } - /* ********* Scale Points ********* */ struct _SLV2ScalePoint { @@ -364,7 +354,6 @@ struct _SLV2ScalePoint { SLV2ScalePoint slv2_scale_point_new(SLV2Value value, SLV2Value label); void slv2_scale_point_free(SLV2ScalePoint point); - /* ********* Query Results ********* */ SLV2Matches slv2_plugin_find_statements(SLV2Plugin plugin, @@ -383,7 +372,6 @@ static inline bool slv2_matches_end(SLV2Matches matches) { SLV2Values slv2_values_from_stream_objects(SLV2Plugin p, SLV2Matches stream); - /* ********* Utilities ********* */ char* slv2_strjoin(const char* first, ...); @@ -94,7 +94,7 @@ slv2_get_lang() || !strcmp(env_lang, "C") || !strcmp(env_lang, "POSIX")) { return NULL; } - + const size_t env_lang_len = strlen(env_lang); char* const lang = malloc(env_lang_len + 1); for (size_t i = 0; i < env_lang_len + 1; ++i) { diff --git a/src/world.c b/src/world.c index 6d31cd7..4155c07 100644 --- a/src/world.c +++ b/src/world.c @@ -247,7 +247,7 @@ struct _SLV2Header* slv2_sequence_get_by_uri(GSequence* seq, SLV2Value uri) { - struct _SLV2Header key = { NULL, uri }; + struct _SLV2Header key = { NULL, uri }; GSequenceIter* i = g_sequence_search( seq, &key, slv2_header_compare_by_uri, NULL); @@ -303,7 +303,7 @@ slv2_world_add_plugin(SLV2World world, if (dyn_manifest_lib) { plugin->dynman_uri = slv2_value_new_from_node(world, dyn_manifest_lib); } - + // Add all plugin data files (rdfs:seeAlso) SLV2Matches files = slv2_world_find_statements( world, world->model, |