Merge branch 'master' into windows

[ardour.git] / gtk2_ardour / port_matrix.cc

diff --git a/gtk2_ardour/port_matrix.cc b/gtk2_ardour/port_matrix.cc
index d406b8ed01582c16b0faa44e3ecec5243ae221cb..6bd9d962629d499c007760ac22fc584c6232062c 100644 (file)
--- a/gtk2_ardour/port_matrix.cc
+++ b/gtk2_ardour/port_matrix.cc
@@ -152,12 +152,13 @@ PortMatrix::init ()
 
        /* and also bundles */
        _session->BundleAdded.connect (_session_connections, invalidator (*this), boost::bind (&PortMatrix::setup_global_ports, this), gui_context());
+       _session->BundleRemoved.connect (_session_connections, invalidator (*this), boost::bind (&PortMatrix::setup_global_ports, this), gui_context());
 
        /* and also ports */
        _session->engine().PortRegisteredOrUnregistered.connect (_session_connections, invalidator (*this), boost::bind (&PortMatrix::setup_global_ports, this), gui_context());
 
        /* watch for route order keys changing, which changes the order of things in our global ports list(s) */
-       Route::SyncOrderKeys.connect (_session_connections, invalidator (*this), boost::bind (&PortMatrix::setup_global_ports_proxy, this, _1), gui_context());
+       Route::SyncOrderKeys.connect (_session_connections, invalidator (*this), boost::bind (&PortMatrix::setup_global_ports_proxy, this), gui_context());
 
        /* Part 3: other stuff */
 
@@ -180,6 +181,7 @@ PortMatrix::reconnect_to_routes ()
        boost::shared_ptr<RouteList> routes = _session->get_routes ();
        for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) {
                (*i)->processors_changed.connect (_route_connections, invalidator (*this), boost::bind (&PortMatrix::route_processors_changed, this, _1), gui_context());
+               (*i)->DropReferences.connect (_route_connections, invalidator (*this), boost::bind (&PortMatrix::routes_changed, this), gui_context());
        }
 }
 
@@ -198,6 +200,7 @@ PortMatrix::route_processors_changed (RouteProcessorChange c)
 void
 PortMatrix::routes_changed ()
 {
+       if (!_session) return;
        reconnect_to_routes ();
        setup_global_ports ();
 }
@@ -206,7 +209,10 @@ PortMatrix::routes_changed ()
 void
 PortMatrix::setup ()
 {
-       if (!_session) return; // session went away
+       if (!_session) {
+               _route_connections.drop_connections ();
+               return; // session went away
+       }
 
        /* this needs to be done first, as the visible_ports() method uses the
           notebook state to decide which ports are being shown */
@@ -330,6 +336,13 @@ PortMatrix::select_arrangement ()
                _vbox.pack_end (_vnotebook, false, false);
                _vbox.pack_end (_vspacer, true, true);
 
+#define REMOVE_FROM_GTK_PARENT(WGT) if ((WGT).get_parent()) { (WGT).get_parent()->remove(WGT);}
+               REMOVE_FROM_GTK_PARENT(*_body)
+               REMOVE_FROM_GTK_PARENT(_vscroll)
+               REMOVE_FROM_GTK_PARENT(_hscroll)
+               REMOVE_FROM_GTK_PARENT(_vbox)
+               REMOVE_FROM_GTK_PARENT(_hbox)
+
                attach (*_body, 2, 3, 1, 2, FILL | EXPAND, FILL | EXPAND);
                attach (_vscroll, 3, 4, 1, 2, SHRINK);
                attach (_hscroll, 2, 3, 3, 4, FILL | EXPAND, SHRINK);
@@ -349,6 +362,12 @@ PortMatrix::select_arrangement ()
                _vbox.pack_end (_vnotebook, false, false);
                _vbox.pack_end (_vlabel, false, false);
 
+               REMOVE_FROM_GTK_PARENT(*_body)
+               REMOVE_FROM_GTK_PARENT(_vscroll)
+               REMOVE_FROM_GTK_PARENT(_hscroll)
+               REMOVE_FROM_GTK_PARENT(_vbox)
+               REMOVE_FROM_GTK_PARENT(_hbox)
+
                attach (*_body, 1, 2, 2, 3, FILL | EXPAND, FILL | EXPAND);
                attach (_vscroll, 3, 4, 2, 3, SHRINK);
                attach (_hscroll, 1, 2, 3, 4, FILL | EXPAND, SHRINK);
@@ -600,15 +619,13 @@ PortMatrix::setup_global_ports ()
 }
 
 void
-PortMatrix::setup_global_ports_proxy (RouteSortOrderKey sk)
+PortMatrix::setup_global_ports_proxy ()
 {
-       if (sk == EditorSort) {
-               /* Avoid a deadlock by calling this in an idle handler: see IOSelector::io_changed_proxy
-                  for a discussion.
-               */
+       /* Avoid a deadlock by calling this in an idle handler: see IOSelector::io_changed_proxy
+          for a discussion.
+       */
                
-               Glib::signal_idle().connect_once (sigc::mem_fun (*this, &PortMatrix::setup_global_ports));
-       }
+       Glib::signal_idle().connect_once (sigc::mem_fun (*this, &PortMatrix::setup_global_ports));
 }
 
 void
@@ -727,7 +744,7 @@ PortMatrix::remove_channel (ARDOUR::BundleChannel b)
                        int const r = io->remove_port (p, this);
                        if (r == -1) {
                                ArdourDialog d (_("Port removal not allowed"));
-                               Label l (_("This port cannot be removed, as the first plugin in the track or buss cannot accept the new number of inputs."));
+                               Label l (_("This port cannot be removed.\nEither the first plugin in the track or buss cannot accept\nthe new number of inputs or the last plugin has more outputs."));
                                d.get_vbox()->pack_start (l);
                                d.add_button (Stock::OK, RESPONSE_ACCEPT);
                                d.set_modal (true);