X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fglobal_port_matrix.cc;h=510d3b3ce3cea99897d60be3a24bebda26eb5f19;hb=b1c3a224983a6b0cc5c5bb4b042d15f1d67ae5b3;hp=b19c383565b55f13042d6b809f7b51e00911cfb1;hpb=50437bff22279473cd364d007d5e474af2a542bc;p=ardour.git

diff --git a/gtk2_ardour/global_port_matrix.cc b/gtk2_ardour/global_port_matrix.cc
index b19c383565..510d3b3ce3 100644
--- a/gtk2_ardour/global_port_matrix.cc
+++ b/gtk2_ardour/global_port_matrix.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2009 Paul Davis 
+    Copyright (C) 2009 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
 #include <gtkmm/image.h>
 #include <gtkmm/stock.h>
 #include "global_port_matrix.h"
+#include "utils.h"
 
 #include "ardour/bundle.h"
 #include "ardour/session.h"
@@ -30,17 +31,18 @@
 
 using namespace std;
 
-GlobalPortMatrix::GlobalPortMatrix (ARDOUR::Session& s, ARDOUR::DataType t)
-	: PortMatrix (s, t)
+GlobalPortMatrix::GlobalPortMatrix (Gtk::Window* p, ARDOUR::Session* s, ARDOUR::DataType t)
+	: PortMatrix (p, s, t)
 {
 	setup_all_ports ();
+	init ();
 }
 
 void
 GlobalPortMatrix::setup_ports (int dim)
 {
 	_ports[dim].suspend_signals ();
-	_ports[dim].gather (_session, dim == IN);
+	_ports[dim].gather (_session, dim == IN, false);
 	_ports[dim].resume_signals ();
 }
 
@@ -53,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) {
@@ -68,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 */
 		}
 	}
 }
@@ -78,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) {
@@ -109,37 +142,39 @@ GlobalPortMatrix::get_state (ARDOUR::BundleChannel c[2]) const
 	return PortMatrixNode::ASSOCIATED;
 }
 
-GlobalPortMatrixWindow::GlobalPortMatrixWindow (ARDOUR::Session& s, ARDOUR::DataType t)
-	: _port_matrix (s, t)
+GlobalPortMatrixWindow::GlobalPortMatrixWindow (ARDOUR::Session* s, ARDOUR::DataType t)
+	: _port_matrix (this, s, t)
 {
 	switch (t) {
 	case ARDOUR::DataType::AUDIO:
-		set_title (_("Audio Connections Manager"));
+		set_title (_("Audio Connection Manager"));
 		break;
 	case ARDOUR::DataType::MIDI:
-		set_title (_("MIDI Connections Manager"));
+		set_title (_("MIDI Connection Manager"));
 		break;
 	}
 
 	add (_port_matrix);
-	show_all ();
-
-	/* XXX: hack to make the window full-size on opening.  This may not work for
-	   people with very large monitors */
-	
-	resize (32768, 32768);
+	_port_matrix.show ();
 }
 
 void
-GlobalPortMatrixWindow::on_realize ()
+GlobalPortMatrixWindow::on_show ()
 {
-	Window::on_realize ();
+	Gtk::Window::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);
+}
 
-	pair<uint32_t, uint32_t> const m = _port_matrix.max_size ();
-	
-	GdkGeometry g;
-	g.max_width = m.first;
-	g.max_height = m.second;
+string
+GlobalPortMatrix::disassociation_verb () const
+{
+	return _("Disconnect");
+}
 
-	set_geometry_hints (*this, g, Gdk::HINT_MAX_SIZE);
+string
+GlobalPortMatrix::channel_noun () const
+{
+	return _("port");
 }
+