ardour/livetrax
13
0
Fork 0
Code

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

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@6917 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-04-16 19:31:10 +00:00
parent dc815ea8e8
commit 5ddedeec73
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/meter.cc
View File

@ -115,6 +115,8 @@ PeakMeter::configure_io (ChanCount in, ChanCount out)
current_meters = in; current_meters = in;
reset_max_channels (in);
return Processor::configure_io (in, out); return Processor::configure_io (in, out);
} }

2
libs/ardour/route.cc
View File

@ -2162,7 +2162,7 @@ Route::set_processor_state (const XMLNode& node)
} else if (prop->value() == "main-outs") { } else if (prop->value() == "main-outs") {
_main_outs->set_state (**niter, Stateful::current_state_version); _main_outs->set_state (**niter, Stateful::current_state_version);
new_order.push_back (_main_outs); new_order.push_back (_main_outs);
} else if (is_monitor() && prop->value() == "intreturn") { } else if (prop->value() == "intreturn") {
if (!_intreturn) { if (!_intreturn) {
_intreturn.reset (new InternalReturn (_session)); _intreturn.reset (new InternalReturn (_session));
must_configure = true; must_configure = true;