send control now has working metering, and switches back and forth between busses...

[ardour.git] / gtk2_ardour / global_port_matrix.cc

diff --git a/gtk2_ardour/global_port_matrix.cc b/gtk2_ardour/global_port_matrix.cc
index 4cd6a78aea73a347bfb39f3558e05cbb7ff20634..2b3b9c21318d36805cea4f5b03760267e1d4f4b4 100644 (file)
--- a/gtk2_ardour/global_port_matrix.cc
+++ b/gtk2_ardour/global_port_matrix.cc
@@ -17,26 +17,29 @@
 
 */
 
+#include <gtkmm/image.h>
+#include <gtkmm/stock.h>
 #include "global_port_matrix.h"
-#include "i18n.h"
+
 #include "ardour/bundle.h"
 #include "ardour/session.h"
 #include "ardour/audioengine.h"
 #include "ardour/port.h"
 
+#include "i18n.h"
+
 GlobalPortMatrix::GlobalPortMatrix (ARDOUR::Session& s, ARDOUR::DataType t)
        : PortMatrix (s, t)
 {
-       setup ();
+       setup_all_ports ();
 }
 
 void
-GlobalPortMatrix::setup ()
+GlobalPortMatrix::setup_ports (int dim)
 {
-       _ports[IN].gather (_session, true);
-       _ports[OUT].gather (_session, false);
-       
-       PortMatrix::setup ();
+       _ports[dim].suspend_signals ();
+       _ports[dim].gather (_session, dim == IN);
+       _ports[dim].resume_signals ();
 }
 
 void
@@ -70,13 +73,17 @@ GlobalPortMatrix::set_state (ARDOUR::BundleChannel c[2], bool s)
        }
 }
 
-
-PortMatrix::State
+PortMatrixNode::State
 GlobalPortMatrix::get_state (ARDOUR::BundleChannel c[2]) const
 {
        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 (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::UNKNOWN;
+       }
+               
        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) {
 
@@ -85,22 +92,21 @@ GlobalPortMatrix::get_state (ARDOUR::BundleChannel c[2]) const
 
                        /* we don't know the state of connections between two non-Ardour ports */
                        if (!p && !q) {
-                               return UNKNOWN;
+                               return PortMatrixNode::UNKNOWN;
                        }
 
                        if (p && p->connected_to (*j) == false) {
-                               return NOT_ASSOCIATED;
+                               return PortMatrixNode::NOT_ASSOCIATED;
                        } else if (q && q->connected_to (*i) == false) {
-                               return NOT_ASSOCIATED;
+                               return PortMatrixNode::NOT_ASSOCIATED;
                        }
 
                }
        }
 
-       return ASSOCIATED;
+       return PortMatrixNode::ASSOCIATED;
 }
 
-
 GlobalPortMatrixWindow::GlobalPortMatrixWindow (ARDOUR::Session& s, ARDOUR::DataType t)
        : _port_matrix (s, t)
 {
@@ -112,9 +118,28 @@ GlobalPortMatrixWindow::GlobalPortMatrixWindow (ARDOUR::Session& s, ARDOUR::Data
                set_title (_("MIDI Connections Manager"));
                break;
        }
+
+       Gtk::HBox* buttons_hbox = Gtk::manage (new Gtk::HBox);
+
+       _rescan_button.set_label (_("Rescan"));
+       _rescan_button.set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::REFRESH, Gtk::ICON_SIZE_BUTTON)));
+       _rescan_button.signal_clicked().connect (sigc::mem_fun (_port_matrix, &GlobalPortMatrix::setup_all_ports));
+       buttons_hbox->pack_start (_rescan_button, Gtk::PACK_SHRINK);
+
+       _show_ports_button.set_label (_("Show individual ports"));
+       _show_ports_button.set_active (true);
+       _show_ports_button.signal_toggled().connect (sigc::mem_fun (*this, &GlobalPortMatrixWindow::show_ports_toggled));
+       buttons_hbox->pack_start (_show_ports_button, Gtk::PACK_SHRINK);
        
        Gtk::VBox* vbox = Gtk::manage (new Gtk::VBox);
        vbox->pack_start (_port_matrix);
+       vbox->pack_start (*buttons_hbox, Gtk::PACK_SHRINK);
        add (*vbox);
        show_all ();
 }
+
+void
+GlobalPortMatrixWindow::show_ports_toggled ()
+{
+       _port_matrix.set_show_only_bundles (!_show_ports_button.get_active());
+}