X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fglobal_port_matrix.cc;h=510d3b3ce3cea99897d60be3a24bebda26eb5f19;hb=fcbb78b010a53686d1c350864d731a73bd204956;hp=0f107452a541554f6922b9b069df1faed7890765;hpb=53838fc350887b01c260c8af17cd45a3cab7e4fb;p=ardour.git

diff --git a/gtk2_ardour/global_port_matrix.cc b/gtk2_ardour/global_port_matrix.cc
index 0f107452a5..510d3b3ce3 100644
--- a/gtk2_ardour/global_port_matrix.cc
+++ b/gtk2_ardour/global_port_matrix.cc
@@ -31,10 +31,11 @@
 
 using namespace std;
 
-GlobalPortMatrix::GlobalPortMatrix (Gtk::Window* p, ARDOUR::Session& s, ARDOUR::DataType t)
+GlobalPortMatrix::GlobalPortMatrix (Gtk::Window* p, ARDOUR::Session* s, ARDOUR::DataType t)
 	: PortMatrix (p, s, t)
 {
 	setup_all_ports ();
+	init ();
 }
 
 void
@@ -54,8 +55,8 @@ GlobalPortMatrix::set_state (ARDOUR::BundleChannel c[2], bool s)
 	for (ARDOUR::Bundle::PortList::const_iterator i = in_ports.begin(); i != in_ports.end(); ++i) {
 		for (ARDOUR::Bundle::PortList::const_iterator j = out_ports.begin(); j != out_ports.end(); ++j) {
 
-			ARDOUR::Port* p = _session.engine().get_port_by_name (*i);
-			ARDOUR::Port* q = _session.engine().get_port_by_name (*j);
+			ARDOUR::Port* p = _session->engine().get_port_by_name (*i);
+			ARDOUR::Port* q = _session->engine().get_port_by_name (*j);
 
 			if (p) {
 				if (s) {
@@ -69,9 +70,14 @@ GlobalPortMatrix::set_state (ARDOUR::BundleChannel c[2], bool s)
 				} else {
 					q->disconnect (*i);
 				}
+			} else {
+				/* two non-Ardour ports */
+				if (s) {
+					jack_connect (_session->engine().jack (), j->c_str(), i->c_str());
+				} else {
+					jack_disconnect (_session->engine().jack (), j->c_str(), i->c_str());
+				}
 			}
-
-			/* we don't handle connections between two non-Ardour ports */
 		}
 	}
 }
@@ -79,23 +85,49 @@ GlobalPortMatrix::set_state (ARDOUR::BundleChannel c[2], bool s)
 PortMatrixNode::State
 GlobalPortMatrix::get_state (ARDOUR::BundleChannel c[2]) const
 {
+	if (_session == 0) {
+		return PortMatrixNode::NOT_ASSOCIATED;
+	}
+	
 	ARDOUR::Bundle::PortList const & in_ports = c[IN].bundle->channel_ports (c[IN].channel);
 	ARDOUR::Bundle::PortList const & out_ports = c[OUT].bundle->channel_ports (c[OUT].channel);
 	if (in_ports.empty() || out_ports.empty()) {
 		/* we're looking at a bundle with no parts associated with this channel,
 		   so nothing to connect */
-		return PortMatrixNode::UNKNOWN;
+		return PortMatrixNode::NOT_ASSOCIATED;
 	}
 
 	for (ARDOUR::Bundle::PortList::const_iterator i = in_ports.begin(); i != in_ports.end(); ++i) {
 		for (ARDOUR::Bundle::PortList::const_iterator j = out_ports.begin(); j != out_ports.end(); ++j) {
 
-			ARDOUR::Port* p = _session.engine().get_port_by_name (*i);
-			ARDOUR::Port* q = _session.engine().get_port_by_name (*j);
+			ARDOUR::Port* p = _session->engine().get_port_by_name (*i);
+			ARDOUR::Port* q = _session->engine().get_port_by_name (*j);
 
-			/* we don't know the state of connections between two non-Ardour ports */
 			if (!p && !q) {
-				return PortMatrixNode::UNKNOWN;
+				/* two non-Ardour ports; things are slightly more involved */
+				/* XXX: is this the easiest way to do this? */
+				/* XXX: isn't this very inefficient? */
+
+				jack_client_t* jack = _session->engine().jack ();
+				jack_port_t* jp = jack_port_by_name (jack, i->c_str());
+				if (jp == 0) {
+					return PortMatrixNode::NOT_ASSOCIATED;
+				}
+				
+				char const ** c = jack_port_get_all_connections (jack, jp);
+
+				char const ** p = c;
+				
+				while (p && *p != 0) {
+					if (strcmp (*p, j->c_str()) == 0) {
+						free (c);
+						return PortMatrixNode::ASSOCIATED;
+					}
+					++p;
+				}
+
+				free (c);
+				return PortMatrixNode::NOT_ASSOCIATED;
 			}
 
 			if (p && p->connected_to (*j) == false) {
@@ -110,7 +142,7 @@ GlobalPortMatrix::get_state (ARDOUR::BundleChannel c[2]) const
 	return PortMatrixNode::ASSOCIATED;
 }
 
-GlobalPortMatrixWindow::GlobalPortMatrixWindow (ARDOUR::Session& s, ARDOUR::DataType t)
+GlobalPortMatrixWindow::GlobalPortMatrixWindow (ARDOUR::Session* s, ARDOUR::DataType t)
 	: _port_matrix (this, s, t)
 {
 	switch (t) {
@@ -123,7 +155,7 @@ GlobalPortMatrixWindow::GlobalPortMatrixWindow (ARDOUR::Session& s, ARDOUR::Data
 	}
 
 	add (_port_matrix);
-	show_all ();
+	_port_matrix.show ();
 }
 
 void
@@ -133,3 +165,16 @@ GlobalPortMatrixWindow::on_show ()
 	pair<uint32_t, uint32_t> const pm_max = _port_matrix.max_size ();
 	resize_window_to_proportion_of_monitor (this, pm_max.first, pm_max.second);
 }
+
+string
+GlobalPortMatrix::disassociation_verb () const
+{
+	return _("Disconnect");
+}
+
+string
+GlobalPortMatrix::channel_noun () const
+{
+	return _("port");
+}
+