summaryrefslogtreecommitdiffstats
path: root/slv2
diff options
context:
space:
mode:
Diffstat (limited to 'slv2')
-rw-r--r--slv2/plugin.h3
-rw-r--r--slv2/pluginlist.h12
-rw-r--r--slv2/private_types.h6
-rw-r--r--slv2/stringlist.h16
-rw-r--r--slv2/types.h2
5 files changed, 24 insertions, 15 deletions
diff --git a/slv2/plugin.h b/slv2/plugin.h
index 05bba75..27fa982 100644
--- a/slv2/plugin.h
+++ b/slv2/plugin.h
@@ -26,7 +26,8 @@ extern "C" {
#include <stdint.h>
#include <stddef.h>
#include <stdbool.h>
-#include "types.h"
+#include <slv2/types.h>
+#include <slv2/stringlist.h>
typedef const struct _Plugin SLV2Plugin;
diff --git a/slv2/pluginlist.h b/slv2/pluginlist.h
index 5410bc3..1032a84 100644
--- a/slv2/pluginlist.h
+++ b/slv2/pluginlist.h
@@ -91,7 +91,7 @@ slv2_plugins_load_all(SLV2Plugins list);
* Use of this function is \b not recommended. Use \ref slv2_plugins_load_all.
*/
void
-slv2_plugins_load_path(SLV2Plugins list,
+slv2_plugins_load_path(SLV2Plugins list,
const char* search_path);
@@ -108,13 +108,13 @@ slv2_plugins_load_path(SLV2Plugins list,
* installed plugins. Use \ref slv2_plugins_load_all for that.
*/
void
-slv2_plugins_load_bundle(SLV2Plugins list,
- const char* bundle_base_url);
+slv2_plugins_load_bundle(SLV2Plugins list,
+ const char* bundle_base_uri);
/** Get the number of plugins in the list.
*/
-size_t
+unsigned
slv2_plugins_size(const SLV2Plugins list);
@@ -129,7 +129,7 @@ slv2_plugins_size(const SLV2Plugins list);
*/
const SLV2Plugin*
slv2_plugins_get_by_uri(const SLV2Plugins list,
- const char* uri);
+ const char* uri);
/** Get a plugin from the list by index.
@@ -146,7 +146,7 @@ slv2_plugins_get_by_uri(const SLV2Plugins list,
*/
const SLV2Plugin*
slv2_plugins_get_at(const SLV2Plugins list,
- size_t index);
+ unsigned index);
/** @} */
diff --git a/slv2/private_types.h b/slv2/private_types.h
index abda0a1..906d89c 100644
--- a/slv2/private_types.h
+++ b/slv2/private_types.h
@@ -47,7 +47,7 @@ extern "C" {
struct _Plugin {
char* plugin_uri;
char* bundle_url; // Bundle directory plugin was loaded from
- raptor_sequence* data_uris; // rdfs::seeAlso
+ raptor_sequence* data_uris; // rdfs::seeAlso
char* lib_uri; // lv2:binary
};
@@ -70,9 +70,7 @@ struct _PluginList {
/** An ordered, indexable collection of strings. */
-typedef raptor_sequence* SLV2Strings;
-
-SLV2Strings slv2_strings_new();
+//typedef raptor_sequence* SLV2Strings;
#ifdef __cplusplus
diff --git a/slv2/stringlist.h b/slv2/stringlist.h
index 5ed711b..4abb383 100644
--- a/slv2/stringlist.h
+++ b/slv2/stringlist.h
@@ -19,7 +19,10 @@
#ifndef __SLV2_STRINGLIST_H__
#define __SLV2_STRINGLIST_H__
-#include <slv2/private_types.h>
+#include <stdbool.h>
+
+typedef void* SLV2Strings;
+
#ifdef __cplusplus
extern "C" {
@@ -34,9 +37,16 @@ extern "C" {
* @{
*/
+
+/** Allocate a new, empty SLV2Strings
+ */
+SLV2Strings
+slv2_strings_new();
+
+
/** Get the number of elements in a string list.
*/
-int
+unsigned
slv2_strings_size(const SLV2Strings list);
@@ -45,7 +55,7 @@ slv2_strings_size(const SLV2Strings list);
* @return the element at @a index, or NULL if index is out of range.
*/
char*
-slv2_strings_get_at(const SLV2Strings list, int index);
+slv2_strings_get_at(const SLV2Strings list, unsigned index);
/** Return whether @a list contains @a uri.
diff --git a/slv2/types.h b/slv2/types.h
index 018c8e2..b1b115c 100644
--- a/slv2/types.h
+++ b/slv2/types.h
@@ -22,7 +22,7 @@
#include <stddef.h>
#include <stdbool.h>
#include <stdint.h>
-#include <slv2/private_types.h>
+//#include <slv2/private_types.h>
#ifdef __cplusplus
extern "C" {