Connection => Edge.

git-svn-id: http://svn.drobilla.net/lad/trunk/patchage@3745 a436a847-0d15-0410-975c-d299462d15a1

6 files changed, 11 insertions, 11 deletions

diff --git a/src/AlsaDriver.cpp b/src/AlsaDriver.cpp
index 87c149e..af35a46 100644
--- a/src/AlsaDriver.cpp
+++ b/src/AlsaDriver.cpp
@@ -162,7 +162,7 @@ AlsaDriver::refresh()
 					continue;
 
 				PatchagePort* port2 = _app->canvas()->find_port(PortID(*addr2, true));
-				if (port2 && !_app->canvas()->get_connection(port, port2)) {
+				if (port2 && !_app->canvas()->get_edge(port, port2)) {
 					_app->canvas()->make_connection(
 						port, port2, port->get_fill_color() + 0x22222200);
 
diff --git a/src/JackDriver.cpp b/src/JackDriver.cpp
index 94cc575..61d57d4 100644
--- a/src/JackDriver.cpp
+++ b/src/JackDriver.cpp
@@ -312,7 +312,7 @@ JackDriver::refresh()
 					dst = port1;
 				}
 
-				if (src && dst && !_app->canvas()->get_connection(src, dst))
+				if (src && dst && !_app->canvas()->get_edge(src, dst))
 					_app->canvas()->make_connection(
 						src, dst, port1->get_fill_color() + 0x22222200);
 			}
diff --git a/src/Patchage.cpp b/src/Patchage.cpp
index 12f4344..c06809e 100644
--- a/src/Patchage.cpp
+++ b/src/Patchage.cpp
@@ -531,8 +531,8 @@ Patchage::save_session(bool close)
 	script << "sleep 3" << endl;
 	script << endl;
 
-	for (FlowCanvas::Canvas::Connections::const_iterator c = _canvas->connections().begin();
-	     c != _canvas->connections().end(); ++c) {
+	for (FlowCanvas::Canvas::Edges::const_iterator c = _canvas->edges().begin();
+	     c != _canvas->edges().end(); ++c) {
 		PatchagePort* src = dynamic_cast<PatchagePort*>((*c)->get_tail());
 		PatchagePort* dst = dynamic_cast<PatchagePort*>((*c)->get_head());
 
diff --git a/src/PatchageCanvas.cpp b/src/PatchageCanvas.cpp
index 44e844f..720a73e 100644
--- a/src/PatchageCanvas.cpp
+++ b/src/PatchageCanvas.cpp
@@ -255,7 +255,7 @@ PatchageCanvas::add_module(const std::string& name, PatchageModule* module)
 }
 
 bool
-PatchageCanvas::on_connection_event(FlowCanvas::Connection* c, GdkEvent* ev)
+PatchageCanvas::on_connection_event(FlowCanvas::Edge* c, GdkEvent* ev)
 {
 	if (ev->type == GDK_BUTTON_PRESS) {
 		switch (ev->button.button) {
@@ -264,7 +264,7 @@ PatchageCanvas::on_connection_event(FlowCanvas::Connection* c, GdkEvent* ev)
 			    && !(ev->button.state & GDK_SHIFT_MASK)) {
 				clear_selection();
 			}
-			select_connection(c);
+			select_edge(c);
 			return true;
 		case 2:
 			disconnect(c->get_tail(), c->get_head());
@@ -278,10 +278,10 @@ bool
 PatchageCanvas::on_event(GdkEvent* ev)
 {
 	if (ev->type == GDK_KEY_PRESS && ev->key.keyval == GDK_Delete) {
-		SelectedConnections cs = selected_connections();
+		SelectedEdges cs = selected_edges();
 		clear_selection();
 
-		for (Connections::const_iterator i = cs.begin(); i != cs.end(); ++i) {
+		for (Edges::const_iterator i = cs.begin(); i != cs.end(); ++i) {
 			disconnect((*i)->get_tail(), (*i)->get_head());
 		}
 	}
@@ -294,7 +294,7 @@ PatchageCanvas::make_connection(FlowCanvas::Joinable* tail,
                                 FlowCanvas::Joinable* head,
                                 uint32_t              color)
 {
-	FlowCanvas::Connection* c = new FlowCanvas::Connection(
+	FlowCanvas::Edge* c = new FlowCanvas::Edge(
 		*this, tail, head, color);
 	c->signal_event().connect(
 		sigc::bind<0>(sigc::mem_fun(*this, &PatchageCanvas::on_connection_event),
diff --git a/src/PatchageCanvas.hpp b/src/PatchageCanvas.hpp
index efd403e..745d589 100644
--- a/src/PatchageCanvas.hpp
+++ b/src/PatchageCanvas.hpp
@@ -77,7 +77,7 @@ private:
 	bool remove_item(FlowCanvas::Shape* i);
 
 	bool on_event(GdkEvent* ev);
-	bool on_connection_event(FlowCanvas::Connection* c, GdkEvent* ev);
+	bool on_connection_event(FlowCanvas::Edge* c, GdkEvent* ev);
 
 	typedef std::map<const PortID, PatchagePort*> PortIndex;
 	PortIndex _port_index;
diff --git a/src/PatchageEvent.cpp b/src/PatchageEvent.cpp
index b6cd6e1..bbe85e7 100644
--- a/src/PatchageEvent.cpp
+++ b/src/PatchageEvent.cpp
@@ -106,7 +106,7 @@ PatchageEvent::execute(Patchage* patchage)
 			patchage->error_msg((format("Unable to find port `%1' to disconnect")
 			                     % _port_2).str());
 		else
-			patchage->canvas()->remove_connection(port_1, port_2);
+			patchage->canvas()->remove_edge(port_1, port_2);
 	}
 }