diff options
| -rw-r--r-- | slv2/plugin.h | 14 | ||||
| -rw-r--r-- | slv2/pluginclass.h | 14 | ||||
| -rw-r--r-- | slv2/pluginclasses.h | 2 | ||||
| -rw-r--r-- | slv2/plugininstance.h | 13 | ||||
| -rw-r--r-- | slv2/plugins.h | 7 | ||||
| -rw-r--r-- | slv2/slv2.h | 7 | ||||
| -rw-r--r-- | slv2/strings.h | 1 | ||||
| -rw-r--r-- | slv2/util.h | 1 | ||||
| -rw-r--r-- | slv2/world.h | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/plugin.c | 2 | ||||
| -rw-r--r-- | src/pluginclass.c | 2 | ||||
| -rw-r--r-- | src/pluginclasses.c | 2 | ||||
| -rw-r--r-- | src/plugininstance.c | 2 | ||||
| -rw-r--r-- | src/plugins.c | 2 | ||||
| -rw-r--r-- | src/port.c | 2 | ||||
| -rw-r--r-- | src/query.c | 2 | ||||
| -rw-r--r-- | src/slv2_internal.h (renamed from src/private_types.h) | 0 | ||||
| -rw-r--r-- | src/world.c | 2 |
19 files changed, 22 insertions, 56 deletions
diff --git a/slv2/plugin.h b/slv2/plugin.h index c8f4be0..7ec073b 100644 --- a/slv2/plugin.h +++ b/slv2/plugin.h @@ -60,20 +60,6 @@ bool slv2_plugin_verify(SLV2Plugin plugin); -#if 0 -/** Duplicate a plugin. - * - * Use this if you want to keep an SLV2Plugin around but free the list it came - * from. Freeing the returned plugin with slv2_plugin_free is the caller's - * responsibility. - * - * \return a newly allocated deep copy of \a plugin. - */ -SLV2Plugin -slv2_plugin_duplicate(SLV2Plugin plugin); -#endif - - /** Get the URI of \a plugin. * * Any serialization that refers to plugins should refer to them by this. diff --git a/slv2/pluginclass.h b/slv2/pluginclass.h index 7260d7d..74c594e 100644 --- a/slv2/pluginclass.h +++ b/slv2/pluginclass.h @@ -67,20 +67,6 @@ SLV2PluginClasses slv2_plugin_class_get_children(SLV2PluginClass plugin_class); -#if 0 -/** Get the path of this plugin_class, ie "Plugins/Generators/Oscillators". - * - * SLV2 automatically generates an ideal plugin_class heirarchy given the plugins - * present. The last fragment of the path is the plugin_class's label, - * as returned by slv2_plugin_class_get_label. - * - * Returned value is owned by \a plugin_class and must not be freed by caller. - * - * Time = O(1) - */ -const char* slv2_plugin_class_get_path(SLV2PluginClass plugin_class); -#endif - /** @} */ #ifdef __cplusplus diff --git a/slv2/pluginclasses.h b/slv2/pluginclasses.h index a9dbdc5..0c2ba1b 100644 --- a/slv2/pluginclasses.h +++ b/slv2/pluginclasses.h @@ -25,12 +25,12 @@ extern "C" { #endif - /** \defgroup plugin_classes Plugin classes (categories) * * @{ */ + /** Get the number of plugins in the list. */ unsigned diff --git a/slv2/plugininstance.h b/slv2/plugininstance.h index 3def071..0132dfe 100644 --- a/slv2/plugininstance.h +++ b/slv2/plugininstance.h @@ -28,8 +28,6 @@ extern "C" { #include <slv2/plugin.h> #include <slv2/port.h> -typedef struct _InstanceImpl* SLV2InstanceImpl; - /** \defgroup lib Shared library access * * An SLV2Instance is an instantiated SLV2Plugin (eg a loaded dynamic @@ -40,17 +38,20 @@ typedef struct _InstanceImpl* SLV2InstanceImpl; */ +typedef struct _InstanceImpl* SLV2InstanceImpl; + + /** Instance of a plugin. * * The LV2 descriptor and handle of this are exposed to allow inlining of - * performance critical functions like slv2_instance_run (hiding things in - * lv2.h is pointless anyway). The remaining implementation details are + * performance critical functions like slv2_instance_run (which are exposed + * in lv2.h anyway). The remaining implementation details are * in the opaque pimpl member. */ typedef struct _Instance { const LV2_Descriptor* lv2_descriptor; LV2_Handle lv2_handle; - SLV2InstanceImpl pimpl; ///< Move along now, nothing to see here + SLV2InstanceImpl pimpl; ///< Private implementation }* SLV2Instance; @@ -83,10 +84,8 @@ slv2_plugin_instantiate(SLV2Plugin plugin, void slv2_instance_free(SLV2Instance instance); - #ifndef LIBSLV2_SOURCE - /** Get the URI of the plugin which \a instance is an instance of. * * Returned string is shared and must not be modified or deleted. diff --git a/slv2/plugins.h b/slv2/plugins.h index 7b9a5a3..c544ba1 100644 --- a/slv2/plugins.h +++ b/slv2/plugins.h @@ -25,10 +25,6 @@ extern "C" { #endif - -typedef void* SLV2Plugins; - - /** \defgroup plugins Plugin lists * * These functions work with lists of plugins which come from an @@ -39,6 +35,9 @@ typedef void* SLV2Plugins; */ +typedef void* SLV2Plugins; + + /** Free a plugin list. * * Freeing a plugin list does not destroy the plugins it contains (plugins diff --git a/slv2/slv2.h b/slv2/slv2.h index 2d89e4e..ee0bcfa 100644 --- a/slv2/slv2.h +++ b/slv2/slv2.h @@ -16,8 +16,8 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __SLV2_H -#define __SLV2_H +#ifndef __SLV2_H__ +#define __SLV2_H__ #ifdef __cplusplus extern "C" { @@ -32,9 +32,8 @@ extern "C" { #include <slv2/plugininstance.h> #include <slv2/strings.h> - #ifdef __cplusplus } #endif -#endif /* __SLV2_H */ +#endif /* __SLV2_H__ */ diff --git a/slv2/strings.h b/slv2/strings.h index 5a16025..20667ef 100644 --- a/slv2/strings.h +++ b/slv2/strings.h @@ -25,7 +25,6 @@ extern "C" { #endif - /** \defgroup strings Collections of strings * * SLV2Strings is an ordered collection of strings which is fast for random diff --git a/slv2/util.h b/slv2/util.h index a81f855..1bd2847 100644 --- a/slv2/util.h +++ b/slv2/util.h @@ -25,7 +25,6 @@ extern "C" { #endif - /** \defgroup util Utility functions * * @{ diff --git a/slv2/world.h b/slv2/world.h index 08acd2b..0bef69e 100644 --- a/slv2/world.h +++ b/slv2/world.h @@ -26,7 +26,6 @@ extern "C" { #endif - /** \defgroup world Library context, data loading, etc. * * The "world" represents all library state, and the data found in bundles' diff --git a/src/Makefile.am b/src/Makefile.am index 11f7aa8..cdc8793 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,7 +5,7 @@ lib_LTLIBRARIES = libslv2.la libslv2_la_LIBADD = @REDLAND_LIBS@ libslv2_la_SOURCES = \ - private_types.h \ + slv2_internal.h \ world.c \ pluginclass.c \ pluginclasses.c \ diff --git a/src/plugin.c b/src/plugin.c index 6d8dc87..a3f9177 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -26,7 +26,7 @@ #include <slv2/types.h> #include <slv2/util.h> #include <slv2/strings.h> -#include "private_types.h" +#include "slv2_internal.h" /* private */ diff --git a/src/pluginclass.c b/src/pluginclass.c index 80e96c4..8ffd66b 100644 --- a/src/pluginclass.c +++ b/src/pluginclass.c @@ -21,7 +21,7 @@ #include <stdlib.h> #include <string.h> #include <slv2/pluginclass.h> -#include "private_types.h" +#include "slv2_internal.h" SLV2PluginClass diff --git a/src/pluginclasses.c b/src/pluginclasses.c index 919201e..c7873fe 100644 --- a/src/pluginclasses.c +++ b/src/pluginclasses.c @@ -23,7 +23,7 @@ #include <librdf.h> #include <slv2/pluginclass.h> #include <slv2/pluginclasses.h> -#include "private_types.h" +#include "slv2_internal.h" SLV2PluginClasses diff --git a/src/plugininstance.c b/src/plugininstance.c index 013e33c..d989ef6 100644 --- a/src/plugininstance.c +++ b/src/plugininstance.c @@ -27,7 +27,7 @@ #include <slv2/plugin.h> #include <slv2/plugininstance.h> #include <slv2/util.h> -#include "private_types.h" +#include "slv2_internal.h" SLV2Instance diff --git a/src/plugins.c b/src/plugins.c index 9d62398..57620e7 100644 --- a/src/plugins.c +++ b/src/plugins.c @@ -28,7 +28,7 @@ #include <slv2/pluginlist.h> #include <slv2/strings.h> #include <slv2/util.h> -#include "private_types.h" +#include "slv2_internal.h" SLV2Plugins @@ -25,7 +25,7 @@ #include <slv2/port.h> #include <slv2/types.h> #include <slv2/util.h> -#include "private_types.h" +#include "slv2_internal.h" /* private */ diff --git a/src/query.c b/src/query.c index a4d8e16..19eba56 100644 --- a/src/query.c +++ b/src/query.c @@ -24,7 +24,7 @@ #include <slv2/plugin.h> #include <slv2/util.h> #include <slv2/strings.h> -#include "private_types.h" +#include "slv2_internal.h" static const char* slv2_query_prefixes = diff --git a/src/private_types.h b/src/slv2_internal.h index baf5100..baf5100 100644 --- a/src/private_types.h +++ b/src/slv2_internal.h diff --git a/src/world.c b/src/world.c index 90a604f..8178403 100644 --- a/src/world.c +++ b/src/world.c @@ -26,7 +26,7 @@ #include <slv2/slv2.h> #include <slv2/util.h> #include "config.h" -#include "private_types.h" +#include "slv2_internal.h" SLV2World |