diff options
author | David Robillard <d@drobilla.net> | 2012-08-12 23:42:17 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2012-08-12 23:42:17 +0000 |
commit | efe8e2311ee2fed881f95cc1e72825906d21c7c1 (patch) | |
tree | 371c03610f691f0b97137b9e5b2f756b21fc5583 /src/AtomWriter.cpp | |
parent | e63caf72f320ab683de6378ff6f2944890054cbf (diff) | |
download | ingen-efe8e2311ee2fed881f95cc1e72825906d21c7c1.tar.gz ingen-efe8e2311ee2fed881f95cc1e72825906d21c7c1.tar.bz2 ingen-efe8e2311ee2fed881f95cc1e72825906d21c7c1.zip |
Use ingen:root as the path for the root patch, opening up path space for engine/driver/etc.
Strict conversion between Path and URI (Path no longer is-a URI).
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4672 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/AtomWriter.cpp')
-rw-r--r-- | src/AtomWriter.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/AtomWriter.cpp b/src/AtomWriter.cpp index e310b572..58b10a5b 100644 --- a/src/AtomWriter.cpp +++ b/src/AtomWriter.cpp @@ -18,6 +18,7 @@ #include "ingen/AtomSink.hpp" #include "ingen/AtomWriter.hpp" +#include "ingen/GraphObject.hpp" #include "ingen/URIMap.hpp" #include "raul/Path.hpp" #include "serd/serd.h" @@ -107,14 +108,14 @@ AtomWriter::forge_properties(const Resource::Properties& properties) } void -AtomWriter::forge_edge(const Raul::URI& tail, const Raul::URI& head) +AtomWriter::forge_edge(const Raul::Path& tail, const Raul::Path& head) { LV2_Atom_Forge_Frame edge; lv2_atom_forge_blank(&_forge, &edge, 0, _uris.ingen_Edge); lv2_atom_forge_property_head(&_forge, _uris.ingen_tail, 0); - forge_uri(tail); + forge_uri(GraphObject::path_to_uri(tail)); lv2_atom_forge_property_head(&_forge, _uris.ingen_head, 0); - forge_uri(head); + forge_uri(GraphObject::path_to_uri(head)); lv2_atom_forge_pop(&_forge, &edge); } @@ -171,9 +172,9 @@ AtomWriter::move(const Raul::Path& old_path, LV2_Atom_Forge_Frame msg; lv2_atom_forge_blank(&_forge, &msg, next_id(), _uris.patch_Move); lv2_atom_forge_property_head(&_forge, _uris.patch_subject, 0); - forge_uri(old_path); + forge_uri(GraphObject::path_to_uri(old_path)); lv2_atom_forge_property_head(&_forge, _uris.patch_destination, 0); - forge_uri(new_path); + forge_uri(GraphObject::path_to_uri(new_path)); } void @@ -192,7 +193,7 @@ AtomWriter::connect(const Raul::Path& tail, LV2_Atom_Forge_Frame msg; lv2_atom_forge_blank(&_forge, &msg, next_id(), _uris.patch_Put); lv2_atom_forge_property_head(&_forge, _uris.patch_subject, 0); - forge_uri(Raul::Path::lca(tail, head)); + forge_uri(GraphObject::path_to_uri(Raul::Path::lca(tail, head))); lv2_atom_forge_property_head(&_forge, _uris.patch_body, 0); forge_edge(tail, head); lv2_atom_forge_pop(&_forge, &msg); @@ -219,13 +220,13 @@ AtomWriter::disconnect_all(const Raul::Path& parent_patch_path, lv2_atom_forge_blank(&_forge, &msg, next_id(), _uris.patch_Delete); lv2_atom_forge_property_head(&_forge, _uris.patch_subject, 0); - forge_uri(parent_patch_path); + forge_uri(GraphObject::path_to_uri(parent_patch_path)); lv2_atom_forge_property_head(&_forge, _uris.patch_body, 0); LV2_Atom_Forge_Frame edge; lv2_atom_forge_blank(&_forge, &edge, 0, _uris.ingen_Edge); lv2_atom_forge_property_head(&_forge, _uris.ingen_incidentTo, 0); - forge_uri(path); + forge_uri(GraphObject::path_to_uri(path)); lv2_atom_forge_pop(&_forge, &edge); lv2_atom_forge_pop(&_forge, &msg); |