From 3dd4b42f3054f819c865e9415c4b86ba78d43aec Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 11 May 2012 03:56:54 +0000 Subject: "Connection" => "Edge" git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4345 a436a847-0d15-0410-975c-d299462d15a1 --- ingen/client/EdgeModel.hpp | 4 ++-- ingen/client/PatchModel.hpp | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'ingen/client') diff --git a/ingen/client/EdgeModel.hpp b/ingen/client/EdgeModel.hpp index 9b409e92..83faa25f 100644 --- a/ingen/client/EdgeModel.hpp +++ b/ingen/client/EdgeModel.hpp @@ -22,7 +22,7 @@ #include "raul/Path.hpp" #include "raul/SharedPtr.hpp" -#include "ingen/Connection.hpp" +#include "ingen/Edge.hpp" #include "ingen/client/PortModel.hpp" namespace Ingen { @@ -34,7 +34,7 @@ class ClientStore; * * \ingroup IngenClient */ -class EdgeModel : public Connection +class EdgeModel : public Edge { public: SharedPtr tail() const { return _tail; } diff --git a/ingen/client/PatchModel.hpp b/ingen/client/PatchModel.hpp index 1ea822bb..af5ecb2f 100644 --- a/ingen/client/PatchModel.hpp +++ b/ingen/client/PatchModel.hpp @@ -40,10 +40,10 @@ class PatchModel : public NodeModel, public Ingen::Patch public: /* WARNING: Copy constructor creates a shallow copy WRT connections */ - const Connections& connections() const { return *_connections.get(); } + const Edges& edges() const { return *_edges.get(); } - SharedPtr get_connection(const Ingen::Port* tail, - const Ingen::Port* head); + SharedPtr get_edge(const Ingen::Port* tail, + const Ingen::Port* head); bool enabled() const; bool polyphonic() const; @@ -52,15 +52,15 @@ public: // Signals INGEN_SIGNAL(new_node, void, SharedPtr); INGEN_SIGNAL(removed_node, void, SharedPtr); - INGEN_SIGNAL(new_connection, void, SharedPtr); - INGEN_SIGNAL(removed_connection, void, SharedPtr); + INGEN_SIGNAL(new_edge, void, SharedPtr); + INGEN_SIGNAL(removed_edge, void, SharedPtr); private: friend class ClientStore; PatchModel(Shared::URIs& uris, const Raul::Path& patch_path) : NodeModel(uris, "http://drobilla.net/ns/ingen#Patch", patch_path) - , _connections(new Connections()) + , _edges(new Edges()) { } @@ -68,11 +68,11 @@ private: void add_child(SharedPtr c); bool remove_child(SharedPtr c); - void add_connection(SharedPtr cm); - void remove_connection(const Ingen::Port* tail, + void add_edge(SharedPtr cm); + void remove_edge(const Ingen::Port* tail, const Ingen::Port* head); - SharedPtr _connections; + SharedPtr _edges; }; } // namespace Client -- cgit v1.2.1