From 8b8e3a45a6aa40fbb391c6af13a4d7a7baf0a97e Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Wed, 7 Feb 2007 05:31:08 +0000
Subject: Abstracted out "Connectable" concept in FlowCanvas (towards
 connecting things other than ports). Fixes for SLV2 API changes.

git-svn-id: http://svn.drobilla.net/lad/patchage@287 a436a847-0d15-0410-975c-d299462d15a1
---
 src/PatchageFlowCanvas.cpp | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'src/PatchageFlowCanvas.cpp')

diff --git a/src/PatchageFlowCanvas.cpp b/src/PatchageFlowCanvas.cpp
index 881caf8..c979d48 100644
--- a/src/PatchageFlowCanvas.cpp
+++ b/src/PatchageFlowCanvas.cpp
@@ -65,7 +65,7 @@ PatchageFlowCanvas::find_port(const snd_seq_addr_t* alsa_addr)
 #endif
 
 void
-PatchageFlowCanvas::connect(boost::shared_ptr<Port> port1, boost::shared_ptr<Port> port2)
+PatchageFlowCanvas::connect(boost::shared_ptr<Connectable> port1, boost::shared_ptr<Connectable> port2)
 {
 	boost::shared_ptr<PatchagePort> p1 = boost::dynamic_pointer_cast<PatchagePort>(port1);
 	boost::shared_ptr<PatchagePort> p2 = boost::dynamic_pointer_cast<PatchagePort>(port2);
@@ -85,20 +85,24 @@ PatchageFlowCanvas::connect(boost::shared_ptr<Port> port1, boost::shared_ptr<Por
 
 
 void
-PatchageFlowCanvas::disconnect(boost::shared_ptr<Port> port1, boost::shared_ptr<Port> port2)
+PatchageFlowCanvas::disconnect(boost::shared_ptr<Connectable> port1, boost::shared_ptr<Connectable> port2)
 {
-	boost::shared_ptr<PatchagePort> input;
-	boost::shared_ptr<PatchagePort> output;
-	
-	if (port1->is_input() && !port2->is_input()) {
-		input = boost::dynamic_pointer_cast<PatchagePort>(port1);
-		output = boost::dynamic_pointer_cast<PatchagePort>(port2);
-	} else if (port2->is_input() && !port1->is_input()) {
-		input = boost::dynamic_pointer_cast<PatchagePort>(port2);
-		output = boost::dynamic_pointer_cast<PatchagePort>(port1);
+	boost::shared_ptr<PatchagePort> input
+		= boost::dynamic_pointer_cast<PatchagePort>(port1);
+	boost::shared_ptr<PatchagePort> output
+		= boost::dynamic_pointer_cast<PatchagePort>(port2);
+
+	if (!input || !output)
+		return;
+
+	if (input->is_output() && output->is_input()) {
+		// Damn, guessed wrong
+		boost::shared_ptr<PatchagePort> swap = input;
+		input = output;
+		output = swap;
 	}
 
-	if (!input || !output) {
+	if (!input || !output || input->is_output() || output->is_input()) {
 		status_message("ERROR: Attempt to disconnect mismatched/unknown ports");
 		return;
 	}
-- 
cgit v1.2.1