final tweaks for #4489

[ardour.git] / gtk2_ardour / port_matrix.cc

diff --git a/gtk2_ardour/port_matrix.cc b/gtk2_ardour/port_matrix.cc
index 35cfea651f67623595ffc8e5d1ac982285caa895..576b8789caa7e42386111b21ee086363254f03b5 100644 (file)
--- a/gtk2_ardour/port_matrix.cc
+++ b/gtk2_ardour/port_matrix.cc
@@ -379,6 +379,9 @@ PortMatrix::visible_rows () const
        return visible_ports (_row_index);
 }
 
+/** @param column Column; its bundle may be 0 if we are over a row heading.
+ *  @param row Row; its bundle may be 0 if we are over a column heading.
+ */
 void
 PortMatrix::popup_menu (BundleChannel column, BundleChannel row, uint32_t t)
 {
@@ -436,10 +439,10 @@ PortMatrix::popup_menu (BundleChannel column, BundleChannel row, uint32_t t)
                                        );
                        }
 
-                       if (can_remove_channels (bc[dim].bundle)) {
+                       if (can_remove_channels (bc[dim].bundle) && bc[dim].bundle->nchannels() != ARDOUR::ChanCount::ZERO) {
                                if (bc[dim].channel != -1) {
                                        add_remove_option (sub, w, bc[dim].channel);
-                               } else if (bc[dim].bundle->nchannels() != ARDOUR::ChanCount::ZERO) {
+                               } else {
 
                                        snprintf (buf, sizeof (buf), _("Remove all"));
                                        sub.push_back (
@@ -458,16 +461,23 @@ PortMatrix::popup_menu (BundleChannel column, BundleChannel row, uint32_t t)
 
                        uint32_t c = count_of_our_type (bc[dim].bundle->nchannels ());
                        if ((_show_only_bundles && c > 0) || c == 1) {
+
+                               /* we're looking just at bundles, or our bundle has only one channel, so just offer
+                                  to disassociate all on the bundle.
+                               */
+                               
                                snprintf (buf, sizeof (buf), _("%s all"), disassociation_verb().c_str());
                                sub.push_back (
-                                       MenuElem (buf, sigc::bind (sigc::mem_fun (*this, &PortMatrix::disassociate_all_on_channel), w, bc[dim].channel, dim))
+                                       MenuElem (buf, sigc::bind (sigc::mem_fun (*this, &PortMatrix::disassociate_all_on_bundle), w, dim))
                                        );
-
-                       } else {
+                                       
+                       } else if (c != 0) {
 
                                if (bc[dim].channel != -1) {
+                                       /* specific channel under the menu, so just offer to disassociate that */
                                        add_disassociate_option (sub, w, dim, bc[dim].channel);
-                               } else if (count_of_our_type (bc[dim].bundle->nchannels()) != 0) {
+                               } else {
+                                       /* no specific channel; offer to disassociate all, or any one in particular */
                                        snprintf (buf, sizeof (buf), _("%s all"), disassociation_verb().c_str());
                                        sub.push_back (
                                                MenuElem (buf, sigc::bind (sigc::mem_fun (*this, &PortMatrix::disassociate_all_on_bundle), w, dim))
@@ -552,7 +562,7 @@ PortMatrix::disassociate_all_on_channel (boost::weak_ptr<Bundle> bundle, uint32_
        for (PortGroup::BundleList::iterator i = a.begin(); i != a.end(); ++i) {
                for (uint32_t j = 0; j < (*i)->bundle->nchannels().n_total(); ++j) {
 
-                       if (should_show ((*i)->bundle->channel_type(j))) {
+                       if (!should_show ((*i)->bundle->channel_type(j))) {
                                continue;
                        }
 
@@ -690,7 +700,7 @@ PortMatrix::remove_channel (ARDOUR::BundleChannel b)
        boost::shared_ptr<IO> io = io_from_bundle (b.bundle);
 
        if (io) {
-               Port* p = io->nth (b.channel);
+               boost::shared_ptr<Port> p = io->nth (b.channel);
                if (p) {
                        int const r = io->remove_port (p, this);
                        if (r == -1) {
@@ -755,7 +765,15 @@ PortMatrix::setup_notebooks ()
                Label* label = manage (new Label ((*i)->name));
                label->set_angle (_arrangement == LEFT_TO_BOTTOM ? 90 : -90);
                label->show ();
-               _vnotebook.prepend_page (*dummy, *label);
+               if (_arrangement == LEFT_TO_BOTTOM) {
+                       _vnotebook.prepend_page (*dummy, *label);
+               } else {
+                       /* Reverse the order of vertical tabs when they are on the right hand side
+                          so that from top to bottom it is the same order as that from left to right
+                          for the top tabs.
+                       */
+                       _vnotebook.append_page (*dummy, *label);
+               }
        }
 
        for (PortGroupList::List::const_iterator i = _ports[_column_index].begin(); i != _ports[_column_index].end(); ++i) {
@@ -860,9 +878,18 @@ PortMatrix::visible_ports (int d) const
        PortGroupList const & p = _ports[d];
        PortGroupList::List::const_iterator j = p.begin ();
 
+       /* The logic to compute the index here is a bit twisty because for
+          the TOP_TO_RIGHT arrangement we reverse the order of the vertical
+          tabs in setup_notebooks ().
+       */
+          
        int n = 0;
        if (d == _row_index) {
-               n = p.size() - _vnotebook.get_current_page () - 1;
+               if (_arrangement == LEFT_TO_BOTTOM) {
+                       n = p.size() - _vnotebook.get_current_page () - 1;
+               } else {
+                       n = _vnotebook.get_current_page ();
+               }
        } else {
                n = _hnotebook.get_current_page ();
        }