make sure that meters are configured to handle the right number of channels, and allow internal returns to be restored from XML in non-monitor busses
git-svn-id: svn://localhost/ardour2/branches/3.0@6917 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
dc815ea8e8
commit
5ddedeec73
@ -115,6 +115,8 @@ PeakMeter::configure_io (ChanCount in, ChanCount out)
|
||||
|
||||
current_meters = in;
|
||||
|
||||
reset_max_channels (in);
|
||||
|
||||
return Processor::configure_io (in, out);
|
||||
}
|
||||
|
||||
|
@ -2162,7 +2162,7 @@ Route::set_processor_state (const XMLNode& node)
|
||||
} else if (prop->value() == "main-outs") {
|
||||
_main_outs->set_state (**niter, Stateful::current_state_version);
|
||||
new_order.push_back (_main_outs);
|
||||
} else if (is_monitor() && prop->value() == "intreturn") {
|
||||
} else if (prop->value() == "intreturn") {
|
||||
if (!_intreturn) {
|
||||
_intreturn.reset (new InternalReturn (_session));
|
||||
must_configure = true;
|
||||
|
Loading…
Reference in New Issue
Block a user