X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fglobal_port_matrix.cc;h=318263a9cde4ce5e37407d171ad047f77799f9b0;hb=79c918fd6aace3f5d94fe61973819574489ca755;hp=49e26732639a286c12b53aeb9abcafa0d97bd7b2;hpb=5f67a72c341a96872d9cd3d1de357662295d14b0;p=ardour.git

diff --git a/gtk2_ardour/global_port_matrix.cc b/gtk2_ardour/global_port_matrix.cc
index 49e2673263..318263a9cd 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 ();
@@ -47,16 +48,16 @@ GlobalPortMatrix::setup_ports (int dim)
 }
 
 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);
+			Port* p = _session->engine().get_port_by_name (*i);
+			Port* q = _session->engine().get_port_by_name (*j);
 
 			if (p) {
 				if (s) {
@@ -83,25 +84,25 @@ 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);
+	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);
+			Port* p = _session->engine().get_port_by_name (*i);
+			Port* q = _session->engine().get_port_by_name (*j);
 
 			if (!p && !q) {
 				/* two non-Ardour ports; things are slightly more involved */
@@ -142,19 +143,20 @@ 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)
+	: ArdourDialog (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;
 	}
 
-	add (_port_matrix);
+	get_vbox()->pack_start (_port_matrix, true, true);
 	_port_matrix.show ();
 }
 
@@ -166,6 +168,12 @@ GlobalPortMatrixWindow::on_show ()
 	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
 {