diff options
| author | David Robillard <d@drobilla.net> | 2012-05-11 03:01:26 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2012-05-11 03:01:26 +0000 |
| commit | 7be6d5d05756a7dea20c494d56f364b4dc064c88 (patch) | |
| tree | 4e1bd5d2c9a1d3b23a88b3a4960349c389d1f89a /src/serialisation | |
| parent | e77d4fcf31bfdad0b34e184e4743b4750848472c (diff) | |
| download | ingen-7be6d5d05756a7dea20c494d56f364b4dc064c88.tar.gz ingen-7be6d5d05756a7dea20c494d56f364b4dc064c88.tar.bz2 ingen-7be6d5d05756a7dea20c494d56f364b4dc064c88.zip | |
Clean up and better document World interface.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4344 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/serialisation')
| -rw-r--r-- | src/serialisation/Parser.cpp | 10 | ||||
| -rw-r--r-- | src/serialisation/Serialiser.cpp | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/serialisation/Parser.cpp b/src/serialisation/Parser.cpp index 96afc708..5f351bd3 100644 --- a/src/serialisation/Parser.cpp +++ b/src/serialisation/Parser.cpp @@ -99,8 +99,8 @@ get_properties(Ingen::Shared::World* world, const Sord::Node& subject) { SerdChunk out = { NULL, 0 }; - LV2_URID_Map* map = &world->uri_map()->urid_map_feature()->urid_map; - LV2_URID_Unmap* unmap = &world->uri_map()->urid_unmap_feature()->urid_unmap; + LV2_URID_Map* map = &world->uri_map().urid_map_feature()->urid_map; + LV2_URID_Unmap* unmap = &world->uri_map().urid_unmap_feature()->urid_unmap; Sratom* sratom = sratom_new(map); LV2_Atom_Forge forge; @@ -140,7 +140,7 @@ get_port(Ingen::Shared::World* world, const Raul::Path& parent, PortRecord& record) { - const URIs& uris = *world->uris().get(); + const URIs& uris = world->uris(); // Get all properties Resource::Properties props = get_properties(world, model, subject); @@ -222,7 +222,7 @@ parse_node(Ingen::Shared::World* world, const Raul::Path& path, boost::optional<GraphObject::Properties> data) { - const URIs& uris = *world->uris().get(); + const URIs& uris = world->uris(); Sord::URI ingen_prototype(*world->rdf_world(), NS_INGEN "prototype"); @@ -286,7 +286,7 @@ parse_patch(Ingen::Shared::World* world, const Sord::URI ingen_polyphony(*world->rdf_world(), NS_INGEN "polyphony"); const Sord::URI lv2_port(*world->rdf_world(), LV2_CORE__port); - const URIs& uris = *world->uris().get(); + const URIs& uris = world->uris(); const Sord::Node& patch = subject_node; uint32_t patch_poly = 0; diff --git a/src/serialisation/Serialiser.cpp b/src/serialisation/Serialiser.cpp index 792d7f92..2d8f9d70 100644 --- a/src/serialisation/Serialiser.cpp +++ b/src/serialisation/Serialiser.cpp @@ -350,7 +350,7 @@ Serialiser::Impl::serialise_patch(SharedPtr<const Patch> patch, Sord::URI(world, LV2_UI__ui), Sord::URI(world, "http://drobilla.net/ns/ingen#PatchUIGtk2")); - const URIs& uris = *_world.uris().get(); + const URIs& uris = _world.uris(); // Always write a symbol (required by Ingen) string symbol; @@ -544,8 +544,8 @@ Serialiser::Impl::serialise_properties(const GraphObject* o, { const GraphObject::Properties props = o->properties(context); - LV2_URID_Map* map = &_world.uri_map()->urid_map_feature()->urid_map; - LV2_URID_Unmap* unmap = &_world.uri_map()->urid_unmap_feature()->urid_unmap; + LV2_URID_Map* map = &_world.uri_map().urid_map_feature()->urid_map; + LV2_URID_Unmap* unmap = &_world.uri_map().urid_unmap_feature()->urid_unmap; Sratom* sratom = sratom_new(map); SerdNode base = serd_node_from_string(SERD_URI, (const uint8_t*)_base_uri.c_str()); |