Small cleanups to port matrix context menu.

[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 02a28621057deaa4444c126c30ac7323420ff456..0f107452a541554f6922b9b069df1faed7890765 100644 (file)
--- a/gtk2_ardour/global_port_matrix.cc
+++ b/gtk2_ardour/global_port_matrix.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2009 Paul Davis 
+    Copyright (C) 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
@@ -17,53 +17,42 @@
 
 */
 
+#include <gtkmm/image.h>
+#include <gtkmm/stock.h>
 #include "global_port_matrix.h"
-#include "i18n.h"
+#include "utils.h"
+
 #include "ardour/bundle.h"
 #include "ardour/session.h"
 #include "ardour/audioengine.h"
 #include "ardour/port.h"
 
-GlobalPortMatrix::GlobalPortMatrix (ARDOUR::Session& s, ARDOUR::DataType t)
-       : PortMatrix (s, t, true),
-         _session (s),
-         _our_port_group_list (t, false)
-{
-       setup ();
+#include "i18n.h"
 
-       _column_ports.VisibilityChanged.connect (sigc::mem_fun (*this, &GlobalPortMatrix::group_visibility_changed));
-}
+using namespace std;
 
-void
-GlobalPortMatrix::group_visibility_changed ()
+GlobalPortMatrix::GlobalPortMatrix (Gtk::Window* p, ARDOUR::Session& s, ARDOUR::DataType t)
+       : PortMatrix (p, s, t)
 {
-       _row_ports.take_visibility_from (_column_ports);
-       setup ();
+       setup_all_ports ();
 }
 
-
 void
-GlobalPortMatrix::setup ()
+GlobalPortMatrix::setup_ports (int dim)
 {
-       _row_ports.gather (_session);
-       PortMatrix::setup ();
+       _ports[dim].suspend_signals ();
+       _ports[dim].gather (_session, dim == IN, false);
+       _ports[dim].resume_signals ();
 }
 
 void
-GlobalPortMatrix::set_state (
-       boost::shared_ptr<ARDOUR::Bundle> ab,
-       uint32_t ac,
-       boost::shared_ptr<ARDOUR::Bundle> bb,
-       uint32_t bc,
-       bool s,
-       uint32_t k
-       )
+GlobalPortMatrix::set_state (ARDOUR::BundleChannel c[2], bool s)
 {
-       ARDOUR::Bundle::PortList const& our_ports = ab->channel_ports (ac);
-       ARDOUR::Bundle::PortList const& other_ports = bb->channel_ports (bc);
+       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);
 
-       for (ARDOUR::Bundle::PortList::const_iterator i = our_ports.begin(); i != our_ports.end(); ++i) {
-               for (ARDOUR::Bundle::PortList::const_iterator j = other_ports.begin(); j != other_ports.end(); ++j) {
+       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) {
 
                        ARDOUR::Port* p = _session.engine().get_port_by_name (*i);
                        ARDOUR::Port* q = _session.engine().get_port_by_name (*j);
@@ -78,7 +67,7 @@ GlobalPortMatrix::set_state (
                                if (s) {
                                        q->connect (*i);
                                } else {
-                                       q->disconnect (*j);
+                                       q->disconnect (*i);
                                }
                        }
 
@@ -87,56 +76,60 @@ GlobalPortMatrix::set_state (
        }
 }
 
-
-PortMatrix::State
-GlobalPortMatrix::get_state (
-       boost::shared_ptr<ARDOUR::Bundle> ab,
-       uint32_t ac,
-       boost::shared_ptr<ARDOUR::Bundle> bb,
-       uint32_t bc
-       ) const
+PortMatrixNode::State
+GlobalPortMatrix::get_state (ARDOUR::BundleChannel c[2]) const
 {
-       ARDOUR::Bundle::PortList const& our_ports = ab->channel_ports (ac);
-       ARDOUR::Bundle::PortList const& other_ports = bb->channel_ports (bc);
+       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 = our_ports.begin(); i != our_ports.end(); ++i) {
-               for (ARDOUR::Bundle::PortList::const_iterator j = other_ports.begin(); j != other_ports.end(); ++j) {
+       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) {
 
                        ARDOUR::Port* p = _session.engine().get_port_by_name (*i);
                        ARDOUR::Port* q = _session.engine().get_port_by_name (*j);
 
                        /* 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)
+       : _port_matrix (this, s, t)
 {
        switch (t) {
        case ARDOUR::DataType::AUDIO:
-               set_title (_("Audio Connections Manager"));
+               set_title (_("Audio Connection Manager"));
                break;
        case ARDOUR::DataType::MIDI:
-               set_title (_("MIDI Connections Manager"));
+               set_title (_("MIDI Connection Manager"));
                break;
        }
-       
-       Gtk::VBox* vbox = Gtk::manage (new Gtk::VBox);
-       vbox->pack_start (_port_matrix);
-       add (*vbox);
+
+       add (_port_matrix);
        show_all ();
 }
+
+void
+GlobalPortMatrixWindow::on_show ()
+{
+       Gtk::Window::on_show ();
+       pair<uint32_t, uint32_t> const pm_max = _port_matrix.max_size ();
+       resize_window_to_proportion_of_monitor (this, pm_max.first, pm_max.second);
+}