markers are not allowed to have empty names, especially since it causes a crash in...
[ardour.git] / gtk2_ardour / port_matrix.cc
index 4607b840c1a73dc63c4886826674e7bf7bec9a4e..1e0db19cf6b016fcfd65647944c664226086d56a 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2002-2009 Paul Davis 
+    Copyright (C) 2002-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
 #include <gtkmm/menu.h>
 #include <gtkmm/menushell.h>
 #include <gtkmm/menu_elems.h>
+#include <gtkmm/window.h>
 #include "ardour/bundle.h"
 #include "ardour/types.h"
 #include "ardour/session.h"
 #include "ardour/route.h"
+#include "ardour/audioengine.h"
 #include "port_matrix.h"
+#include "port_matrix_body.h"
+#include "port_matrix_component.h"
 #include "i18n.h"
+#include "gui_thread.h"
+
+using namespace std;
+using namespace sigc;
+using namespace Gtk;
+using namespace ARDOUR;
 
 /** PortMatrix constructor.
  *  @param session Our session.
  *  @param type Port type that we are handling.
  */
-PortMatrix::PortMatrix (ARDOUR::Session& session, ARDOUR::DataType type)
-       : _session (session),
+PortMatrix::PortMatrix (Window* parent, Session& session, DataType type)
+       : Table (2, 2),
+         _session (session),
+         _parent (parent),
          _type (type),
-         _body (this),
          _menu (0),
-         _setup_once (false),
          _arrangement (TOP_TO_RIGHT),
          _row_index (0),
-         _column_index (1)
+         _column_index (1),
+         _min_height_divisor (1),
+         _show_only_bundles (false),
+         _inhibit_toggle_show_only_bundles (false)
 {
-       _ports[0].set_type (type);
-       _ports[1].set_type (type);
+       _body = new PortMatrixBody (this);
+
+       for (int i = 0; i < 2; ++i) {
+               _ports[i].set_type (type);
 
-       _row_visibility_box.pack_start (_row_visibility_label, Gtk::PACK_SHRINK);
-       _column_visibility_box.pack_start (_column_visibility_label, Gtk::PACK_SHRINK);
+               /* watch for the content of _ports[] changing */
+               _ports[i].Changed.connect (mem_fun (*this, &PortMatrix::setup));
+
+               /* and for bundles in _ports[] changing */
+               _ports[i].BundleChanged.connect (mem_fun (*this, &PortMatrix::bundle_changed));
+       }
 
-       _hscroll.signal_value_changed().connect (sigc::mem_fun (*this, &PortMatrix::hscroll_changed));
-       _vscroll.signal_value_changed().connect (sigc::mem_fun (*this, &PortMatrix::vscroll_changed));
+       _hscroll.signal_value_changed().connect (mem_fun (*this, &PortMatrix::hscroll_changed));
+       _vscroll.signal_value_changed().connect (mem_fun (*this, &PortMatrix::vscroll_changed));
 
        /* watch for routes being added or removed */
-       _session.RouteAdded.connect (sigc::hide (sigc::mem_fun (*this, &PortMatrix::routes_changed)));
-       
+       _session.RouteAdded.connect (sigc::hide (mem_fun (*this, &PortMatrix::routes_changed)));
+
+       /* and also bundles */
+       _session.BundleAdded.connect (sigc::hide (mem_fun (*this, &PortMatrix::setup_global_ports)));
+
+       /* and also ports */
+       _session.engine().PortRegisteredOrUnregistered.connect (mem_fun (*this, &PortMatrix::setup_all_ports));
+
        reconnect_to_routes ();
 
+       attach (*_body, 0, 1, 0, 1);
+       attach (_vscroll, 1, 2, 0, 1, SHRINK);
+       attach (_hscroll, 0, 1, 1, 2, FILL | EXPAND, SHRINK);
+
        show_all ();
 }
 
 PortMatrix::~PortMatrix ()
 {
-       for (std::vector<Gtk::CheckButton*>::iterator i = _column_visibility_buttons.begin(); i != _column_visibility_buttons.end(); ++i) {
-               delete *i;
-       }
-
-       for (std::vector<Gtk::CheckButton*>::iterator i = _row_visibility_buttons.begin(); i != _row_visibility_buttons.end(); ++i) {
-               delete *i;
-       }
-
+       delete _body;
        delete _menu;
 }
 
@@ -79,14 +101,15 @@ PortMatrix::~PortMatrix ()
 void
 PortMatrix::reconnect_to_routes ()
 {
-       for (std::vector<sigc::connection>::iterator i = _route_connections.begin(); i != _route_connections.end(); ++i) {
+       for (vector<connection>::iterator i = _route_connections.begin(); i != _route_connections.end(); ++i) {
                i->disconnect ();
        }
+       _route_connections.clear ();
 
-       boost::shared_ptr<ARDOUR::RouteList> routes = _session.get_routes ();
-       for (ARDOUR::RouteList::iterator i = routes->begin(); i != routes->end(); ++i) {
+       boost::shared_ptr<RouteList> routes = _session.get_routes ();
+       for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) {
                _route_connections.push_back (
-                       (*i)->processors_changed.connect (sigc::mem_fun (*this, &PortMatrix::setup))
+                       (*i)->processors_changed.connect (mem_fun (*this, &PortMatrix::setup_global_ports))
                        );
        }
 }
@@ -96,142 +119,60 @@ void
 PortMatrix::routes_changed ()
 {
        reconnect_to_routes ();
-       setup ();
+       setup_global_ports ();
 }
 
-/** Set up everything that changes about the matrix */
+/** Set up everything that depends on the content of _ports[] */
 void
 PortMatrix::setup ()
 {
-       select_arrangement ();
-       _body.setup ();
-       setup_scrollbars ();
-       queue_draw ();
-
-       if (_setup_once) {
-
-               /* we've set up before, so we need to clean up before re-setting-up */
-               
-               for (std::vector<Gtk::CheckButton*>::iterator i = _column_visibility_buttons.begin(); i != _column_visibility_buttons.end(); ++i) {
-                       _column_visibility_box.remove (**i);
-                       delete *i;
-               }
-
-               _column_visibility_buttons.clear ();
-
-               for (std::vector<Gtk::CheckButton*>::iterator i = _row_visibility_buttons.begin(); i != _row_visibility_buttons.end(); ++i) {
-                       _row_visibility_box.remove (**i);
-                       delete *i;
-               }
-
-               _row_visibility_buttons.clear ();
-               
-               _scroller_table.remove (_vscroll);
-               _scroller_table.remove (_body);
-               _scroller_table.remove (_hscroll);
-
-               _main_hbox.remove (_scroller_table);
-               _main_hbox.remove (_row_visibility_box);
-               
-               remove (_column_visibility_box);
-               remove (_main_hbox);
-       }
-
-       if (_column_index == 0) {
-               _column_visibility_label.set_text (_("Show Outputs"));
-               _row_visibility_label.set_text (_("Show Inputs"));
-       } else {
-               _column_visibility_label.set_text (_("Show Inputs"));
-               _row_visibility_label.set_text (_("Show Outputs"));
-       }
-
-       /* only show visibility checkbuttons if there is more than one group */
-       if (columns()->size() > 1) {
-               for (PortGroupList::List::const_iterator i = columns()->begin(); i != columns()->end(); ++i) {
-                       Gtk::CheckButton* b = new Gtk::CheckButton ((*i)->name);
-                       b->set_active ((*i)->visible());
-                       boost::weak_ptr<PortGroup> w (*i);
-                       b->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &PortMatrix::visibility_toggled), w, b));
-                       _column_visibility_buttons.push_back (b);
-                       _column_visibility_box.pack_start (*b, Gtk::PACK_SHRINK);
-               }
-       }
-
-       if (rows()->size() > 1) {
-               for (PortGroupList::List::const_iterator i = rows()->begin(); i != rows()->end(); ++i) {
-                       Gtk::CheckButton* b = new Gtk::CheckButton ((*i)->name);
-                       b->set_active ((*i)->visible());
-                       boost::weak_ptr<PortGroup> w (*i);
-                       b->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &PortMatrix::visibility_toggled), w, b));
-                       _row_visibility_buttons.push_back (b);
-                       _row_visibility_box.pack_start (*b, Gtk::PACK_SHRINK);
-               }
+       if ((get_flags () & Gtk::REALIZED) == 0) {
+               select_arrangement ();
        }
 
-       if (_arrangement == TOP_TO_RIGHT) {
-         
-               _scroller_table.attach (_hscroll, 0, 1, 0, 1, Gtk::FILL | Gtk::EXPAND, Gtk::SHRINK);
-               _scroller_table.attach (_body, 0, 1, 1, 2);
-               _scroller_table.attach (_vscroll, 1, 2, 1, 2, Gtk::SHRINK);
-
-               _main_hbox.pack_start (_scroller_table);
-               _main_hbox.pack_start (_row_visibility_box, Gtk::PACK_SHRINK);
-
-               pack_start (_column_visibility_box, Gtk::PACK_SHRINK);
-               pack_start (_main_hbox);
-               
-       } else {
-               _scroller_table.attach (_vscroll, 0, 1, 0, 1, Gtk::SHRINK);
-               _scroller_table.attach (_body, 1, 2, 0, 1);
-               _scroller_table.attach (_hscroll, 1, 2, 1, 2, Gtk::FILL | Gtk::EXPAND, Gtk::SHRINK);
-
-               _main_hbox.pack_start (_row_visibility_box, Gtk::PACK_SHRINK);
-               _main_hbox.pack_start (_scroller_table);
-
-               pack_start (_main_hbox);
-               pack_start (_column_visibility_box, Gtk::PACK_SHRINK);
-       }
-
-       _setup_once = true;
+       _body->setup ();
+       setup_scrollbars ();
+       queue_draw ();
 
        show_all ();
 }
 
 void
-PortMatrix::set_type (ARDOUR::DataType t)
+PortMatrix::set_type (DataType t)
 {
        _type = t;
        _ports[0].set_type (_type);
        _ports[1].set_type (_type);
-       setup ();
+
+       setup_all_ports ();
 }
 
 void
 PortMatrix::hscroll_changed ()
 {
-       _body.set_xoffset (_hscroll.get_adjustment()->get_value());
+       _body->set_xoffset (_hscroll.get_adjustment()->get_value());
 }
 
 void
 PortMatrix::vscroll_changed ()
 {
-       _body.set_yoffset (_vscroll.get_adjustment()->get_value());
+       _body->set_yoffset (_vscroll.get_adjustment()->get_value());
 }
 
 void
 PortMatrix::setup_scrollbars ()
 {
-       Gtk::Adjustment* a = _hscroll.get_adjustment ();
+       Adjustment* a = _hscroll.get_adjustment ();
        a->set_lower (0);
-       a->set_upper (_body.full_scroll_width());
-       a->set_page_size (_body.alloc_scroll_width());
+       a->set_upper (_body->full_scroll_width());
+       a->set_page_size (_body->alloc_scroll_width());
        a->set_step_increment (32);
        a->set_page_increment (128);
 
        a = _vscroll.get_adjustment ();
        a->set_lower (0);
-       a->set_upper (_body.full_scroll_height());
-       a->set_page_size (_body.alloc_scroll_height());
+       a->set_upper (_body->full_scroll_height());
+       a->set_page_size (_body->alloc_scroll_height());
        a->set_step_increment (32);
        a->set_page_increment (128);
 }
@@ -240,27 +181,29 @@ PortMatrix::setup_scrollbars ()
 void
 PortMatrix::disassociate_all ()
 {
-       ARDOUR::BundleList a = _ports[0].bundles ();
-       ARDOUR::BundleList b = _ports[1].bundles ();
-       
-       for (ARDOUR::BundleList::iterator i = a.begin(); i != a.end(); ++i) {
-               for (uint32_t j = 0; j < (*i)->nchannels(); ++j) {
-                       for (ARDOUR::BundleList::iterator k = b.begin(); k != b.end(); ++k) {
-                               for (uint32_t l = 0; l < (*k)->nchannels(); ++l) {
-                                               
-                                       ARDOUR::BundleChannel c[2] = {
-                                               ARDOUR::BundleChannel (*i, j),
-                                               ARDOUR::BundleChannel (*k, l)
+       PortGroup::BundleList a = _ports[0].bundles ();
+       PortGroup::BundleList b = _ports[1].bundles ();
+
+       for (PortGroup::BundleList::iterator i = a.begin(); i != a.end(); ++i) {
+               for (uint32_t j = 0; j < i->bundle->nchannels(); ++j) {
+                       for (PortGroup::BundleList::iterator k = b.begin(); k != b.end(); ++k) {
+                               for (uint32_t l = 0; l < k->bundle->nchannels(); ++l) {
+
+                                       BundleChannel c[2] = {
+                                               BundleChannel (i->bundle, j),
+                                               BundleChannel (k->bundle, l)
                                                        };
-                                       
-                                       set_state (c, false);
+
+                                       if (get_state (c) == PortMatrixNode::ASSOCIATED) {
+                                               set_state (c, false);
+                                       }
 
                                }
                        }
                }
        }
 
-       _body.rebuild_and_draw_grid ();
+       _body->rebuild_and_draw_grid ();
 }
 
 /* Decide how to arrange the components of the matrix */
@@ -268,16 +211,16 @@ void
 PortMatrix::select_arrangement ()
 {
        uint32_t const N[2] = {
-               _ports[0].total_visible_ports (),
-               _ports[1].total_visible_ports ()
+               _ports[0].total_visible_channels (),
+               _ports[1].total_visible_channels ()
        };
 
-       /* The list with the most ports goes on left or right, so that the most port
+       /* The list with the most channels goes on left or right, so that the most channel
           names are printed horizontally and hence more readable.  However we also
           maintain notional `signal flow' vaguely from left to right.  Subclasses
           should choose where to put ports based on signal flowing from _ports[0]
           to _ports[1] */
-       
+
        if (N[0] > N[1]) {
 
                _row_index = 0;
@@ -306,96 +249,354 @@ PortMatrix::rows () const
        return &_ports[_row_index];
 }
 
-/** A group visibility checkbutton has been toggled.
- * @param w Group.
- * @param b Button.
- */
 void
-PortMatrix::visibility_toggled (boost::weak_ptr<PortGroup> w, Gtk::CheckButton* b)
+PortMatrix::popup_menu (
+       pair<boost::shared_ptr<PortGroup>, BundleChannel> column,
+       pair<boost::shared_ptr<PortGroup>, BundleChannel> row,
+       uint32_t t
+       )
 {
-       boost::shared_ptr<PortGroup> g = w.lock ();
-       if (!g) {
+       using namespace Menu_Helpers;
+
+       delete _menu;
+
+       _menu = new Menu;
+       _menu->set_name ("ArdourContextMenu");
+
+       MenuList& items = _menu->items ();
+
+       boost::shared_ptr<PortGroup> pg[2];
+       pg[_column_index] = column.first;
+       pg[_row_index] = row.first;
+
+       BundleChannel bc[2];
+       bc[_column_index] = column.second;
+       bc[_row_index] = row.second;
+
+       char buf [64];
+       bool need_separator = false;
+
+       for (int dim = 0; dim < 2; ++dim) {
+
+               if (bc[dim].bundle) {
+
+                       Menu* m = manage (new Menu);
+                       MenuList& sub = m->items ();
+
+                       boost::weak_ptr<Bundle> w (bc[dim].bundle);
+
+                       if (can_add_channel (bc[dim].bundle)) {
+                               snprintf (buf, sizeof (buf), _("Add %s"), channel_noun().c_str());
+                               sub.push_back (MenuElem (buf, bind (mem_fun (*this, &PortMatrix::add_channel_proxy), w)));
+                       }
+
+
+                       if (can_rename_channels (bc[dim].bundle)) {
+                               snprintf (buf, sizeof (buf), _("Rename '%s'..."), bc[dim].bundle->channel_name (bc[dim].channel).c_str());
+                               sub.push_back (
+                                       MenuElem (
+                                               buf,
+                                               bind (mem_fun (*this, &PortMatrix::rename_channel_proxy), w, bc[dim].channel)
+                                               )
+                                       );
+                       }
+
+                       sub.push_back (SeparatorElem ());
+
+                       if (can_remove_channels (bc[dim].bundle)) {
+                               snprintf (buf, sizeof (buf), _("Remove '%s'"), bc[dim].bundle->channel_name (bc[dim].channel).c_str());
+                               sub.push_back (
+                                       MenuElem (
+                                               buf,
+                                               bind (mem_fun (*this, &PortMatrix::remove_channel_proxy), w, bc[dim].channel)
+                                               )
+                                       );
+                       }
+
+                       if (_show_only_bundles) {
+                               snprintf (buf, sizeof (buf), _("%s all"), disassociation_verb().c_str());
+                       } else {
+                               snprintf (
+                                       buf, sizeof (buf), _("%s all from '%s'"),
+                                       disassociation_verb().c_str(),
+                                       bc[dim].bundle->channel_name (bc[dim].channel).c_str()
+                                       );
+                       }
+
+                       sub.push_back (
+                               MenuElem (buf, bind (mem_fun (*this, &PortMatrix::disassociate_all_on_channel), w, bc[dim].channel, dim))
+                               );
+
+                       items.push_back (MenuElem (bc[dim].bundle->name().c_str(), *m));
+                       need_separator = true;
+               }
+
+       }
+
+       if (need_separator) {
+               items.push_back (SeparatorElem ());
+       }
+
+       need_separator = false;
+
+       for (int dim = 0; dim < 2; ++dim) {
+
+               if (pg[dim]) {
+
+                       boost::weak_ptr<PortGroup> wp (pg[dim]);
+
+                       if (pg[dim]->visible()) {
+                               if (dim == 0) {
+                                       if (pg[dim]->name.empty()) {
+                                               snprintf (buf, sizeof (buf), _("Hide sources"));
+                                       } else {
+                                               snprintf (buf, sizeof (buf), _("Hide '%s' sources"), pg[dim]->name.c_str());
+                                       }
+                               } else {
+                                       if (pg[dim]->name.empty()) {
+                                               snprintf (buf, sizeof (buf), _("Hide destinations"));
+                                       } else {
+                                               snprintf (buf, sizeof (buf), _("Hide '%s' destinations"), pg[dim]->name.c_str());
+                                       }
+                               }
+
+                               items.push_back (MenuElem (buf, bind (mem_fun (*this, &PortMatrix::hide_group), wp)));
+                       } else {
+                               if (dim == 0) {
+                                       if (pg[dim]->name.empty()) {
+                                               snprintf (buf, sizeof (buf), _("Show sources"));
+                                       } else {
+                                               snprintf (buf, sizeof (buf), _("Show '%s' sources"), pg[dim]->name.c_str());
+                                       }
+                               } else {
+                                       if (pg[dim]->name.empty()) {
+                                               snprintf (buf, sizeof (buf), _("Show destinations"));
+                                       } else {
+                                               snprintf (buf, sizeof (buf), _("Show '%s' destinations"), pg[dim]->name.c_str());
+                                       }
+                               }
+                               items.push_back (MenuElem (buf, bind (mem_fun (*this, &PortMatrix::show_group), wp)));
+                       }
+
+                       need_separator = true;
+               }
+       }
+
+       if (need_separator) {
+               items.push_back (SeparatorElem ());
+       }
+
+       items.push_back (MenuElem (_("Rescan"), mem_fun (*this, &PortMatrix::setup_all_ports)));
+       items.push_back (CheckMenuElem (_("Show individual ports"), mem_fun (*this, &PortMatrix::toggle_show_only_bundles)));
+       CheckMenuItem* i = dynamic_cast<CheckMenuItem*> (&items.back());
+       _inhibit_toggle_show_only_bundles = true;
+       i->set_active (!_show_only_bundles);
+       _inhibit_toggle_show_only_bundles = false;
+
+       _menu->popup (1, t);
+}
+
+void
+PortMatrix::remove_channel_proxy (boost::weak_ptr<Bundle> b, uint32_t c)
+{
+       boost::shared_ptr<Bundle> sb = b.lock ();
+       if (!sb) {
                return;
        }
-       
-       g->set_visible (b->get_active());
-       _body.setup ();
-       setup_scrollbars ();
-       queue_draw ();
+
+       remove_channel (BundleChannel (sb, c));
+
 }
 
 void
-PortMatrix::popup_channel_context_menu (int dim, uint32_t N, uint32_t t)
+PortMatrix::rename_channel_proxy (boost::weak_ptr<Bundle> b, uint32_t c)
 {
-       delete _menu;
+       boost::shared_ptr<Bundle> sb = b.lock ();
+       if (!sb) {
+               return;
+       }
 
-       _menu = new Gtk::Menu;
-       _menu->set_name ("ArdourContextMenu");
-       
-       Gtk::Menu_Helpers::MenuList& items = _menu->items ();
+       rename_channel (BundleChannel (sb, c));
+}
+
+void
+PortMatrix::disassociate_all_on_channel (boost::weak_ptr<Bundle> bundle, uint32_t channel, int dim)
+{
+       boost::shared_ptr<Bundle> sb = bundle.lock ();
+       if (!sb) {
+               return;
+       }
 
-       ARDOUR::BundleChannel bc;
+       PortGroup::BundleList a = _ports[1-dim].bundles ();
 
-       ARDOUR::BundleList const r = _ports[dim].bundles();
-       for (ARDOUR::BundleList::const_iterator i = r.begin(); i != r.end(); ++i) {
-               if (N < (*i)->nchannels ()) {
-                       bc = ARDOUR::BundleChannel (*i, N);
-                       break;
-               } else {
-                       N -= (*i)->nchannels ();
+       for (PortGroup::BundleList::iterator i = a.begin(); i != a.end(); ++i) {
+               for (uint32_t j = 0; j < i->bundle->nchannels(); ++j) {
+
+                       BundleChannel c[2];
+                       c[dim] = BundleChannel (sb, channel);
+                       c[1-dim] = BundleChannel (i->bundle, j);
+
+                       if (get_state (c) == PortMatrixNode::ASSOCIATED) {
+                               set_state (c, false);
+                       }
                }
        }
 
-       if (bc.bundle) {
-               char buf [64];
-
-               if (can_rename_channels (dim)) {
-                       snprintf (buf, sizeof (buf), _("Rename '%s'..."), bc.bundle->channel_name (bc.channel).c_str());
-                       boost::weak_ptr<ARDOUR::Bundle> w (bc.bundle);
-                       items.push_back (
-                               Gtk::Menu_Helpers::MenuElem (
-                                       buf,
-                                       sigc::bind (sigc::mem_fun (*this, &PortMatrix::rename_channel_proxy), w, bc.channel)
-                                       )
-                               );
-               }
+       _body->rebuild_and_draw_grid ();
+}
 
-               if (can_remove_channels (dim)) {
-                       snprintf (buf, sizeof (buf), _("Remove '%s'"), bc.bundle->channel_name (bc.channel).c_str());
-                       boost::weak_ptr<ARDOUR::Bundle> w (bc.bundle);
-                       items.push_back (
-                               Gtk::Menu_Helpers::MenuElem (
-                                       buf,
-                                       sigc::bind (sigc::mem_fun (*this, &PortMatrix::remove_channel_proxy), w, bc.channel)
-                                       )
-                               );
+void
+PortMatrix::setup_global_ports ()
+{
+       for (int i = 0; i < 2; ++i) {
+               if (list_is_global (i)) {
+                       setup_ports (i);
                }
-                       
-               _menu->popup (1, t);
        }
-       
 }
 
+void
+PortMatrix::setup_all_ports ()
+{
+       ENSURE_GUI_THREAD (mem_fun (*this, &PortMatrix::setup_all_ports));
+
+       setup_ports (0);
+       setup_ports (1);
+}
 
 void
-PortMatrix::remove_channel_proxy (boost::weak_ptr<ARDOUR::Bundle> b, uint32_t c)
+PortMatrix::toggle_show_only_bundles ()
 {
-       boost::shared_ptr<ARDOUR::Bundle> sb = b.lock ();
-       if (!sb) {
+       if (_inhibit_toggle_show_only_bundles) {
                return;
        }
 
-       remove_channel (ARDOUR::BundleChannel (sb, c));
+       _show_only_bundles = !_show_only_bundles;
+       _body->setup ();
+       setup_scrollbars ();
+       queue_draw ();
+}
+
+void
+PortMatrix::hide_group (boost::weak_ptr<PortGroup> w)
+{
+       boost::shared_ptr<PortGroup> g = w.lock ();
+       if (!g) {
+               return;
+       }
 
+       g->set_visible (false);
 }
 
 void
-PortMatrix::rename_channel_proxy (boost::weak_ptr<ARDOUR::Bundle> b, uint32_t c)
+PortMatrix::show_group (boost::weak_ptr<PortGroup> w)
 {
-       boost::shared_ptr<ARDOUR::Bundle> sb = b.lock ();
-       if (!sb) {
+       boost::shared_ptr<PortGroup> g = w.lock ();
+       if (!g) {
                return;
        }
 
-       rename_channel (ARDOUR::BundleChannel (sb, c));
+       g->set_visible (true);
+}
+
+pair<uint32_t, uint32_t>
+PortMatrix::max_size () const
+{
+       pair<uint32_t, uint32_t> m = _body->max_size ();
+
+       m.first += _vscroll.get_width ();
+       m.second += _hscroll.get_height ();
+
+       return m;
+}
+
+bool
+PortMatrix::on_scroll_event (GdkEventScroll* ev)
+{
+       double const h = _hscroll.get_value ();
+       double const v = _vscroll.get_value ();
+
+       switch (ev->direction) {
+       case GDK_SCROLL_UP:
+               _vscroll.set_value (v - PortMatrixComponent::grid_spacing ());
+               break;
+       case GDK_SCROLL_DOWN:
+               _vscroll.set_value (v + PortMatrixComponent::grid_spacing ());
+               break;
+       case GDK_SCROLL_LEFT:
+               _hscroll.set_value (h - PortMatrixComponent::grid_spacing ());
+               break;
+       case GDK_SCROLL_RIGHT:
+               _hscroll.set_value (h + PortMatrixComponent::grid_spacing ());
+               break;
+       }
+
+       return true;
+}
+
+boost::shared_ptr<IO>
+PortMatrix::io_from_bundle (boost::shared_ptr<Bundle> b) const
+{
+       boost::shared_ptr<IO> io = _ports[0].io_from_bundle (b);
+       if (!io) {
+               io = _ports[1].io_from_bundle (b);
+       }
+
+       return io;
+}
+
+bool
+PortMatrix::can_add_channel (boost::shared_ptr<Bundle> b) const
+{
+       return io_from_bundle (b);
+}
+
+void
+PortMatrix::add_channel (boost::shared_ptr<Bundle> b)
+{
+       boost::shared_ptr<IO> io = io_from_bundle (b);
+
+       if (io) {
+               io->add_port ("", this, _type);
+       }
+}
+
+bool
+PortMatrix::can_remove_channels (boost::shared_ptr<Bundle> b) const
+{
+       return io_from_bundle (b);
+}
+
+void
+PortMatrix::remove_channel (ARDOUR::BundleChannel b)
+{
+       boost::shared_ptr<IO> io = io_from_bundle (b.bundle);
+
+       if (io) {
+               Port* p = io->nth (b.channel);
+               if (p) {
+                       io->remove_port (p, this);
+               }
+       }
+}
+
+void
+PortMatrix::add_channel_proxy (boost::weak_ptr<Bundle> w)
+{
+       boost::shared_ptr<Bundle> b = w.lock ();
+       if (!b) {
+               return;
+       }
+
+       add_channel (b);
+}
+
+void
+PortMatrix::bundle_changed (ARDOUR::Bundle::Change c)
+{
+       if (c != Bundle::NameChanged) {
+               setup_all_ports ();
+       }
+       
+       setup ();
 }