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/meter.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/meter.cc')
-rw-r--r-- | libs/ardour/meter.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/meter.cc b/libs/ardour/meter.cc index 226cf417f3..1ea3a090dd 100644 --- a/libs/ardour/meter.cc +++ b/libs/ardour/meter.cc @@ -45,8 +45,8 @@ PeakMeter::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_fr return; } - const uint32_t n_audio = min(_configured_input.n_audio(), bufs.count().n_audio()); - const uint32_t n_midi = min(_configured_input.n_midi(), bufs.count().n_midi()); + const uint32_t n_audio = min (current_meters.n_audio(), bufs.count().n_audio()); + const uint32_t n_midi = min (current_meters.n_midi(), bufs.count().n_midi()); uint32_t n = 0; @@ -129,7 +129,7 @@ PeakMeter::reflect_inputs (const ChanCount& in) void PeakMeter::reset_max_channels (const ChanCount& chn) { - uint32_t limit = chn.n_total(); + uint32_t const limit = chn.n_total(); while (_peak_power.size() > limit) { _peak_power.pop_back(); |