diff options
| -rw-r--r-- | slv2/collections.h | 16 | ||||
| -rw-r--r-- | slv2/plugin.h | 27 | ||||
| -rw-r--r-- | slv2/pluginclass.h | 5 | ||||
| -rw-r--r-- | slv2/plugininstance.h | 11 | ||||
| -rw-r--r-- | slv2/pluginui.h | 7 | ||||
| -rw-r--r-- | slv2/pluginuiinstance.h | 9 | ||||
| -rw-r--r-- | slv2/port.h | 12 | ||||
| -rw-r--r-- | slv2/scalepoint.h | 3 | ||||
| -rw-r--r-- | slv2/types.h | 15 | ||||
| -rw-r--r-- | slv2/util.h | 4 | ||||
| -rw-r--r-- | slv2/value.h | 20 | ||||
| -rw-r--r-- | slv2/world.h | 10 | ||||
| -rw-r--r-- | src/collections.c | 6 | ||||
| -rw-r--r-- | src/plugin.c | 33 | ||||
| -rw-r--r-- | src/pluginclass.c | 6 | ||||
| -rw-r--r-- | src/plugininstance.c | 3 | ||||
| -rw-r--r-- | src/plugins.c | 5 | ||||
| -rw-r--r-- | src/pluginui.c | 7 | ||||
| -rw-r--r-- | src/pluginuiinstance.c | 6 | ||||
| -rw-r--r-- | src/port.c | 18 | ||||
| -rw-r--r-- | src/query.c | 2 | ||||
| -rw-r--r-- | src/scalepoint.c | 4 | ||||
| -rw-r--r-- | src/util.c | 3 | ||||
| -rw-r--r-- | src/value.c | 23 | ||||
| -rw-r--r-- | src/world.c | 16 |
25 files changed, 0 insertions, 271 deletions
diff --git a/slv2/collections.h b/slv2/collections.h index 44ef6c7..0425655 100644 --- a/slv2/collections.h +++ b/slv2/collections.h @@ -34,7 +34,6 @@ extern "C" { * @{ */ - /* **** GENERIC COLLECTION FUNCTIONS **** */ #define SLV2_COLLECTION(CollType, ElemType, prefix) \ @@ -78,8 +77,6 @@ SLV2_COLLECTION(SLV2ScalePoints, SLV2ScalePoint, slv2_scale_points) SLV2_COLLECTION(SLV2Values, SLV2Value, slv2_values) SLV2_COLLECTION(SLV2UIs, SLV2UI, slv2_uis) - - /* **** PLUGINS **** */ /** Free a plugin collection. @@ -93,7 +90,6 @@ void slv2_plugins_free(SLV2World world, SLV2Plugins plugins); - /** Get the number of plugins in the collection. * Time = O(1) */ @@ -101,7 +97,6 @@ SLV2_API unsigned slv2_plugins_size(SLV2Plugins plugins); - /** Get a plugin from the collection by URI. * * Return value is shared (stored in \a plugins) and must not be freed or @@ -116,7 +111,6 @@ SLV2Plugin slv2_plugins_get_by_uri(SLV2Plugins plugins, SLV2Value uri); - /** Get a plugin from the plugins by index. * * \a index has no significance other than as an index into this plugins. @@ -133,8 +127,6 @@ SLV2Plugin slv2_plugins_get_at(SLV2Plugins plugins, unsigned index); - - /* **** PLUGIN CLASSES **** */ /** Get a plugin class from the collection by URI. @@ -151,8 +143,6 @@ SLV2PluginClass slv2_plugin_classes_get_by_uri(SLV2PluginClasses classes, SLV2Value uri); - - /* **** SCALE POINTS **** */ /** Allocate a new, empty SLV2ScalePoints @@ -161,8 +151,6 @@ SLV2_API SLV2ScalePoints slv2_scale_points_new(); - - /* **** VALUES **** */ /** Allocate a new, empty SLV2Values @@ -171,7 +159,6 @@ SLV2_API SLV2Values slv2_values_new(); - /** Return whether \a values contains \a value. * * Time = O(n) @@ -180,8 +167,6 @@ SLV2_API bool slv2_values_contains(SLV2Values values, SLV2Value value); - - /* **** PLUGIN UIS **** */ /** Get a plugin from the list by URI. @@ -198,7 +183,6 @@ SLV2UI slv2_uis_get_by_uri(SLV2UIs list, SLV2Value uri); - /** @} */ #ifdef __cplusplus diff --git a/slv2/plugin.h b/slv2/plugin.h index bd457f0..e94b4f3 100644 --- a/slv2/plugin.h +++ b/slv2/plugin.h @@ -41,7 +41,6 @@ extern "C" { * @{ */ - /** Check if this plugin is valid. * * This is used by plugin lists to avoid loading plugins that are not valid @@ -60,7 +59,6 @@ SLV2_API bool slv2_plugin_verify(SLV2Plugin plugin); - /** Get the URI of \a plugin. * * Any serialization that refers to plugins should refer to them by this. @@ -81,7 +79,6 @@ SLV2_API SLV2Value slv2_plugin_get_uri(SLV2Plugin plugin); - /** Get the (resolvable) URI of the plugins "main" bundle. * * This returns the URI of the bundle where the plugin itself was found. @@ -101,7 +98,6 @@ SLV2_API SLV2Value slv2_plugin_get_bundle_uri(SLV2Plugin plugin); - /** Get the (resolvable) URIs of the RDF data files that define a plugin. * * Typical hosts should not need to use this function. @@ -118,7 +114,6 @@ SLV2_API SLV2Values slv2_plugin_get_data_uris(SLV2Plugin plugin); - /** Get the (resolvable) URI of the shared library for \a plugin. * * Note this always returns a fully qualified URI. If you want a local @@ -132,7 +127,6 @@ SLV2_API SLV2Value slv2_plugin_get_library_uri(SLV2Plugin plugin); - /** Get the name of \a plugin. * * This returns the name (doap:name) of the plugin. The name may be @@ -146,14 +140,12 @@ SLV2_API SLV2Value slv2_plugin_get_name(SLV2Plugin plugin); - /** Get the class this plugin belongs to (ie Filters). */ SLV2_API SLV2PluginClass slv2_plugin_get_class(SLV2Plugin plugin); - /** Get a value associated with the plugin in a plugin's data files. * * Returns the ?object of all triples found of the form: @@ -175,7 +167,6 @@ SLV2Values slv2_plugin_get_value(SLV2Plugin p, SLV2Value predicate); - /** Get a value associated with the plugin in a plugin's data files. * * This function is identical to slv2_plugin_get_value, but takes a QName @@ -187,7 +178,6 @@ SLV2Values slv2_plugin_get_value_by_qname(SLV2Plugin p, const char* predicate); - /** Get a translated value associated with the plugin in a plugin's data files. * * This function is identical to slv2_plugin_get_value, but takes a QName @@ -200,7 +190,6 @@ SLV2Values slv2_plugin_get_value_by_qname_i18n(SLV2Plugin p, const char* predicate); - /** Get a value associated with some subject in a plugin's data files. * * Returns the ?object of all triples found of the form: @@ -226,7 +215,6 @@ slv2_plugin_get_value_for_subject(SLV2Plugin p, SLV2Value subject_uri, SLV2Value predicate_uri); - /** Return whether a feature is supported by a plugin. * * This will return true if the feature is an optional or required feature @@ -239,7 +227,6 @@ bool slv2_plugin_has_feature(SLV2Plugin p, SLV2Value feature_uri); - /** Get the LV2 Features supported (required or optionally) by a plugin. * * A feature is "supported" by a plugin if it is required OR optional. @@ -256,7 +243,6 @@ SLV2_API SLV2Values slv2_plugin_get_supported_features(SLV2Plugin p); - /** Get the LV2 Features required by a plugin. * * If a feature is required by a plugin, hosts MUST NOT use the plugin if they do not @@ -274,7 +260,6 @@ SLV2_API SLV2Values slv2_plugin_get_required_features(SLV2Plugin p); - /** Get the LV2 Features optionally supported by a plugin. * * Hosts MAY ignore optional plugin features for whatever reasons. Plugins @@ -289,7 +274,6 @@ SLV2_API SLV2Values slv2_plugin_get_optional_features(SLV2Plugin p); - /** Get the number of ports on this plugin. * * Time = O(1) @@ -298,7 +282,6 @@ SLV2_API uint32_t slv2_plugin_get_num_ports(SLV2Plugin p); - /** Get the port ranges (minimum, maximum and default values) for all ports. * * \a min_values, \a max_values and \a def_values must either point to an array @@ -344,7 +327,6 @@ SLV2_API bool slv2_plugin_has_latency(SLV2Plugin p); - /** Return the index of the plugin's latency port. * * It is a fatal error to call this on a plugin without checking if the port @@ -360,7 +342,6 @@ SLV2_API uint32_t slv2_plugin_get_latency_port_index(SLV2Plugin p); - /** Query a plugin for a single variable (i.e. SELECT a single ?value). * * \param plugin The plugin to query. @@ -377,7 +358,6 @@ slv2_plugin_query_variable(SLV2Plugin plugin, const char* sparql_str, unsigned variable); - /** Query a plugin and return the number of results found. * * Note that this function will work, but is mostly meaningless for queries @@ -393,7 +373,6 @@ unsigned slv2_plugin_query_count(SLV2Plugin plugin, const char* sparql_str); - /** Get a port on this plugin by \a index. * * To perform multiple calls on a port, the returned value should @@ -406,7 +385,6 @@ SLV2Port slv2_plugin_get_port_by_index(SLV2Plugin plugin, uint32_t index); - /** Get a port on this plugin by \a symbol. * * To perform multiple calls on a port, the returned value should @@ -421,7 +399,6 @@ SLV2Port slv2_plugin_get_port_by_symbol(SLV2Plugin plugin, SLV2Value symbol); - /** Get a list of all UIs available for this plugin. * * Note this returns the URI of the UI, and not the path/URI to its shared @@ -438,7 +415,6 @@ SLV2_API SLV2UIs slv2_plugin_get_uis(SLV2Plugin plugin); - /** Get the full name of the plugin's author. * * Returns NULL if author name is not present. @@ -450,7 +426,6 @@ SLV2_API SLV2Value slv2_plugin_get_author_name(SLV2Plugin plugin); - /** Get the email address of the plugin's author. * * Returns NULL if author email address is not present. @@ -462,7 +437,6 @@ SLV2_API SLV2Value slv2_plugin_get_author_email(SLV2Plugin plugin); - /** Get the email address of the plugin's author. * * Returns NULL if author homepage is not present. @@ -474,7 +448,6 @@ SLV2_API SLV2Value slv2_plugin_get_author_homepage(SLV2Plugin plugin); - /** @} */ #ifdef __cplusplus diff --git a/slv2/pluginclass.h b/slv2/pluginclass.h index 7e35d77..9adf551 100644 --- a/slv2/pluginclass.h +++ b/slv2/pluginclass.h @@ -29,7 +29,6 @@ extern "C" { * @{ */ - /** Get the URI of this class' superclass. * * Returned value is owned by \a plugin_class and must not be freed by caller. @@ -41,7 +40,6 @@ SLV2_API SLV2Value slv2_plugin_class_get_parent_uri(SLV2PluginClass plugin_class); - /** Get the URI of this plugin class. * * Returned value is owned by \a plugin_class and must not be freed by caller. @@ -52,7 +50,6 @@ SLV2_API SLV2Value slv2_plugin_class_get_uri(SLV2PluginClass plugin_class); - /** Get the label of this plugin class, ie "Oscillators". * * Returned value is owned by \a plugin_class and must not be freed by caller. @@ -62,7 +59,6 @@ slv2_plugin_class_get_uri(SLV2PluginClass plugin_class); SLV2_API SLV2Value slv2_plugin_class_get_label(SLV2PluginClass plugin_class); - /** Get the subclasses of this plugin class. * * Returned value must be freed by caller with slv2_plugin_classes_free. @@ -73,7 +69,6 @@ SLV2_API SLV2PluginClasses slv2_plugin_class_get_children(SLV2PluginClass plugin_class); - /** @} */ #ifdef __cplusplus diff --git a/slv2/plugininstance.h b/slv2/plugininstance.h index a6888a0..c860590 100644 --- a/slv2/plugininstance.h +++ b/slv2/plugininstance.h @@ -49,7 +49,6 @@ typedef struct _Instance { /** \endcond */ - /** \defgroup slv2_library Plugin library access * * An SLV2Instance is an instantiated SLV2Plugin (ie a loaded dynamic @@ -80,7 +79,6 @@ slv2_plugin_instantiate(SLV2Plugin plugin, double sample_rate, const LV2_Feature*const* features); - /** Free a plugin instance. * * \a instance is invalid after this call. @@ -101,7 +99,6 @@ slv2_instance_get_uri(SLV2Instance instance) return instance->lv2_descriptor->URI; } - /** Connect a port to a data location. * * This may be called regardless of whether the plugin is activated, @@ -116,7 +113,6 @@ slv2_instance_connect_port(SLV2Instance instance, (instance->lv2_handle, port_index, data_location); } - /** Activate a plugin instance. * * This resets all state information in the plugin, except for port data @@ -130,7 +126,6 @@ slv2_instance_activate(SLV2Instance instance) instance->lv2_descriptor->activate(instance->lv2_handle); } - /** Run \a instance for \a sample_count frames. * * If the hint lv2:hardRTCapable is set for this plugin, this function is @@ -144,7 +139,6 @@ slv2_instance_run(SLV2Instance instance, instance->lv2_descriptor->run(instance->lv2_handle, sample_count); } - /** Deactivate a plugin instance. * * Note that to run the plugin after this you must activate it, which will @@ -157,7 +151,6 @@ slv2_instance_deactivate(SLV2Instance instance) instance->lv2_descriptor->deactivate(instance->lv2_handle); } - /** Get extension data from the plugin instance. * * The type and semantics of the data returned is specific to the particular @@ -173,7 +166,6 @@ slv2_instance_get_extension_data(SLV2Instance instance, return NULL; } - /** Get the LV2_Descriptor of the plugin instance. * * Normally hosts should not need to access the LV2_Descriptor directly, @@ -187,7 +179,6 @@ slv2_instance_get_descriptor(SLV2Instance instance) return instance->lv2_descriptor; } - /** Get the LV2_Handle of the plugin instance. * * Normally hosts should not need to access the LV2_Handle directly, @@ -209,6 +200,4 @@ slv2_instance_get_handle(SLV2Instance instance) } /* extern "C" */ #endif - #endif /* __SLV2_PLUGININSTANCE_H__ */ - diff --git a/slv2/pluginui.h b/slv2/pluginui.h index e74ef6c..d13f920 100644 --- a/slv2/pluginui.h +++ b/slv2/pluginui.h @@ -27,7 +27,6 @@ extern "C" { * @{ */ - /** Get the URI of a Plugin UI. * * \param ui The Plugin UI @@ -39,7 +38,6 @@ SLV2_API SLV2Value slv2_ui_get_uri(SLV2UI ui); - /** Get the types (URIs of RDF classes) of a Plugin UI. * * \param ui The Plugin UI @@ -51,7 +49,6 @@ SLV2_API SLV2Values slv2_ui_get_classes(SLV2UI ui); - /** Check whether a plugin UI is a given type. * * \param ui The Plugin UI @@ -63,7 +60,6 @@ SLV2_API bool slv2_ui_is_a(SLV2UI ui, SLV2Value class_uri); - /** Get the URI for a Plugin UI's bundle. * * \param ui The Plugin UI @@ -75,7 +71,6 @@ SLV2_API SLV2Value slv2_ui_get_bundle_uri(SLV2UI ui); - /** Get the URI for a Plugin UI's shared library. * * \param ui The Plugin UI @@ -87,7 +82,6 @@ SLV2_API SLV2Value slv2_ui_get_binary_uri(SLV2UI ui); - /** @} */ #ifdef __cplusplus @@ -95,4 +89,3 @@ slv2_ui_get_binary_uri(SLV2UI ui); #endif #endif /* __SLV2_PLUGIN_UI_H__ */ - diff --git a/slv2/pluginuiinstance.h b/slv2/pluginuiinstance.h index 9dc494a..503ce53 100644 --- a/slv2/pluginuiinstance.h +++ b/slv2/pluginuiinstance.h @@ -38,12 +38,10 @@ typedef struct _SLV2UIInstance { SLV2UIInstanceImpl pimpl; ///< Private implementation }* SLV2UIInstance; - /** \addtogroup slv2_library * @{ */ - /** Instantiate a plugin UI. * * The returned object represents shared library objects loaded into memory, @@ -67,7 +65,6 @@ slv2_ui_instantiate(SLV2Plugin plugin, LV2UI_Controller controller, const LV2_Feature* const* features); - /** Free a plugin UI instance. * * It is the caller's responsibility to ensure all references to the UI @@ -80,14 +77,12 @@ SLV2_API void slv2_ui_instance_free(SLV2UIInstance instance); - /** Get the widget for the UI instance. */ SLV2_API LV2UI_Widget slv2_ui_instance_get_widget(SLV2UIInstance instance); - /** Get the LV2UI_Descriptor of the plugin UI instance. * * Normally hosts should not need to access the LV2UI_Descriptor directly, @@ -99,7 +94,6 @@ SLV2_API const LV2UI_Descriptor* slv2_ui_instance_get_descriptor(SLV2UIInstance instance); - /** Get the LV2UI_Handle of the plugin UI instance. * * Normally hosts should not need to access the LV2UI_Handle directly, @@ -111,13 +105,10 @@ SLV2_API LV2UI_Handle slv2_ui_instance_get_handle(SLV2UIInstance instance); - /** @} */ #ifdef __cplusplus } /* extern "C" */ #endif - #endif /* __SLV2_PLUGINUIINSTANCE_H__ */ - diff --git a/slv2/port.h b/slv2/port.h index b07c6a5..0f3f2da 100644 --- a/slv2/port.h +++ b/slv2/port.h @@ -32,7 +32,6 @@ extern "C" { * @{ */ - /** Port analog of slv2_plugin_get_value. * * Time = Query @@ -43,7 +42,6 @@ slv2_port_get_value(SLV2Plugin plugin, SLV2Port port, SLV2Value predicate); - /** Port analog of slv2_plugin_get_value_by_qname. * * Time = Query @@ -54,7 +52,6 @@ slv2_port_get_value_by_qname(SLV2Plugin plugin, SLV2Port port, const char* property_uri); - /** Port analog of slv2_plugin_get_value_by_qname_i18n. * * Time = Query @@ -65,7 +62,6 @@ slv2_port_get_value_by_qname_i18n(SLV2Plugin plugin, SLV2Port port, const char* property_uri); - /** Return the LV2 port properties of a port. * * Time = Query @@ -75,7 +71,6 @@ SLV2Values slv2_port_get_properties(SLV2Plugin plugin, SLV2Port port); - /** Return whether a port has a certain property. * * Time = Query @@ -86,7 +81,6 @@ slv2_port_has_property(SLV2Plugin p, SLV2Port port, SLV2Value property_uri); - /** Return whether a port is an event port and supports a certain event type. * * Time = Query @@ -97,7 +91,6 @@ slv2_port_supports_event(SLV2Plugin p, SLV2Port port, SLV2Value event_uri); - /** Get the symbol of a port. * * The 'symbol' is a short string, a valid C identifier. @@ -123,7 +116,6 @@ SLV2Value slv2_port_get_name(SLV2Plugin plugin, SLV2Port port); - /** Get all the classes of a port. * * This can be used to determine if a port is an input, output, audio, @@ -139,7 +131,6 @@ SLV2Values slv2_port_get_classes(SLV2Plugin plugin, SLV2Port port); - /** Determine if a port is of a given class (input, output, audio, etc). * * For convenience/performance/extensibility reasons, hosts are expected to @@ -157,7 +148,6 @@ slv2_port_is_a(SLV2Plugin plugin, SLV2Port port, SLV2Value port_class); - /** Get the default, minimum, and maximum values of a port. * * @a def, @a min, and @a max are outputs, pass pointers to uninitialized @@ -175,7 +165,6 @@ slv2_port_get_range(SLV2Plugin plugin, SLV2Value* min, SLV2Value* max); - /** Get the scale points (enumeration values) of a port. * * This returns a collection of 'interesting' named values of a port @@ -189,7 +178,6 @@ SLV2ScalePoints slv2_port_get_scale_points(SLV2Plugin plugin, SLV2Port port); - /** @} */ #ifdef __cplusplus diff --git a/slv2/scalepoint.h b/slv2/scalepoint.h index ce9cfbf..290ed14 100644 --- a/slv2/scalepoint.h +++ b/slv2/scalepoint.h @@ -29,7 +29,6 @@ extern "C" { * @{ */ - /** Get the label of this scale point (enumeration value) * * Returned value is owned by \a point and must not be freed. @@ -38,7 +37,6 @@ SLV2_API SLV2Value slv2_scale_point_get_label(SLV2ScalePoint point); - /** Get the value of this scale point (enumeration value) * * Returned value is owned by \a point and must not be freed. @@ -47,7 +45,6 @@ SLV2_API SLV2Value slv2_scale_point_get_value(SLV2ScalePoint point); - /** @} */ #ifdef __cplusplus diff --git a/slv2/types.h b/slv2/types.h index 61c0dda..faab351 100644 --- a/slv2/types.h +++ b/slv2/types.h @@ -53,62 +53,47 @@ extern "C" { #define SLV2_PORT_CLASS_EVENT "http://lv2plug.in/ns/ext/event#EventPort" #define SLV2_EVENT_CLASS_MIDI "http://lv2plug.in/ns/ext/midi#MidiEvent" - /** A port on a plugin. Opaque, but valid to compare to NULL. */ typedef struct _SLV2Port* SLV2Port; - /** A plugin. Opaque, but valid to compare to NULL. */ typedef struct _SLV2Plugin* SLV2Plugin; - /** A collection of plugins. Opaque, but valid to compare to NULL. */ typedef void* SLV2Plugins; - /** The world. Opaque, but valid to compare to NULL. */ typedef struct _SLV2World* SLV2World; - /** A plugin class. Opaque, but valid to compare to NULL. */ typedef struct _SLV2PluginClass* SLV2PluginClass; - /** A collection of plugin classes. Opaque, but valid to compare to NULL. */ typedef void* SLV2PluginClasses; - /** A typed value */ typedef struct _SLV2Value* SLV2Value; - /** A collection of typed values. */ typedef void* SLV2Values; - /** A scale point */ typedef struct _SLV2ScalePoint* SLV2ScalePoint; - /** A collection of scale points. */ typedef void* SLV2ScalePoints; - /** A plugin UI */ typedef struct _SLV2UI* SLV2UI; - /** A collection of plugin UIs. */ typedef void* SLV2UIs; - /** A set of query results (conceptually a table) */ typedef struct _SLV2Results* SLV2Results; - #ifdef __cplusplus } /* extern "C" */ #endif #endif /* __SLV2_TYPES_H__ */ - diff --git a/slv2/util.h b/slv2/util.h index 19a057b..b76a5bf 100644 --- a/slv2/util.h +++ b/slv2/util.h @@ -26,13 +26,11 @@ extern "C" { #include <stdarg.h> #include "slv2/types.h" - /** \defgroup slv2_util Utility functions * * @{ */ - /** Convert a full URI (eg file://foo/bar/baz.ttl) to a local path (e.g. /foo/bar/baz.ttl). * * Return value is shared and must not be deleted by caller. @@ -41,7 +39,6 @@ extern "C" { SLV2_API const char* slv2_uri_to_path(const char* uri); - /** @} */ #ifdef __cplusplus @@ -49,4 +46,3 @@ const char* slv2_uri_to_path(const char* uri); #endif #endif /* __SLV2_UTIL_H__ */ - diff --git a/slv2/value.h b/slv2/value.h index e9d1966..541c3de 100644 --- a/slv2/value.h +++ b/slv2/value.h @@ -30,7 +30,6 @@ extern "C" { * @{ */ - /** Create a new URI value. * * Returned value must be freed by caller with slv2_value_free. @@ -39,7 +38,6 @@ SLV2_API SLV2Value slv2_value_new_uri(SLV2World world, const char* uri); - /** Create a new string value (with no language). * * Returned value must be freed by caller with slv2_value_free. @@ -48,7 +46,6 @@ SLV2_API SLV2Value slv2_value_new_string(SLV2World world, const char* str); - /** Create a new integer value. * * Returned value must be freed by caller with slv2_value_free. @@ -57,7 +54,6 @@ SLV2_API SLV2Value slv2_value_new_int(SLV2World world, int val); - /** Create a new floating point value. * * Returned value must be freed by caller with slv2_value_free. @@ -66,28 +62,24 @@ SLV2_API SLV2Value slv2_value_new_float(SLV2World world, float val); - /** Free an SLV2Value. */ SLV2_API void slv2_value_free(SLV2Value val); - /** Duplicate an SLV2Value. */ SLV2_API SLV2Value slv2_value_duplicate(SLV2Value val); - /** Return whether two values are equivalent. */ SLV2_API bool slv2_value_equals(SLV2Value value, SLV2Value other); - /** Return this value as a Turtle/SPARQL token. * Examples: * <http://example.org/foo> @@ -102,7 +94,6 @@ SLV2_API char* slv2_value_get_turtle_token(SLV2Value value); - /** Return whether the value is a URI (resource). * * Time = O(1) @@ -111,7 +102,6 @@ SLV2_API bool slv2_value_is_uri(SLV2Value value); - /** Return this value as a URI string, e.g. "http://example.org/foo". * * Valid to call only if slv2_value_is_uri(\a value) returns true. @@ -123,7 +113,6 @@ SLV2_API const char* slv2_value_as_uri(SLV2Value value); - /** Return whether the value is a blank node (resource with no URI). * * Time = O(1) @@ -132,7 +121,6 @@ SLV2_API bool slv2_value_is_blank(SLV2Value value); - /** Return this value as a blank node identifier, e.g. "genid03". * * Valid to call only if slv2_value_is_blank(\a value) returns true. @@ -144,7 +132,6 @@ SLV2_API const char* slv2_value_as_blank(SLV2Value value); - /** Return whether this value is a literal (i.e. not a URI). * * Returns true if \a value is a string or numeric value. @@ -155,7 +142,6 @@ SLV2_API bool slv2_value_is_literal(SLV2Value value); - /** Return whether this value is a string literal. * * Returns true if \a value is a string (but not numeric) value. @@ -166,7 +152,6 @@ SLV2_API bool slv2_value_is_string(SLV2Value value); - /** Return \a value as a string. * * Time = O(1) @@ -175,7 +160,6 @@ SLV2_API const char* slv2_value_as_string(SLV2Value value); - /** Return whether this value is a decimal literal. * * Time = O(1) @@ -184,7 +168,6 @@ SLV2_API bool slv2_value_is_float(SLV2Value value); - /** Return \a value as a float. * * Valid to call only if slv2_value_is_float(\a value) or @@ -196,7 +179,6 @@ SLV2_API float slv2_value_as_float(SLV2Value value); - /** Return whether this value is an integer literal. * * Time = O(1) @@ -205,7 +187,6 @@ SLV2_API bool slv2_value_is_int(SLV2Value value); - /** Return \a value as an integer. * * Valid to call only if slv2_value_is_int(\a value) returns true. @@ -216,7 +197,6 @@ SLV2_API int slv2_value_as_int(SLV2Value value); - /** @} */ #ifdef __cplusplus diff --git a/slv2/world.h b/slv2/world.h index 04d80a9..4404c3f 100644 --- a/slv2/world.h +++ b/slv2/world.h @@ -44,7 +44,6 @@ extern "C" { * @{ */ - /** Initialize a new, empty world. * * If initialization fails, NULL is returned. @@ -53,7 +52,6 @@ SLV2_API SLV2World slv2_world_new(); - /** Destroy the world, mwahaha. * * NB: Destroying the world will leave dangling references in any plugin lists, @@ -64,7 +62,6 @@ SLV2_API void slv2_world_free(SLV2World world); - /** Load all installed LV2 bundles on the system. * * This is the recommended way for hosts to load LV2 data. It does the most @@ -82,7 +79,6 @@ SLV2_API void slv2_world_load_all(SLV2World world); - /** Load a specific bundle. * * \arg bundle_uri A fully qualified URI to the bundle directory, @@ -106,7 +102,6 @@ void slv2_world_load_bundle(SLV2World world, SLV2Value bundle_uri); - /** Get the parent of all other plugin classes, lv2:Plugin. * * Time = O(1) @@ -115,7 +110,6 @@ SLV2_API SLV2PluginClass slv2_world_get_plugin_class(SLV2World world); - /** Return a list of all found plugin classes. * * Returned list is owned by world and must not be freed by the caller. @@ -126,7 +120,6 @@ SLV2_API SLV2PluginClasses slv2_world_get_plugin_classes(SLV2World world); - /** Return a list of all found plugins. * * The returned list contains just enough references to query @@ -144,7 +137,6 @@ SLV2_API SLV2Plugins slv2_world_get_all_plugins(SLV2World world); - /** Return a list of found plugins filtered by a user-defined filter function. * * All plugins currently found in \a world that return true when passed to @@ -161,7 +153,6 @@ SLV2Plugins slv2_world_get_plugins_by_filter(SLV2World world, bool (*include)(SLV2Plugin)); - /** @} */ #ifdef __cplusplus @@ -169,4 +160,3 @@ slv2_world_get_plugins_by_filter(SLV2World world, #endif #endif /* __SLV2_WORLD_H__ */ - diff --git a/src/collections.c b/src/collections.c index 576a6c1..eaee106 100644 --- a/src/collections.c +++ b/src/collections.c @@ -67,7 +67,6 @@ SLV2_COLLECTION_IMPL(SLV2Values, SLV2Value, SLV2_COLLECTION_IMPL(SLV2UIs, SLV2UI, slv2_uis, &slv2_ui_free) - /* **** PLUGIN CLASSES **** */ SLV2PluginClass @@ -98,8 +97,6 @@ slv2_plugin_classes_get_by_uri(SLV2PluginClasses list, SLV2Value uri) return NULL; } - - /* **** VALUES **** */ bool @@ -112,7 +109,6 @@ slv2_values_contains(SLV2Values list, SLV2Value value) return false; } - void slv2_values_set_at(SLV2Values list, unsigned index, void* value) { @@ -120,8 +116,6 @@ slv2_values_set_at(SLV2Values list, unsigned index, void* value) raptor_sequence_set_at(list, index, value); } - - /* **** PLUGIN UIS **** */ SLV2UI diff --git a/src/plugin.c b/src/plugin.c index 7e38b48..3ea7b9d 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -32,7 +32,6 @@ #include "slv2/util.h" #include "slv2_internal.h" - /* private * ownership of uri is taken */ SLV2Plugin @@ -56,7 +55,6 @@ slv2_plugin_new(SLV2World world, SLV2Value uri, SLV2Value bundle_uri) return plugin; } - /* private */ void slv2_plugin_free(SLV2Plugin p) @@ -88,7 +86,6 @@ slv2_plugin_free(SLV2Plugin p) free(p); } - /* private */ void slv2_plugin_load_if_necessary(SLV2Plugin p) @@ -97,7 +94,6 @@ slv2_plugin_load_if_necessary(SLV2Plugin p) slv2_plugin_load(p); } - static SLV2Values slv2_plugin_query_node(SLV2Plugin p, SLV2Node subject, SLV2Node predicate) { @@ -123,7 +119,6 @@ slv2_plugin_query_node(SLV2Plugin p, SLV2Node subject, SLV2Node predicate) return result; } - SLV2Value slv2_plugin_get_unique(SLV2Plugin p, SLV2Node subject, SLV2Node predicate) { @@ -138,7 +133,6 @@ slv2_plugin_get_unique(SLV2Plugin p, SLV2Node subject, SLV2Node predicate) return ret; } - static SLV2Value slv2_plugin_get_one(SLV2Plugin p, SLV2Node subject, SLV2Node predicate) { @@ -239,7 +233,6 @@ slv2_plugin_load_ports_if_necessary(SLV2Plugin p) } } - void slv2_plugin_load(SLV2Plugin p) { @@ -290,7 +283,6 @@ slv2_plugin_load(SLV2Plugin p) p->loaded = true; } - SLV2Value slv2_plugin_get_uri(SLV2Plugin p) { @@ -299,7 +291,6 @@ slv2_plugin_get_uri(SLV2Plugin p) return p->plugin_uri; } - SLV2Value slv2_plugin_get_bundle_uri(SLV2Plugin p) { @@ -308,7 +299,6 @@ slv2_plugin_get_bundle_uri(SLV2Plugin p) return p->bundle_uri; } - SLV2Value slv2_plugin_get_library_uri(SLV2Plugin p) { @@ -332,14 +322,12 @@ slv2_plugin_get_library_uri(SLV2Plugin p) return p->binary_uri; } - SLV2Values slv2_plugin_get_data_uris(SLV2Plugin p) { return p->data_uris; } - SLV2PluginClass slv2_plugin_get_class(SLV2Plugin p) { @@ -382,7 +370,6 @@ slv2_plugin_get_class(SLV2Plugin p) return p->plugin_class; } - bool slv2_plugin_verify(SLV2Plugin plugin) { @@ -413,7 +400,6 @@ slv2_plugin_verify(SLV2Plugin plugin) return true; } - SLV2Value slv2_plugin_get_name(SLV2Plugin plugin) { @@ -440,7 +426,6 @@ slv2_plugin_get_name(SLV2Plugin plugin) return ret; } - SLV2Values slv2_plugin_get_value(SLV2Plugin p, SLV2Value predicate) @@ -448,7 +433,6 @@ slv2_plugin_get_value(SLV2Plugin p, return slv2_plugin_get_value_for_subject(p, p->plugin_uri, predicate); } - SLV2Values slv2_plugin_get_value_by_qname(SLV2Plugin p, const char* predicate) @@ -465,7 +449,6 @@ slv2_plugin_get_value_by_qname(SLV2Plugin p, return ret; } - SLV2Values slv2_plugin_get_value_by_qname_i18n(SLV2Plugin p, const char* predicate) @@ -489,7 +472,6 @@ slv2_plugin_get_value_by_qname_i18n(SLV2Plugin p, return slv2_values_from_stream_i18n(p, results); } - SLV2Values slv2_plugin_get_value_for_subject(SLV2Plugin p, SLV2Value subject, @@ -519,7 +501,6 @@ slv2_plugin_get_value_for_subject(SLV2Plugin p, predicate->val.uri_val); } - uint32_t slv2_plugin_get_num_ports(SLV2Plugin p) { @@ -527,7 +508,6 @@ slv2_plugin_get_num_ports(SLV2Plugin p) return p->num_ports; } - void slv2_plugin_get_port_ranges_float(SLV2Plugin p, float* min_values, @@ -555,7 +535,6 @@ slv2_plugin_get_port_ranges_float(SLV2Plugin p, } } - uint32_t slv2_plugin_get_num_ports_of_class(SLV2Plugin p, SLV2Value class_1, ...) @@ -590,7 +569,6 @@ slv2_plugin_get_num_ports_of_class(SLV2Plugin p, return ret; } - bool slv2_plugin_has_latency(SLV2Plugin p) { @@ -620,7 +598,6 @@ slv2_plugin_has_latency(SLV2Plugin p) return ret; } - uint32_t slv2_plugin_get_latency_port_index(SLV2Plugin p) { @@ -654,7 +631,6 @@ slv2_plugin_get_latency_port_index(SLV2Plugin p) return ret; // FIXME: error handling } - bool slv2_plugin_has_feature(SLV2Plugin p, SLV2Value feature) @@ -667,7 +643,6 @@ slv2_plugin_has_feature(SLV2Plugin p, return ret; } - SLV2Values slv2_plugin_get_supported_features(SLV2Plugin p) { @@ -689,21 +664,18 @@ slv2_plugin_get_supported_features(SLV2Plugin p) return result; } - SLV2Values slv2_plugin_get_optional_features(SLV2Plugin p) { return slv2_plugin_get_value_by_qname(p, "lv2:optionalFeature"); } - SLV2Values slv2_plugin_get_required_features(SLV2Plugin p) { return slv2_plugin_get_value_by_qname(p, "lv2:requiredFeature"); } - SLV2Port slv2_plugin_get_port_by_index(SLV2Plugin p, uint32_t index) @@ -715,7 +687,6 @@ slv2_plugin_get_port_by_index(SLV2Plugin p, return NULL; } - SLV2Port slv2_plugin_get_port_by_symbol(SLV2Plugin p, SLV2Value symbol) @@ -757,7 +728,6 @@ slv2_plugin_get_author(SLV2Plugin p) return author; } - SLV2Value slv2_plugin_get_author_name(SLV2Plugin plugin) { @@ -770,7 +740,6 @@ slv2_plugin_get_author_name(SLV2Plugin plugin) return NULL; } - SLV2Value slv2_plugin_get_author_email(SLV2Plugin plugin) { @@ -783,7 +752,6 @@ slv2_plugin_get_author_email(SLV2Plugin plugin) return NULL; } - SLV2Value slv2_plugin_get_author_homepage(SLV2Plugin plugin) { @@ -796,7 +764,6 @@ slv2_plugin_get_author_homepage(SLV2Plugin plugin) return NULL; } - SLV2UIs slv2_plugin_get_uis(SLV2Plugin p) { diff --git a/src/pluginclass.c b/src/pluginclass.c index 8a6da7b..7c2c032 100644 --- a/src/pluginclass.c +++ b/src/pluginclass.c @@ -26,7 +26,6 @@ #include "slv2/value.h" #include "slv2_internal.h" - /* private */ SLV2PluginClass slv2_plugin_class_new(SLV2World world, @@ -47,7 +46,6 @@ slv2_plugin_class_new(SLV2World world, return pc; } - void slv2_plugin_class_free(SLV2PluginClass plugin_class) { @@ -58,7 +56,6 @@ slv2_plugin_class_free(SLV2PluginClass plugin_class) free(plugin_class); } - SLV2Value slv2_plugin_class_get_parent_uri(SLV2PluginClass plugin_class) { @@ -68,7 +65,6 @@ slv2_plugin_class_get_parent_uri(SLV2PluginClass plugin_class) return NULL; } - SLV2Value slv2_plugin_class_get_uri(SLV2PluginClass plugin_class) { @@ -76,14 +72,12 @@ slv2_plugin_class_get_uri(SLV2PluginClass plugin_class) return plugin_class->uri; } - SLV2Value slv2_plugin_class_get_label(SLV2PluginClass plugin_class) { return plugin_class->label; } - SLV2PluginClasses slv2_plugin_class_get_children(SLV2PluginClass plugin_class) { diff --git a/src/plugininstance.c b/src/plugininstance.c index b262fbd..8287568 100644 --- a/src/plugininstance.c +++ b/src/plugininstance.c @@ -30,7 +30,6 @@ #include "slv2/value.h" #include "slv2_internal.h" - SLV2Instance slv2_plugin_instantiate(SLV2Plugin plugin, double sample_rate, @@ -146,7 +145,6 @@ slv2_plugin_instantiate(SLV2Plugin plugin, return result; } - void slv2_instance_free(SLV2Instance instance) { @@ -163,4 +161,3 @@ slv2_instance_free(SLV2Instance instance) free(i); } - diff --git a/src/plugins.c b/src/plugins.c index 0c96af0..5a91ab4 100644 --- a/src/plugins.c +++ b/src/plugins.c @@ -28,14 +28,12 @@ #include "slv2/util.h" #include "slv2_internal.h" - SLV2Plugins slv2_plugins_new() { return raptor_new_sequence(NULL, NULL); } - void slv2_plugins_free(SLV2World world, SLV2Plugins list) { @@ -43,14 +41,12 @@ slv2_plugins_free(SLV2World world, SLV2Plugins list) raptor_free_sequence(list); } - unsigned slv2_plugins_size(SLV2Plugins list) { return (list ? raptor_sequence_size(list) : 0); } - SLV2Plugin slv2_plugins_get_by_uri(SLV2Plugins list, SLV2Value uri) { @@ -79,7 +75,6 @@ slv2_plugins_get_by_uri(SLV2Plugins list, SLV2Value uri) return NULL; } - SLV2Plugin slv2_plugins_get_at(SLV2Plugins list, unsigned index) { diff --git a/src/pluginui.c b/src/pluginui.c index 9942117..3167b92 100644 --- a/src/pluginui.c +++ b/src/pluginui.c @@ -26,7 +26,6 @@ #include "slv2/pluginui.h" #include "slv2_internal.h" - /* private */ SLV2UI slv2_ui_new(SLV2World world, @@ -56,7 +55,6 @@ slv2_ui_new(SLV2World world, return ui; } - /* private */ void slv2_ui_free(SLV2UI ui) @@ -75,7 +73,6 @@ slv2_ui_free(SLV2UI ui) free(ui); } - SLV2Value slv2_ui_get_uri(SLV2UI ui) { @@ -84,21 +81,18 @@ slv2_ui_get_uri(SLV2UI ui) return ui->uri; } - SLV2Values slv2_ui_get_classes(SLV2UI ui) { return ui->classes; } - bool slv2_ui_is_a(SLV2UI ui, SLV2Value ui_class_uri) { return slv2_values_contains(ui->classes, ui_class_uri); } - SLV2Value slv2_ui_get_bundle_uri(SLV2UI ui) { @@ -107,7 +101,6 @@ slv2_ui_get_bundle_uri(SLV2UI ui) return ui->bundle_uri; } - SLV2Value slv2_ui_get_binary_uri(SLV2UI ui) { diff --git a/src/pluginuiinstance.c b/src/pluginuiinstance.c index a4020d5..4103b4e 100644 --- a/src/pluginuiinstance.c +++ b/src/pluginuiinstance.c @@ -31,7 +31,6 @@ #include "slv2/util.h" #include "slv2_internal.h" - SLV2UIInstance slv2_ui_instantiate(SLV2Plugin plugin, SLV2UI ui, @@ -102,7 +101,6 @@ slv2_ui_instantiate(SLV2Plugin plugin, } } - // Failed to instantiate if (result == NULL || result->pimpl->lv2ui_handle == NULL) { free(result); @@ -122,7 +120,6 @@ slv2_ui_instantiate(SLV2Plugin plugin, return result; } - void slv2_ui_instance_free(SLV2UIInstance instance) { @@ -139,19 +136,16 @@ slv2_ui_instance_free(SLV2UIInstance instance) free(i); } - LV2UI_Widget slv2_ui_instance_get_widget(SLV2UIInstance instance) { return instance->pimpl->widget; } - const LV2UI_Descriptor* slv2_ui_instance_get_descriptor(SLV2UIInstance instance) { return instance->pimpl->lv2ui_descriptor; } - LV2UI_Handle slv2_ui_instance_get_handle(SLV2UIInstance instance) { return instance->pimpl->lv2ui_handle; @@ -28,7 +28,6 @@ #include "slv2/util.h" #include "slv2_internal.h" - /* private */ SLV2Port slv2_port_new(SLV2World world, uint32_t index, const char* symbol) @@ -40,7 +39,6 @@ slv2_port_new(SLV2World world, uint32_t index, const char* symbol) return port; } - /* private */ void slv2_port_free(SLV2Port port) @@ -50,7 +48,6 @@ slv2_port_free(SLV2Port port) free(port); } - bool slv2_port_is_a(SLV2Plugin plugin, SLV2Port port, @@ -63,7 +60,6 @@ slv2_port_is_a(SLV2Plugin plugin, return false; } - static SLV2Node slv2_port_get_node(SLV2Plugin p, SLV2Port port) @@ -95,7 +91,6 @@ slv2_port_get_node(SLV2Plugin p, return ret; } - bool slv2_port_has_property(SLV2Plugin p, SLV2Port port, @@ -114,7 +109,6 @@ slv2_port_has_property(SLV2Plugin p, return ret; } - bool slv2_port_supports_event(SLV2Plugin p, SLV2Port port, @@ -135,7 +129,6 @@ slv2_port_supports_event(SLV2Plugin p, return ret; } - static SLV2Values slv2_values_from_stream_objects(SLV2Plugin p, SLV2Matches stream) { @@ -156,7 +149,6 @@ slv2_values_from_stream_objects(SLV2Plugin p, SLV2Matches stream) return values; } - SLV2Values slv2_port_get_value_by_qname(SLV2Plugin p, SLV2Port port, @@ -179,7 +171,6 @@ slv2_port_get_value_by_qname(SLV2Plugin p, return slv2_values_from_stream_objects(p, results); } - static SLV2Values slv2_port_get_value_by_node(SLV2Plugin p, SLV2Port port, @@ -197,7 +188,6 @@ slv2_port_get_value_by_node(SLV2Plugin p, return slv2_values_from_stream_objects(p, results); } - SLV2Values slv2_port_get_value(SLV2Plugin p, SLV2Port port, @@ -213,7 +203,6 @@ slv2_port_get_value(SLV2Plugin p, slv2_value_as_node(predicate)); } - SLV2Values slv2_port_get_value_by_qname_i18n(SLV2Plugin p, SLV2Port port, @@ -236,7 +225,6 @@ slv2_port_get_value_by_qname_i18n(SLV2Plugin p, return slv2_values_from_stream_i18n(p, results); } - SLV2Value slv2_port_get_symbol(SLV2Plugin p, SLV2Port port) @@ -244,7 +232,6 @@ slv2_port_get_symbol(SLV2Plugin p, return port->symbol; } - SLV2Value slv2_port_get_name(SLV2Plugin p, SLV2Port port) @@ -265,7 +252,6 @@ slv2_port_get_name(SLV2Plugin p, return ret; } - SLV2Values slv2_port_get_classes(SLV2Plugin p, SLV2Port port) @@ -273,7 +259,6 @@ slv2_port_get_classes(SLV2Plugin p, return port->classes; } - void slv2_port_get_range(SLV2Plugin p, SLV2Port port, @@ -307,7 +292,6 @@ slv2_port_get_range(SLV2Plugin p, } } - SLV2ScalePoints slv2_port_get_scale_points(SLV2Plugin p, SLV2Port port) @@ -346,8 +330,6 @@ slv2_port_get_scale_points(SLV2Plugin p, return ret; } - - SLV2Values slv2_port_get_properties(SLV2Plugin p, SLV2Port port) diff --git a/src/query.c b/src/query.c index 6730bd7..9f331da 100644 --- a/src/query.c +++ b/src/query.c @@ -27,7 +27,6 @@ #include "slv2/util.h" #include "slv2_internal.h" - SLV2Matches slv2_plugin_find_statements(SLV2Plugin plugin, SLV2Node subject, @@ -39,7 +38,6 @@ slv2_plugin_find_statements(SLV2Plugin plugin, return sord_find(plugin->world->model, pat); } - SLV2Values slv2_values_from_stream_i18n(SLV2Plugin p, SLV2Matches stream) diff --git a/src/scalepoint.c b/src/scalepoint.c index 06a133b..a960d36 100644 --- a/src/scalepoint.c +++ b/src/scalepoint.c @@ -27,7 +27,6 @@ #include "slv2/value.h" #include "slv2_internal.h" - /* private - ownership of value and label is taken */ SLV2ScalePoint slv2_scale_point_new(SLV2Value value, SLV2Value label) @@ -38,7 +37,6 @@ slv2_scale_point_new(SLV2Value value, SLV2Value label) return point; } - /* private */ void slv2_scale_point_free(SLV2ScalePoint point) @@ -48,14 +46,12 @@ slv2_scale_point_free(SLV2ScalePoint point) free(point); } - SLV2Value slv2_scale_point_get_value(SLV2ScalePoint p) { return p->value; } - SLV2Value slv2_scale_point_get_label(SLV2ScalePoint p) { @@ -53,7 +53,6 @@ slv2_strjoin(const char* first, ...) return result; } - const char* slv2_uri_to_path(const char* uri) { @@ -63,7 +62,6 @@ slv2_uri_to_path(const char* uri) return NULL; } - const char* slv2_get_lang() { @@ -88,7 +86,6 @@ slv2_get_lang() return lang; } - char* slv2_qname_expand(SLV2Plugin p, const char* qname) { diff --git a/src/value.c b/src/value.c index 1797e2b..07fd630 100644 --- a/src/value.c +++ b/src/value.c @@ -27,7 +27,6 @@ #include "slv2/value.h" #include "slv2_internal.h" - /* private */ static void slv2_value_set_numerics_from_string(SLV2Value val) @@ -60,7 +59,6 @@ slv2_value_set_numerics_from_string(SLV2Value val) } } - /* private * Note that if type is numeric, slv2_value_set_numerics_from_string MUST be * called or the returned value will be corrupt! It is not automatically @@ -91,7 +89,6 @@ slv2_value_new(SLV2World world, SLV2ValueType type, const char* str) return val; } - /** Create a new SLV2Value from @a node, or return NULL if impossible */ SLV2Value slv2_value_new_from_node(SLV2World world, SordNode node) @@ -138,21 +135,18 @@ slv2_value_new_from_node(SLV2World world, SordNode node) return result; } - SLV2Value slv2_value_new_uri(SLV2World world, const char* uri) { return slv2_value_new(world, SLV2_VALUE_URI, uri); } - SLV2Value slv2_value_new_string(SLV2World world, const char* str) { return slv2_value_new(world, SLV2_VALUE_STRING, str); } - SLV2Value slv2_value_new_int(SLV2World world, int val) { @@ -163,7 +157,6 @@ slv2_value_new_int(SLV2World world, int val) return ret; } - SLV2Value slv2_value_new_float(SLV2World world, float val) { @@ -174,7 +167,6 @@ slv2_value_new_float(SLV2World world, float val) return ret; } - SLV2Value slv2_value_duplicate(SLV2Value val) { @@ -195,7 +187,6 @@ slv2_value_duplicate(SLV2Value val) return result; } - void slv2_value_free(SLV2Value val) { @@ -209,7 +200,6 @@ slv2_value_free(SLV2Value val) } } - bool slv2_value_equals(SLV2Value value, SLV2Value other) { @@ -236,7 +226,6 @@ slv2_value_equals(SLV2Value value, SLV2Value other) return false; /* shouldn't get here */ } - char* slv2_value_get_turtle_token(SLV2Value value) { @@ -285,14 +274,12 @@ slv2_value_get_turtle_token(SLV2Value value) return result; } - bool slv2_value_is_uri(SLV2Value value) { return (value && value->type == SLV2_VALUE_URI); } - const char* slv2_value_as_uri(SLV2Value value) { @@ -300,7 +287,6 @@ slv2_value_as_uri(SLV2Value value) return value->str_val; } - SLV2Node slv2_value_as_node(SLV2Value value) { @@ -308,14 +294,12 @@ slv2_value_as_node(SLV2Value value) return value->val.uri_val; } - bool slv2_value_is_blank(SLV2Value value) { return (value && value->type == SLV2_VALUE_BLANK); } - const char* slv2_value_as_blank(SLV2Value value) { @@ -323,7 +307,6 @@ slv2_value_as_blank(SLV2Value value) return value->str_val; } - bool slv2_value_is_literal(SLV2Value value) { @@ -331,28 +314,24 @@ slv2_value_is_literal(SLV2Value value) return (value && value->type != SLV2_VALUE_URI); } - bool slv2_value_is_string(SLV2Value value) { return (value && value->type == SLV2_VALUE_STRING); } - const char* slv2_value_as_string(SLV2Value value) { return value->str_val; } - bool slv2_value_is_int(SLV2Value value) { return (value && value->type == SLV2_VALUE_INT); } - int slv2_value_as_int(SLV2Value value) { @@ -361,14 +340,12 @@ slv2_value_as_int(SLV2Value value) return value->val.int_val; } - bool slv2_value_is_float(SLV2Value value) { return (value && value->type == SLV2_VALUE_FLOAT); } - float slv2_value_as_float(SLV2Value value) { diff --git a/src/world.c b/src/world.c index 6c2054c..10cf279 100644 --- a/src/world.c +++ b/src/world.c @@ -106,7 +106,6 @@ fail: return NULL; } - SLV2World slv2_world_new() { @@ -114,7 +113,6 @@ slv2_world_new() return slv2_world_new_internal(world); } - void slv2_world_free(SLV2World world) { @@ -160,7 +158,6 @@ slv2_world_free(SLV2World world) free(world); } - static SLV2Matches slv2_world_find_statements(SLV2World world, Sord model, @@ -203,7 +200,6 @@ slv2_world_blank_node_prefix(SLV2World world) return (const uint8_t*)str; } - /** Comparator for sorting SLV2Plugins */ int slv2_plugin_compare_by_uri(const void* a, const void* b) @@ -215,7 +211,6 @@ slv2_plugin_compare_by_uri(const void* a, const void* b) slv2_value_as_uri(plugin_b->plugin_uri)); } - /** Comparator for sorting SLV2PluginClasses */ int slv2_plugin_class_compare_by_uri(const void* a, const void* b) @@ -227,7 +222,6 @@ slv2_plugin_class_compare_by_uri(const void* a, const void* b) slv2_value_as_uri(class_b->uri)); } - void slv2_world_load_bundle(SLV2World world, SLV2Value bundle_uri) { @@ -415,7 +409,6 @@ slv2_world_load_bundle(SLV2World world, SLV2Value bundle_uri) slv2_match_end(spec_results); } - /** Load all bundles under a directory. * Private. */ @@ -449,7 +442,6 @@ slv2_world_load_directory(SLV2World world, const char* dir) closedir(pdir); } - void slv2_world_load_path(SLV2World world, const char* lv2_path) @@ -472,7 +464,6 @@ slv2_world_load_path(SLV2World world, free(path); } - void slv2_world_load_specifications(SLV2World world) { @@ -502,7 +493,6 @@ slv2_world_load_specifications(SLV2World world) slv2_match_end(specs); } - void slv2_world_load_plugin_classes(SLV2World world) { @@ -585,7 +575,6 @@ slv2_world_load_plugin_classes(SLV2World world) slv2_match_end(classes); } - void slv2_world_load_all(SLV2World world) { @@ -630,7 +619,6 @@ slv2_world_load_all(SLV2World world) free(lv2_path); } - /* 2. Query out things to cache */ slv2_world_load_specifications(world); @@ -660,28 +648,24 @@ slv2_world_load_all(SLV2World world) */ } - SLV2PluginClass slv2_world_get_plugin_class(SLV2World world) { return world->lv2_plugin_class; } - SLV2PluginClasses slv2_world_get_plugin_classes(SLV2World world) { return world->plugin_classes; } - SLV2Plugins slv2_world_get_all_plugins(SLV2World world) { return world->plugins; } - SLV2Plugins slv2_world_get_plugins_by_filter(SLV2World world, bool (*include)(SLV2Plugin)) { |