Remove unneeded calls to configure_processors during session-load
Those are superseded by b890cf73ad
, which is done after
all IOChanges have been processed.
This commit is contained in:
parent
b890cf73ad
commit
3fa3437c38
|
@ -252,7 +252,9 @@ Route::init ()
|
||||||
Glib::Threads::RWLock::WriterLock lm (_processor_lock);
|
Glib::Threads::RWLock::WriterLock lm (_processor_lock);
|
||||||
_processors.push_back (_amp);
|
_processors.push_back (_amp);
|
||||||
}
|
}
|
||||||
configure_processors (0);
|
if (!_session.loading()) {
|
||||||
|
configure_processors (0);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -2985,7 +2987,7 @@ Route::set_processor_state (const XMLNode& node)
|
||||||
must_configure |= find (_processors.begin(), _processors.end(), _intreturn) == _processors.end ();
|
must_configure |= find (_processors.begin(), _processors.end(), _intreturn) == _processors.end ();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (must_configure) {
|
if (must_configure && !_session.loading()) {
|
||||||
configure_processors_unlocked (0, &lm);
|
configure_processors_unlocked (0, &lm);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3512,6 +3514,10 @@ Route::realtime_handle_transport_stopped ()
|
||||||
void
|
void
|
||||||
Route::input_change_handler (IOChange change, void * /*src*/)
|
Route::input_change_handler (IOChange change, void * /*src*/)
|
||||||
{
|
{
|
||||||
|
if (_session.loading()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if ((change.type & IOChange::ConfigurationChanged)) {
|
if ((change.type & IOChange::ConfigurationChanged)) {
|
||||||
/* This is called with the process lock held if change
|
/* This is called with the process lock held if change
|
||||||
contains ConfigurationChanged
|
contains ConfigurationChanged
|
||||||
|
|
Loading…
Reference in New Issue
Block a user