[Summary] Fixed issue: switch StereoOut->MultiOut used to take longer then vice versa.

This commit is contained in:
GZharun 2015-02-12 14:11:01 +02:00
parent 4b5392ccf9
commit 21d5416218
5 changed files with 4 additions and 6 deletions

View file

@ -5838,6 +5838,8 @@ Editor::output_connection_mode_changed ()
delete tv;
}
}
_routes->redisplay ();
}

View file

@ -568,7 +568,7 @@ EditorRoutes::redisplay_real ()
void
EditorRoutes::redisplay ()
{
if (_no_redisplay || !_session || _session->deletion_in_progress()) {
if (_no_redisplay || !_session || _session->deletion_in_progress() || _session->reconnection_in_progress() ) {
return;
}

View file

@ -84,7 +84,7 @@ RouteInspector::init ()
color_button[i]->signal_clicked.connect (sigc::mem_fun (*this, &RouteInspector::color_button_clicked));
}
_session->session_routes_reconnected.connect(_input_output_channels_update, invalidator (*this), boost::bind (&RouteInspector::update_inspector_info_panel, this), gui_context());
EngineStateController::instance()->OutputConfigChanged.connect(_input_output_channels_update, invalidator (*this), boost::bind (&RouteInspector::update_inspector_info_panel, this), gui_context());
}
RouteInspector::~RouteInspector ()

View file

@ -719,7 +719,6 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
PBD::Signal1<void,bool> SoloActive;
PBD::Signal0<void> SoloChanged;
PBD::Signal0<void> IsolatedChanged;
PBD::Signal0<void> session_routes_reconnected;
/* monitor/master out */

View file

@ -2499,9 +2499,6 @@ Session::reconnect_existing_routes (bool withLock, bool reconnect_master, bool r
}
graph_reordered ();
//emit signal
session_routes_reconnected ();
}