add session save signal and hook-up videotimeline

[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..fcd9960e43fe75010db5a1d582c5d41653e52f12 100644 (file)
--- a/gtk2_ardour/global_port_matrix.cc
+++ b/gtk2_ardour/global_port_matrix.cc
@@ -42,22 +42,30 @@ GlobalPortMatrix::GlobalPortMatrix (Gtk::Window* p, Session* s, DataType t)
 void
 GlobalPortMatrix::setup_ports (int dim)
 {
+       if (!_session) {
+               return;
+       }
+
        _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 ();
 }
 
 void
 GlobalPortMatrix::set_state (BundleChannel c[2], bool s)
 {
+       if (!_session) {
+               return;
+       }
+
        Bundle::PortList const & in_ports = c[IN].bundle->channel_ports (c[IN].channel);
        Bundle::PortList const & out_ports = c[OUT].bundle->channel_ports (c[OUT].channel);
 
        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 +113,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 +156,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 +168,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 ();
 }
 
@@ -176,6 +186,10 @@ void
 GlobalPortMatrixWindow::set_session (Session* s)
 {
        _port_matrix.set_session (s);
+
+       if (!s) {
+               hide ();
+       }
 }
 
 string