diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-01-09 15:10:59 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-01-09 15:10:59 +0000 |
| commit | 173a8894e370eb4494d3dd996abb61b22913b466 (patch) | |
| tree | 71a32e7915ad5479a7447655c914efe4250ec050 /libs/ardour/route.cc | |
| parent | ddb1a76e5b1b0645d28a83f4735f2070b204fc38 (diff) | |
Fix setup of route meter point on load, and fix intermittent left-channel-only metering (#3699).
git-svn-id: svn://localhost/ardour2/branches/3.0@8486 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/route.cc')
| -rw-r--r-- | libs/ardour/route.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 90867940a1..25024b992a 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -1969,7 +1969,7 @@ Route::_set_state (const XMLNode& node, int version, bool /*call_base*/) if ((prop = node.property (X_("meter-point"))) != 0) { MeterPoint mp = MeterPoint (string_2_enum (prop->value (), _meter_point)); - set_meter_point (mp); + set_meter_point (mp, true); if (_meter) { _meter->set_display_to_user (_meter_point == MeterCustom); } @@ -2937,11 +2937,11 @@ Route::flush_processors () } void -Route::set_meter_point (MeterPoint p) +Route::set_meter_point (MeterPoint p, bool force) { /* CAN BE CALLED FROM PROCESS CONTEXT */ - if (_meter_point == p) { + if (_meter_point == p && !force) { return; } @@ -2981,7 +2981,7 @@ Route::set_meter_point (MeterPoint p) _meter->reflect_inputs (m_in); _processors.insert (loc, _meter); - + /* we do not need to reconfigure the processors, because the meter (a) is always ready to handle processor_max_streams (b) is always an N-in/N-out processor, and thus moving |