From bcbd762544c0a67d3c3dab1dd0afd438bdf58fba Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sun, 27 Nov 2011 00:48:46 +0000
Subject: Document public API. Remove weird canvas parent event handler stuff.
 Normalize selection rectangle and simplify "within" methods accordingly. Move
 Port::disconnect_all() to Connectable::disconnect_all().

git-svn-id: http://svn.drobilla.net/lad/trunk/patchage@3649 a436a847-0d15-0410-975c-d299462d15a1
---
 src/AlsaDriver.cpp     | 6 +++---
 src/JackDbusDriver.cpp | 2 +-
 src/JackDriver.cpp     | 2 +-
 src/PatchageCanvas.cpp | 6 +++---
 src/PatchageCanvas.hpp | 6 +++---
 src/PatchageEvent.cpp  | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/AlsaDriver.cpp b/src/AlsaDriver.cpp
index 9aeb040..6374f0f 100644
--- a/src/AlsaDriver.cpp
+++ b/src/AlsaDriver.cpp
@@ -163,9 +163,9 @@ AlsaDriver::refresh()
 
 				PatchagePort* port2 = _app->canvas()->find_port(PortID(*addr2, true));
 				if (port2 && !port->is_connected_to(port2)) {
-					_app->canvas()->add_connection(port,
-					                               port2,
-					                               port->color() + 0x22222200);
+					_app->canvas()->make_connection(port,
+					                                port2,
+					                                port->color() + 0x22222200);
 
 					snd_seq_query_subscribe_set_index(
 						subsinfo, snd_seq_query_subscribe_get_index(subsinfo) + 1);
diff --git a/src/JackDbusDriver.cpp b/src/JackDbusDriver.cpp
index 6121934..67c22ff 100644
--- a/src/JackDbusDriver.cpp
+++ b/src/JackDbusDriver.cpp
@@ -620,7 +620,7 @@ JackDriver::connect_ports(
 		return;
 	}
 
-	_app->canvas()->add_connection(port1, port2, port1->color() + 0x22222200);
+	_app->canvas()->make_connection(port1, port2, port1->color() + 0x22222200);
 }
 
 void
diff --git a/src/JackDriver.cpp b/src/JackDriver.cpp
index 2a81b51..7d1394d 100644
--- a/src/JackDriver.cpp
+++ b/src/JackDriver.cpp
@@ -313,7 +313,7 @@ JackDriver::refresh()
 				}
 
 				if (src && dst && !src->is_connected_to(dst))
-					_app->canvas()->add_connection(src, dst, port1->color() + 0x22222200);
+					_app->canvas()->make_connection(src, dst, port1->color() + 0x22222200);
 			}
 
 			jack_free(connected_ports);
diff --git a/src/PatchageCanvas.cpp b/src/PatchageCanvas.cpp
index c4983f6..ea2318b 100644
--- a/src/PatchageCanvas.cpp
+++ b/src/PatchageCanvas.cpp
@@ -290,9 +290,9 @@ PatchageCanvas::on_event(GdkEvent* ev)
 }
 
 bool
-PatchageCanvas::add_connection(FlowCanvas::Connectable* tail,
-                               FlowCanvas::Connectable* head,
-                               uint32_t                 color)
+PatchageCanvas::make_connection(FlowCanvas::Connectable* tail,
+                                FlowCanvas::Connectable* head,
+                                uint32_t                 color)
 {
 	FlowCanvas::Connection* c = new FlowCanvas::Connection(
 		*this, tail, head, color);
diff --git a/src/PatchageCanvas.hpp b/src/PatchageCanvas.hpp
index 4889e9c..ae1af8d 100644
--- a/src/PatchageCanvas.hpp
+++ b/src/PatchageCanvas.hpp
@@ -63,9 +63,9 @@ public:
 
 	void add_module(const std::string& name, PatchageModule* module);
 
-	bool add_connection(FlowCanvas::Connectable* tail,
-	                    FlowCanvas::Connectable* head,
-	                    uint32_t color);
+	bool make_connection(FlowCanvas::Connectable* tail,
+	                     FlowCanvas::Connectable* head,
+	                     uint32_t color);
 
 	void remove_port(const PortID& id);
 
diff --git a/src/PatchageEvent.cpp b/src/PatchageEvent.cpp
index 7da0cbb..4f3c8d5 100644
--- a/src/PatchageEvent.cpp
+++ b/src/PatchageEvent.cpp
@@ -91,7 +91,7 @@ PatchageEvent::execute(Patchage* patchage)
 			patchage->error_msg((format("Unable to find port `%1' to connect")
 			                     % _port_2).str());
 		else
-			patchage->canvas()->add_connection(
+			patchage->canvas()->make_connection(
 				port_1, port_2, port_1->color() + 0x22222200);
 
 	} else if (_type == DISCONNECTION) {
-- 
cgit v1.2.1