diff options
| author | nick_m <mainsbridge@gmail.com> | 2013-10-21 00:19:43 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2013-10-21 00:19:43 +1100 |
| commit | 5b62e88fbf1022a48c50c9975c2a81a05ecdbb0c (patch) | |
| tree | 991a5796771b9bd642c75b07bd04ae017e433833 /gtk2_ardour/port_matrix.cc | |
| parent | f5c386bbb40e176028022efa7577369eca79b788 (diff) | |
Unify editor / mixer ordering.
Diffstat (limited to 'gtk2_ardour/port_matrix.cc')
| -rw-r--r-- | gtk2_ardour/port_matrix.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/gtk2_ardour/port_matrix.cc b/gtk2_ardour/port_matrix.cc index 2872ad6605..35e9a5cbd3 100644 --- a/gtk2_ardour/port_matrix.cc +++ b/gtk2_ardour/port_matrix.cc @@ -158,7 +158,7 @@ PortMatrix::init () _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 */ @@ -619,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 |