Improve sensitization of buttons in the advanced options

[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 565def896e0618395b998a0286f942ecef8e7a4e..d7499904639e37d9091597dcbb765cb8e2fa5d8b 100644 (file)
--- a/gtk2_ardour/global_port_matrix.cc
+++ b/gtk2_ardour/global_port_matrix.cc
@@ -43,7 +43,7 @@ void
 GlobalPortMatrix::setup_ports (int dim)
 {
        _ports[dim].suspend_signals ();
-       _ports[dim].gather (_session, type(), dim == IN, false);
+       _ports[dim].gather (_session, type(), dim == IN, false, show_only_bundles ());
        _ports[dim].resume_signals ();
 }
 
@@ -56,8 +56,8 @@ GlobalPortMatrix::set_state (BundleChannel c[2], bool s)
        for (Bundle::PortList::const_iterator i = in_ports.begin(); i != in_ports.end(); ++i) {
                for (Bundle::PortList::const_iterator j = out_ports.begin(); j != out_ports.end(); ++j) {
 
-                       Port* p = _session->engine().get_port_by_name (*i);
-                       Port* q = _session->engine().get_port_by_name (*j);
+                       boost::shared_ptr<Port> p = _session->engine().get_port_by_name (*i);
+                       boost::shared_ptr<Port> q = _session->engine().get_port_by_name (*j);
 
                        if (p) {
                                if (s) {
@@ -105,8 +105,8 @@ GlobalPortMatrix::get_state (BundleChannel c[2]) const
        for (Bundle::PortList::const_iterator i = in_ports.begin(); i != in_ports.end(); ++i) {
                for (Bundle::PortList::const_iterator j = out_ports.begin(); j != out_ports.end(); ++j) {
 
-                       Port* p = _session->engine().get_port_by_name (*i);
-                       Port* q = _session->engine().get_port_by_name (*j);
+                       boost::shared_ptr<Port> p = _session->engine().get_port_by_name (*i);
+                       boost::shared_ptr<Port> q = _session->engine().get_port_by_name (*j);
 
                        if (!p && !q) {
                                /* two non-Ardour ports; things are slightly more involved */
@@ -148,8 +148,8 @@ GlobalPortMatrix::get_state (BundleChannel c[2]) const
 }
 
 GlobalPortMatrixWindow::GlobalPortMatrixWindow (Session* s, DataType t)
-       : ArdourDialog (X_("reset me soon"))
-        , _port_matrix (this, s, t)
+       : ArdourWindow (X_("reset me soon"))
+       , _port_matrix (this, s, t)
 {
        switch (t) {
        case DataType::AUDIO:
@@ -160,7 +160,9 @@ GlobalPortMatrixWindow::GlobalPortMatrixWindow (Session* s, DataType t)
                break;
        }
 
-       get_vbox()->pack_start (_port_matrix, true, true);
+       signal_key_press_event().connect (sigc::mem_fun (_port_matrix, &PortMatrix::key_press));
+
+       add (_port_matrix);
        _port_matrix.show ();
 }