diff options
author | David Robillard <d@drobilla.net> | 2012-12-29 20:34:32 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2012-12-29 20:34:32 +0000 |
commit | 79275fc579c0dbe1ce4ca109edb95f2c1e0802a5 (patch) | |
tree | 72bb18ea61f485c47514a511dd3067c57aa2fb4b /src/serialisation/Serialiser.cpp | |
parent | 9bdf223f830d3b430563e96d93efc073b1882e96 (diff) | |
download | ingen-79275fc579c0dbe1ce4ca109edb95f2c1e0802a5.tar.gz ingen-79275fc579c0dbe1ce4ca109edb95f2c1e0802a5.tar.bz2 ingen-79275fc579c0dbe1ce4ca109edb95f2c1e0802a5.zip |
"edge" => "arc".
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4897 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/serialisation/Serialiser.cpp')
-rw-r--r-- | src/serialisation/Serialiser.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/serialisation/Serialiser.cpp b/src/serialisation/Serialiser.cpp index e3781a01..85ecbfb4 100644 --- a/src/serialisation/Serialiser.cpp +++ b/src/serialisation/Serialiser.cpp @@ -26,7 +26,7 @@ #include <glibmm/miscutils.h> #include <glibmm/module.h> -#include "ingen/Edge.hpp" +#include "ingen/Arc.hpp" #include "ingen/Interface.hpp" #include "ingen/Log.hpp" #include "ingen/Node.hpp" @@ -89,8 +89,8 @@ struct Serialiser::Impl { SharedPtr<const Node> graph, const std::string& graph_symbol); - void serialise_edge(const Sord::Node& parent, - SharedPtr<const Edge> c) + void serialise_arc(const Sord::Node& parent, + SharedPtr<const Arc> a) throw (std::logic_error); std::string finish(); @@ -413,9 +413,9 @@ Serialiser::Impl::serialise_graph(SharedPtr<const Node> graph, serialise_port(p, Resource::INTERNAL, port_id); } - for (Node::Edges::const_iterator c = graph->edges().begin(); - c != graph->edges().end(); ++c) { - serialise_edge(graph_id, c->second); + for (Node::Arcs::const_iterator a = graph->arcs().begin(); + a != graph->arcs().end(); ++a) { + serialise_arc(graph_id, a->second); } } @@ -481,43 +481,43 @@ Serialiser::Impl::serialise_port(const Node* port, } void -Serialiser::serialise_edge(const Sord::Node& parent, - SharedPtr<const Edge> edge) +Serialiser::serialise_arc(const Sord::Node& parent, + SharedPtr<const Arc> arc) throw (std::logic_error) { - return me->serialise_edge(parent, edge); + return me->serialise_arc(parent, arc); } void -Serialiser::Impl::serialise_edge(const Sord::Node& parent, - SharedPtr<const Edge> edge) +Serialiser::Impl::serialise_arc(const Sord::Node& parent, + SharedPtr<const Arc> arc) throw (std::logic_error) { if (!_model) throw std::logic_error( - "serialise_edge called without serialisation in progress"); + "serialise_arc called without serialisation in progress"); Sord::World& world = _model->world(); const URIs& uris = _world.uris(); - const Sord::Node src = path_rdf_node(edge->tail_path()); - const Sord::Node dst = path_rdf_node(edge->head_path()); - const Sord::Node edge_id = Sord::Node::blank_id(*_world.rdf_world()); - _model->add_statement(edge_id, + const Sord::Node src = path_rdf_node(arc->tail_path()); + const Sord::Node dst = path_rdf_node(arc->head_path()); + const Sord::Node arc_id = Sord::Node::blank_id(*_world.rdf_world()); + _model->add_statement(arc_id, Sord::URI(world, uris.ingen_tail), src); - _model->add_statement(edge_id, + _model->add_statement(arc_id, Sord::URI(world, uris.ingen_head), dst); if (parent.is_valid()) { _model->add_statement(parent, - Sord::URI(world, uris.ingen_edge), - edge_id); + Sord::URI(world, uris.ingen_arc), + arc_id); } else { - _model->add_statement(edge_id, + _model->add_statement(arc_id, Sord::URI(world, uris.rdf_type), - Sord::URI(world, uris.ingen_Edge)); + Sord::URI(world, uris.ingen_Arc)); } } |