1 files changed, 8 insertions, 243 deletions

diff --git a/gtk2_ardour/port_matrix.cc b/gtk2_ardour/port_matrix.cc
index f3bcce8105..e04dd3b252 100644
--- a/gtk2_ardour/port_matrix.cc
+++ b/gtk2_ardour/port_matrix.cc
@@ -19,96 +19,20 @@
 
 #include <gtkmm/label.h>
 #include <gtkmm/enums.h>
-#include <gtkmm/image.h>
-#include <gtkmm/stock.h>
-#include <gtkmm/messagedialog.h>
 #include <gtkmm/menu.h>
 #include <gtkmm/menu_elems.h>
 #include <gtkmm/menuitem.h>
 #include <gtkmm/menushell.h>
 #include <glibmm/objectbase.h>
 #include <gtkmm2ext/doi.h>
-#include <ardour/port_insert.h>
-#include "ardour/session.h"
-#include "ardour/io.h"
-#include "ardour/audioengine.h"
-#include "ardour/track.h"
-#include "ardour/audio_track.h"
-#include "ardour/midi_track.h"
 #include "ardour/data_type.h"
-#include "io_selector.h"
-#include "keyboard.h"
-#include "utils.h"
-#include "gui_thread.h"
 #include "i18n.h"
+#include "port_matrix.h"
 
 using namespace Gtk;
 
-/** Add a port to a group.
- *  @param p Port name, with or without prefix.
- */
-
-void
-PortGroup::add (std::string const & p)
-{
-	if (prefix.empty() == false && p.substr (0, prefix.length()) == prefix) {
-		ports.push_back (p.substr (prefix.length()));
-	} else {
-		ports.push_back (p);
-	}
-}
-
-/** PortGroupUI constructor.
- *  @param m PortMatrix to work for.
- *  @Param g PortGroup to represent.
- */
-
-PortGroupUI::PortGroupUI (PortMatrix& m, PortGroup& g)
-	: _port_matrix (m)
-	, _port_group (g)
-	, _ignore_check_button_toggle (false)
-	, _visibility_checkbutton (g.name)
-{
-	_port_group.visible = true;
- 	_ignore_check_button_toggle = false;
-	_visibility_checkbutton.signal_toggled().connect (sigc::mem_fun (*this, &PortGroupUI::visibility_checkbutton_toggled));
-}
-
-/** The visibility of a PortGroupUI has been toggled */
-void
-PortGroupUI::visibility_checkbutton_toggled ()
-{
-	_port_group.visible = _visibility_checkbutton.get_active ();
-}
-
-/** @return Checkbutton used to toggle visibility */
-Widget&
-PortGroupUI::get_visibility_checkbutton ()
-{
-	return _visibility_checkbutton;
-}
-
-
-/** Handle a toggle of a port check button */
-void
-PortGroupUI::port_checkbutton_toggled (CheckButton* b, int r, int c)
-{
- 	if (_ignore_check_button_toggle == false) {
-		// _port_matrix.hide_group (_port_group);
-	}
-}
-
-/** Set up visibility of the port group according to PortGroup::visible */
-void
-PortGroupUI::setup_visibility ()
-{
-	if (_visibility_checkbutton.get_active () != _port_group.visible) {
-		_visibility_checkbutton.set_active (_port_group.visible);
-	}
-}
-
 PortMatrix::PortMatrix (ARDOUR::Session& session, ARDOUR::DataType type, bool offer_inputs, PortGroupList::Mask mask)
-	: _offer_inputs (offer_inputs), _port_group_list (session, type, offer_inputs, mask), _type (type)
+	: _offer_inputs (offer_inputs), _port_group_list (session, type, offer_inputs, mask), _type (type), matrix (this)
 {
 	_side_vbox_pad = 0;
 
@@ -165,6 +89,9 @@ PortMatrix::clear ()
 void
 PortMatrix::setup ()
 {
+	/* sort out the ports that we'll offer to connect to */
+	_port_group_list.refresh ();
+	
 	clear ();
 
 	_side_vbox_pad = new Label (""); /* unmanaged, explicitly deleted */
@@ -174,7 +101,7 @@ PortMatrix::setup ()
 
 	matrix.clear ();
 
- 	/* Checkbutton tables and visibility checkbuttons */
+ 	/* Matrix and visibility checkbuttons */
  	for (PortGroupList::iterator i = _port_group_list.begin(); i != _port_group_list.end(); ++i) {
 
 		PortGroupUI* t = new PortGroupUI (*this, **i);
@@ -212,13 +139,6 @@ PortMatrix::reset_visibility ()
 	}
 }
 
-void
-PortMatrix::redisplay ()
-{
-	_port_group_list.refresh ();
-	setup ();
-}
-
 
 /** Handle a button press on a row label */
 bool
@@ -258,7 +178,7 @@ PortMatrix::set_type (ARDOUR::DataType t)
 {
 	_type = t;
 	_port_group_list.set_type (t);
-	redisplay ();
+	setup ();
 }
 
 void
@@ -266,161 +186,6 @@ PortMatrix::set_offer_inputs (bool i)
 {
 	_offer_inputs = i;
 	_port_group_list.set_offer_inputs (i);
-	redisplay ();
-}
-
-/** PortGroupList constructor.
- *  @param session Session to get ports from.
- *  @param type Type of ports to offer (audio or MIDI)
- *  @param offer_inputs true to offer output ports, otherwise false.
- *  @param mask Mask of groups to make visible by default.
- */
-
-PortGroupList::PortGroupList (ARDOUR::Session & session, ARDOUR::DataType type, bool offer_inputs, Mask mask)
-	: _session (session), _type (type), _offer_inputs (offer_inputs),
-	  buss (_("Bus"), "ardour:", mask & BUSS),
-	  track (_("Track"), "ardour:", mask & TRACK),
-	  system (_("System"), "system:", mask & SYSTEM),
-	  other (_("Other"), "", mask & OTHER)
-{
-	refresh ();
-}
-
-void
-PortGroupList::refresh ()
-{
-	clear ();
-	
-	buss.ports.clear ();
-	track.ports.clear ();
-	system.ports.clear ();
-	other.ports.clear ();
-
-	/* Find the ports provided by ardour; we can't derive their type just from their
-	   names, so we'll have to be more devious. 
-	*/
-
-	boost::shared_ptr<ARDOUR::Session::RouteList> routes = _session.get_routes ();
-
-	cerr << "Looking for arour routes\n";
-
-	for (ARDOUR::Session::RouteList::const_iterator i = routes->begin(); i != routes->end(); ++i) {
-
-		PortGroup* g = 0;
-
-		if (_type == ARDOUR::DataType::AUDIO) {
-
-			if (boost::dynamic_pointer_cast<ARDOUR::AudioTrack> (*i)) {
-				g = &track;
-			} else if (!boost::dynamic_pointer_cast<ARDOUR::MidiTrack>(*i)) {
-				g = &buss;
-			} 
-
-
-		} else if (_type == ARDOUR::DataType::MIDI) {
-
-			if (boost::dynamic_pointer_cast<ARDOUR::MidiTrack> (*i)) {
-				g = &track;
-			}
-
-			/* No MIDI busses yet */
-		} 
-			
-		if (g) {
-			ARDOUR::PortSet const & p = _offer_inputs ? ((*i)->inputs()) : ((*i)->outputs());
-			for (uint32_t j = 0; j < p.num_ports(); ++j) {
-				g->add (p.port(j)->name ());
-			}
-
-			std::sort (g->ports.begin(), g->ports.end());
-		}
-	}
-	
-	/* XXX: inserts, sends, plugin inserts? */
-	
-	/* Now we need to find the non-ardour ports; we do this by first
-	   finding all the ports that we can connect to. 
-	*/
-
-	const char **ports = _session.engine().get_ports ("", _type.to_jack_type(), _offer_inputs ? 
-							  JackPortIsInput : JackPortIsOutput);
-	if (ports) {
-
-		int n = 0;
-		string client_matching_string;
-
-		client_matching_string = _session.engine().client_name();
-		client_matching_string += ':';
-
-		while (ports[n]) {
-			std::string const p = ports[n];
-
-			if (p.substr(0, strlen ("system:")) == "system:") {
-				/* system: prefix */
-				system.add (p);
-			} else {
-				if (p.substr(0, client_matching_string.length()) != client_matching_string) {
-					/* other (non-ardour) prefix */
-					other.add (p);
-				}
-			}
-
-			++n;
-		}
-
-		free (ports);
-	}
-
-	push_back (&system);
-	push_back (&buss);
-	push_back (&track);
-	push_back (&other);
-}
-
-int
-PortGroupList::n_visible_ports () const
-{
-	int n = 0;
-	
-	for (const_iterator i = begin(); i != end(); ++i) {
-		if ((*i)->visible) {
-			n += (*i)->ports.size();
-		}
-	}
-
-	return n;
-}
-
-std::string
-PortGroupList::get_port_by_index (int n, bool with_prefix) const
-{
-	/* XXX: slightly inefficient algorithm */
-
-	for (const_iterator i = begin(); i != end(); ++i) {
-		for (std::vector<std::string>::const_iterator j = (*i)->ports.begin(); j != (*i)->ports.end(); ++j) {
-			if (n == 0) {
-				if (with_prefix) {
-					return (*i)->prefix + *j;
-				} else {
-					return *j;
-				}
-			}
-			--n;
-		}
-	}
-
-	return "";
-}
-
-void
-PortGroupList::set_type (ARDOUR::DataType t)
-{
-	_type = t;
-}
-
-void
-PortGroupList::set_offer_inputs (bool i)
-{
-	_offer_inputs = i;
+	setup ();
 }