summaryrefslogtreecommitdiffstats
path: root/ingen
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-05-11 03:56:54 +0000
committerDavid Robillard <d@drobilla.net>2012-05-11 03:56:54 +0000
commit3dd4b42f3054f819c865e9415c4b86ba78d43aec (patch)
tree656d152cdffdd9196013fe9f35d46f4cf73c6927 /ingen
parent7be6d5d05756a7dea20c494d56f364b4dc064c88 (diff)
downloadingen-3dd4b42f3054f819c865e9415c4b86ba78d43aec.tar.gz
ingen-3dd4b42f3054f819c865e9415c4b86ba78d43aec.tar.bz2
ingen-3dd4b42f3054f819c865e9415c4b86ba78d43aec.zip
"Connection" => "Edge"
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4345 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'ingen')
-rw-r--r--ingen/Edge.hpp (renamed from ingen/Connection.hpp)10
-rw-r--r--ingen/Patch.hpp10
-rw-r--r--ingen/client/EdgeModel.hpp4
-rw-r--r--ingen/client/PatchModel.hpp18
-rw-r--r--ingen/serialisation/Serialiser.hpp6
5 files changed, 24 insertions, 24 deletions
diff --git a/ingen/Connection.hpp b/ingen/Edge.hpp
index 7ff34847..66e9c21b 100644
--- a/ingen/Connection.hpp
+++ b/ingen/Edge.hpp
@@ -14,8 +14,8 @@
along with Ingen. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef INGEN_INTERFACE_CONNECTION_HPP
-#define INGEN_INTERFACE_CONNECTION_HPP
+#ifndef INGEN_INTERFACE_EDGE_HPP
+#define INGEN_INTERFACE_EDGE_HPP
namespace Raul { class Path; }
@@ -25,10 +25,10 @@ namespace Ingen {
*
* \ingroup interface
*/
-class Connection
+class Edge
{
public:
- virtual ~Connection() {}
+ virtual ~Edge() {}
virtual const Raul::Path& tail_path() const = 0;
virtual const Raul::Path& head_path() const = 0;
@@ -36,4 +36,4 @@ public:
} // namespace Ingen
-#endif // INGEN_INTERFACE_CONNECTION_HPP
+#endif // INGEN_INTERFACE_EDGE_HPP
diff --git a/ingen/Patch.hpp b/ingen/Patch.hpp
index 807b843a..c0056f44 100644
--- a/ingen/Patch.hpp
+++ b/ingen/Patch.hpp
@@ -26,19 +26,19 @@
namespace Ingen {
-class Connection;
+class Edge;
-/** A Path (graph of Nodes/Connections)
+/** A Path (graph of Nodes/Edges)
*
* \ingroup interface
*/
class Patch : virtual public Node
{
public:
- typedef std::pair<const Port*, const Port*> ConnectionsKey;
- typedef std::map< ConnectionsKey, SharedPtr<Connection> > Connections;
+ typedef std::pair<const Port*, const Port*> EdgesKey;
+ typedef std::map< EdgesKey, SharedPtr<Edge> > Edges;
- virtual const Connections& connections() const = 0;
+ virtual const Edges& edges() const = 0;
virtual bool enabled() const = 0;
virtual uint32_t internal_poly() const = 0;
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<PortModel> 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<EdgeModel> get_connection(const Ingen::Port* tail,
- const Ingen::Port* head);
+ SharedPtr<EdgeModel> 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<NodeModel>);
INGEN_SIGNAL(removed_node, void, SharedPtr<NodeModel>);
- INGEN_SIGNAL(new_connection, void, SharedPtr<EdgeModel>);
- INGEN_SIGNAL(removed_connection, void, SharedPtr<EdgeModel>);
+ INGEN_SIGNAL(new_edge, void, SharedPtr<EdgeModel>);
+ INGEN_SIGNAL(removed_edge, void, SharedPtr<EdgeModel>);
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<ObjectModel> c);
bool remove_child(SharedPtr<ObjectModel> c);
- void add_connection(SharedPtr<EdgeModel> cm);
- void remove_connection(const Ingen::Port* tail,
+ void add_edge(SharedPtr<EdgeModel> cm);
+ void remove_edge(const Ingen::Port* tail,
const Ingen::Port* head);
- SharedPtr<Connections> _connections;
+ SharedPtr<Edges> _edges;
};
} // namespace Client
diff --git a/ingen/serialisation/Serialiser.hpp b/ingen/serialisation/Serialiser.hpp
index cfc11c02..b09c194a 100644
--- a/ingen/serialisation/Serialiser.hpp
+++ b/ingen/serialisation/Serialiser.hpp
@@ -34,7 +34,7 @@ class GraphObject;
class Patch;
class Node;
class Port;
-class Connection;
+class Edge;
namespace Shared {
class World;
@@ -69,8 +69,8 @@ public:
virtual void serialise(SharedPtr<const GraphObject> object) throw (std::logic_error);
- virtual void serialise_connection(const Sord::Node& parent,
- SharedPtr<const Connection> c) throw (std::logic_error);
+ virtual void serialise_edge(const Sord::Node& parent,
+ SharedPtr<const Edge> c) throw (std::logic_error);
virtual std::string finish();