X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fglobal_port_matrix.cc;h=ae51e7fb68609c73e8283316434f134d1359c0ba;hb=9243298a7c0436cbdd216e3c5d4f3b90fe74cdf9;hp=bc63237244c2c7a4c6f99ee2a22aa11120226058;hpb=b0091c899bfc868de6a19af2f0cc74abca7fe173;p=ardour.git

diff --git a/gtk2_ardour/global_port_matrix.cc b/gtk2_ardour/global_port_matrix.cc
index bc63237244..ae51e7fb68 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,23 +20,29 @@
 #include <gtkmm/image.h>
 #include <gtkmm/stock.h>
 #include "global_port_matrix.h"
-#include "i18n.h"
+#include "utils.h"
+
 #include "ardour/bundle.h"
 #include "ardour/session.h"
 #include "ardour/audioengine.h"
 #include "ardour/port.h"
 
-GlobalPortMatrix::GlobalPortMatrix (ARDOUR::Session& s, ARDOUR::DataType t)
-	: PortMatrix (s, t)
+#include "i18n.h"
+
+using namespace std;
+
+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 ();
 }
 
@@ -49,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) {
@@ -64,70 +70,98 @@ 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 */
 		}
 	}
 }
 
-PortMatrix::State
+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 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 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) {
-				return NOT_ASSOCIATED;
+				return PortMatrixNode::NOT_ASSOCIATED;
 			} else if (q && q->connected_to (*i) == false) {
-				return NOT_ASSOCIATED;
+				return PortMatrixNode::NOT_ASSOCIATED;
 			}
 
 		}
 	}
 
-	return ASSOCIATED;
+	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;
 	}
 
-	Gtk::HBox* buttons_hbox = Gtk::manage (new Gtk::HBox);
+	add (_port_matrix);
+	_port_matrix.show ();
+}
 
-	_rescan_button.set_label (_("Rescan"));
-	_rescan_button.set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::REFRESH, Gtk::ICON_SIZE_BUTTON)));
-	_rescan_button.signal_clicked().connect (sigc::mem_fun (_port_matrix, &GlobalPortMatrix::setup_all_ports));
-	buttons_hbox->pack_start (_rescan_button, Gtk::PACK_SHRINK);
-	
-	Gtk::VBox* vbox = Gtk::manage (new Gtk::VBox);
-	vbox->pack_start (_port_matrix);
-	vbox->pack_start (*buttons_hbox, Gtk::PACK_SHRINK);
-	add (*vbox);
-	show_all ();
+void
+GlobalPortMatrixWindow::on_show ()
+{
+	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);
 }