diff options
| author | David Robillard <d@drobilla.net> | 2011-04-28 06:02:12 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-04-28 06:02:12 +0000 |
| commit | 2a16021425dab995e902d133b060ebcf6c59a00c (patch) | |
| tree | 042783cc69184323d799da5db497461d108f6a89 /src/world.c | |
| parent | 00ceff504269034db8e1bfb54a97b5732c2dadce (diff) | |
| download | lilv-2a16021425dab995e902d133b060ebcf6c59a00c.tar.gz lilv-2a16021425dab995e902d133b060ebcf6c59a00c.tar.bz2 lilv-2a16021425dab995e902d133b060ebcf6c59a00c.zip | |
More future-proof collection APIs.
Make all iterator actions occur through a collection specific function.
Verbose, and a low of API, but allows for the possibility of different
collection implementation types (given a choice between verbosity and no type
safety, I'll take verbosity).
git-svn-id: http://svn.drobilla.net/lad/trunk/slv2@3211 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/world.c')
| -rw-r--r-- | src/world.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/world.c b/src/world.c index e722024..6970598 100644 --- a/src/world.c +++ b/src/world.c @@ -157,7 +157,7 @@ slv2_world_free(SLV2World world) g_slist_free(world->specs); world->specs = NULL; - SLV2_FOREACH(i, world->plugins) { + SLV2_FOREACH(plugins, i, world->plugins) { SLV2Plugin p = slv2_plugins_get(world->plugins, i); slv2_plugin_free(p); } @@ -630,7 +630,7 @@ slv2_world_load_specifications(SLV2World world) { for (GSList* l = world->specs; l; l = l->next) { SLV2Spec spec = (SLV2Spec)l->data; - SLV2_FOREACH(f, spec->data_uris) { + SLV2_FOREACH(values, f, spec->data_uris) { SLV2Value file = slv2_collection_get(spec->data_uris, f); sord_read_file(world->model, (const uint8_t*)slv2_value_as_uri(file), @@ -718,7 +718,7 @@ slv2_world_load_all(SLV2World world) // Discover bundles and read all manifest files into model slv2_world_load_path(world, lv2_path); - SLV2_FOREACH(p, world->plugins) { + SLV2_FOREACH(plugins, p, world->plugins) { SLV2Plugin plugin = slv2_collection_get(world->plugins, p); SLV2Value plugin_uri = slv2_plugin_get_uri(plugin); |