move point at which main outs Panner <-> Route Pannable binding occurs, so that it does, in fact, occur
git-svn-id: svn://localhost/ardour2/branches/3.0@8596 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
92add245d0
commit
4d1d355720
@ -381,7 +381,10 @@ Delivery::reset_panner ()
|
||||
}
|
||||
|
||||
_panshell->configure_io (ChanCount (DataType::AUDIO, pans_required()), ChanCount (DataType::AUDIO, ntargets));
|
||||
|
||||
}
|
||||
|
||||
|
||||
} else {
|
||||
panner_legal_c.disconnect ();
|
||||
PannersLegal.connect_same_thread (panner_legal_c, boost::bind (&Delivery::panners_became_legal, this));
|
||||
@ -400,6 +403,11 @@ Delivery::panners_became_legal ()
|
||||
}
|
||||
|
||||
_panshell->configure_io (ChanCount (DataType::AUDIO, pans_required()), ChanCount (DataType::AUDIO, ntargets));
|
||||
|
||||
if (_role == Main) {
|
||||
_panshell->pannable()->set_panner (_panshell->panner());
|
||||
}
|
||||
|
||||
panner_legal_c.disconnect ();
|
||||
return 0;
|
||||
}
|
||||
|
@ -1602,13 +1602,6 @@ Route::configure_processors_unlocked (ProcessorStreams* err)
|
||||
_meter->reset_max_channels (processor_max_streams);
|
||||
}
|
||||
|
||||
/* if we haven't bound the main outs panner & our pannable together yet, do it now ..
|
||||
*/
|
||||
|
||||
if (_main_outs && !_pannable->panner()) {
|
||||
_pannable->set_panner (_main_outs->panner_shell()->panner());
|
||||
}
|
||||
|
||||
/* make sure we have sufficient scratch buffers to cope with the new processor
|
||||
configuration */
|
||||
_session.ensure_buffers (n_process_buffers ());
|
||||
|
Loading…
Reference in New Issue
Block a user