From 927b169eb1787bc40ede591c7c7893a39b488d95 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 28 Apr 2012 02:25:35 +0000 Subject: Use "tail" and "head" terminology instead of "src_port" and "dst_port". Use the same types for connect() and disconnect() parameters. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4292 a436a847-0d15-0410-975c-d299462d15a1 --- src/shared/AtomWriter.cpp | 14 +++++++------- src/shared/Builder.cpp | 2 +- src/shared/ClashAvoider.cpp | 16 ++++++++-------- 3 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src/shared') diff --git a/src/shared/AtomWriter.cpp b/src/shared/AtomWriter.cpp index d77364a5..c9af3002 100644 --- a/src/shared/AtomWriter.cpp +++ b/src/shared/AtomWriter.cpp @@ -184,27 +184,27 @@ AtomWriter::del(const Raul::URI& uri) } void -AtomWriter::connect(const Raul::Path& src, - const Raul::Path& dst) +AtomWriter::connect(const Raul::Path& tail, + const Raul::Path& head) { 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(src, dst)); + forge_uri(Raul::Path::lca(tail, head)); lv2_atom_forge_property_head(&_forge, _uris.patch_body, 0); - forge_edge(src, dst); + forge_edge(tail, head); lv2_atom_forge_pop(&_forge, &msg); finish_msg(); } void -AtomWriter::disconnect(const Raul::URI& src, - const Raul::URI& dst) +AtomWriter::disconnect(const Raul::Path& tail, + const Raul::Path& head) { LV2_Atom_Forge_Frame msg; lv2_atom_forge_blank(&_forge, &msg, next_id(), _uris.patch_Delete); lv2_atom_forge_property_head(&_forge, _uris.patch_body, 0); - forge_edge(src, dst); + forge_edge(tail, head); lv2_atom_forge_pop(&_forge, &msg); finish_msg(); } diff --git a/src/shared/Builder.cpp b/src/shared/Builder.cpp index 34013a29..e726d647 100644 --- a/src/shared/Builder.cpp +++ b/src/shared/Builder.cpp @@ -88,7 +88,7 @@ Builder::connect(SharedPtr object) if (patch) { for (Patch::Connections::const_iterator i = patch->connections().begin(); i != patch->connections().end(); ++i) { - _interface.connect(i->second->src_port_path(), i->second->dst_port_path()); + _interface.connect(i->second->tail_path(), i->second->head_path()); } return; } diff --git a/src/shared/ClashAvoider.cpp b/src/shared/ClashAvoider.cpp index 7f0bceae..3859ef76 100644 --- a/src/shared/ClashAvoider.cpp +++ b/src/shared/ClashAvoider.cpp @@ -166,24 +166,24 @@ ClashAvoider::move(const Raul::Path& old_path, } void -ClashAvoider::connect(const Raul::Path& src_port_path, - const Raul::Path& dst_port_path) +ClashAvoider::connect(const Raul::Path& tail, + const Raul::Path& head) { - _target.connect(map_path(src_port_path), map_path(dst_port_path)); + _target.connect(map_path(tail), map_path(head)); } void -ClashAvoider::disconnect(const Raul::URI& src, - const Raul::URI& dst) +ClashAvoider::disconnect(const Raul::Path& tail, + const Raul::Path& head) { - _target.disconnect(map_uri(src), map_uri(dst)); + _target.disconnect(map_path(tail), map_path(head)); } void -ClashAvoider::disconnect_all(const Raul::Path& parent_patch_path, +ClashAvoider::disconnect_all(const Raul::Path& parent_patch, const Raul::Path& path) { - _target.disconnect_all(map_path(parent_patch_path), map_path(path)); + _target.disconnect_all(map_path(parent_patch), map_path(path)); } void -- cgit v1.2.1