X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fglobal_port_matrix.cc;h=f4803f156ba201fe6f9c8c19f57de8dbb2158ed9;hb=51138ef75b4c59ea5a0c35c23906a093c1e34b2c;hp=ae51e7fb68609c73e8283316434f134d1359c0ba;hpb=dc86434283718b7c4a4ed6af52a950e6cfc5e86f;p=ardour.git

diff --git a/gtk2_ardour/global_port_matrix.cc b/gtk2_ardour/global_port_matrix.cc
index ae51e7fb68..f4803f156b 100644
--- a/gtk2_ardour/global_port_matrix.cc
+++ b/gtk2_ardour/global_port_matrix.cc
@@ -30,8 +30,9 @@
 #include "i18n.h"
 
 using namespace std;
+using namespace ARDOUR;
 
-GlobalPortMatrix::GlobalPortMatrix (Gtk::Window* p, ARDOUR::Session* s, ARDOUR::DataType t)
+GlobalPortMatrix::GlobalPortMatrix (Gtk::Window* p, Session* s, DataType t)
 	: PortMatrix (p, s, t)
 {
 	setup_all_ports ();
@@ -42,21 +43,21 @@ void
 GlobalPortMatrix::setup_ports (int dim)
 {
 	_ports[dim].suspend_signals ();
-	_ports[dim].gather (_session, dim == IN, false);
+	_ports[dim].gather (_session, type(), dim == IN, false);
 	_ports[dim].resume_signals ();
 }
 
 void
-GlobalPortMatrix::set_state (ARDOUR::BundleChannel c[2], bool s)
+GlobalPortMatrix::set_state (BundleChannel c[2], bool s)
 {
-	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);
+	Bundle::PortList const & in_ports = c[IN].bundle->channel_ports (c[IN].channel);
+	Bundle::PortList const & out_ports = c[OUT].bundle->channel_ports (c[OUT].channel);
 
-	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) {
+	for (Bundle::PortList::const_iterator i = in_ports.begin(); i != in_ports.end(); ++i) {
+		for (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);
+			boost::shared_ptr<Port> p = _session->engine().get_port_by_name (*i);
+			boost::shared_ptr<Port> q = _session->engine().get_port_by_name (*j);
 
 			if (p) {
 				if (s) {
@@ -83,25 +84,29 @@ GlobalPortMatrix::set_state (ARDOUR::BundleChannel c[2], bool s)
 }
 
 PortMatrixNode::State
-GlobalPortMatrix::get_state (ARDOUR::BundleChannel c[2]) const
+GlobalPortMatrix::get_state (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 (c[0].bundle->nchannels() == ChanCount::ZERO || c[1].bundle->nchannels() == ChanCount::ZERO) {
+		return PortMatrixNode::NOT_ASSOCIATED;
+	}
+
+	Bundle::PortList const & in_ports = c[IN].bundle->channel_ports (c[IN].channel);
+	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::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) {
+	for (Bundle::PortList::const_iterator i = in_ports.begin(); i != in_ports.end(); ++i) {
+		for (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);
+			boost::shared_ptr<Port> p = _session->engine().get_port_by_name (*i);
+			boost::shared_ptr<Port> q = _session->engine().get_port_by_name (*j);
 
 			if (!p && !q) {
 				/* two non-Ardour ports; things are slightly more involved */
@@ -113,11 +118,11 @@ GlobalPortMatrix::get_state (ARDOUR::BundleChannel c[2]) const
 				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);
@@ -142,14 +147,15 @@ GlobalPortMatrix::get_state (ARDOUR::BundleChannel c[2]) const
 	return PortMatrixNode::ASSOCIATED;
 }
 
-GlobalPortMatrixWindow::GlobalPortMatrixWindow (ARDOUR::Session* s, ARDOUR::DataType t)
-	: _port_matrix (this, s, t)
+GlobalPortMatrixWindow::GlobalPortMatrixWindow (Session* s, DataType t)
+	: ArdourWindow (X_("reset me soon"))
+	, _port_matrix (this, s, t)
 {
 	switch (t) {
-	case ARDOUR::DataType::AUDIO:
+	case DataType::AUDIO:
 		set_title (_("Audio Connection Manager"));
 		break;
-	case ARDOUR::DataType::MIDI:
+	case DataType::MIDI:
 		set_title (_("MIDI Connection Manager"));
 		break;
 	}
@@ -165,3 +171,22 @@ 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);
 }
+
+void
+GlobalPortMatrixWindow::set_session (Session* s)
+{
+	_port_matrix.set_session (s);
+}
+
+string
+GlobalPortMatrix::disassociation_verb () const
+{
+	return _("Disconnect");
+}
+
+string
+GlobalPortMatrix::channel_noun () const
+{
+	return _("port");
+}
+