X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_matrix.cc;h=40cc80a35014c0fc544b5b66eeb29d7ade40358a;hb=c912bd61ae49cc79158f3322439c29b27ef51de8;hp=e8108555e6f552d71e9aab673824aae42236291b;hpb=19bb2b33a89a1291451f0740739a36daebe00bae;p=ardour.git

diff --git a/gtk2_ardour/port_matrix.cc b/gtk2_ardour/port_matrix.cc
index e8108555e6..40cc80a350 100644
--- a/gtk2_ardour/port_matrix.cc
+++ b/gtk2_ardour/port_matrix.cc
@@ -43,6 +43,7 @@
 using namespace std;
 using namespace Gtk;
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 
 /** PortMatrix constructor.
  *  @param session Our session.
@@ -151,14 +152,13 @@ PortMatrix::init ()
 	_session->RouteAdded.connect (_session_connections, invalidator (*this), boost::bind (&PortMatrix::routes_changed, this), gui_context());
 
 	/* 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());
+	_session->BundleAddedOrRemoved.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 */
 
@@ -248,17 +248,26 @@ PortMatrix::setup_scrollbars ()
 {
 	Adjustment* a = _hscroll.get_adjustment ();
 	a->set_lower (0);
-	a->set_upper (_body->full_scroll_width());
 	a->set_page_size (_body->alloc_scroll_width());
 	a->set_step_increment (32);
 	a->set_page_increment (128);
 
+	/* Set the adjustment to zero if the size has changed.*/
+	if (a->get_upper() != _body->full_scroll_width()) {
+		a->set_upper (_body->full_scroll_width());
+		a->set_value (0);
+	}
+
 	a = _vscroll.get_adjustment ();
 	a->set_lower (0);
-	a->set_upper (_body->full_scroll_height());
 	a->set_page_size (_body->alloc_scroll_height());
 	a->set_step_increment (32);
 	a->set_page_increment (128);
+
+	if (a->get_upper() != _body->full_scroll_height()) {
+		a->set_upper (_body->full_scroll_height());
+		a->set_value (0);
+	}
 }
 
 /** Disassociate all of our ports from each other */
@@ -609,6 +618,7 @@ PortMatrix::disassociate_all_on_channel (boost::weak_ptr<Bundle> bundle, uint32_
 void
 PortMatrix::setup_global_ports ()
 {
+	if (!_session || _session->deletion_in_progress()) return;
 	ENSURE_GUI_THREAD (*this, &PortMatrix::setup_global_ports)
 
 	for (int i = 0; i < 2; ++i) {
@@ -619,15 +629,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
@@ -709,7 +717,7 @@ PortMatrix::io_from_bundle (boost::shared_ptr<Bundle> b) const
 bool
 PortMatrix::can_add_channels (boost::shared_ptr<Bundle> b) const
 {
-	return io_from_bundle (b);
+	return io_from_bundle (b) != 0;
 }
 
 void
@@ -732,7 +740,7 @@ PortMatrix::add_channel (boost::shared_ptr<Bundle> b, DataType t)
 bool
 PortMatrix::can_remove_channels (boost::shared_ptr<Bundle> b) const
 {
-	return io_from_bundle (b);
+	return io_from_bundle (b) != 0;
 }
 
 void
@@ -1139,7 +1147,7 @@ PortMatrix::get_association (PortMatrixNode node) const
 
 	}
 
-	/* NOTREACHED */
+	abort(); /* NOTREACHED */
 	return PortMatrixNode::NOT_ASSOCIATED;
 }