reset meters only when *really* necessary
..and continue to calculate fall-off in audio-cycle (rather than UI thread) TODO: check if this works properly when switching between audio/midi meter modes on a midi-track. One of the motivations to always reset meters when the meter-point changes was to resolve peak-hold & fall-off issues when a midi-meter replaces an audio-meter and vice versa.
This commit is contained in:
parent
3c33ff2633
commit
132549c48a
@ -186,20 +186,20 @@ PeakMeter::configure_io (ChanCount in, ChanCount out)
|
||||
void
|
||||
PeakMeter::reflect_inputs (const ChanCount& in)
|
||||
{
|
||||
current_meters = in;
|
||||
|
||||
const size_t limit = min (_peak_signal.size(), (size_t) current_meters.n_total ());
|
||||
const size_t n_midi = min (_peak_signal.size(), (size_t) current_meters.n_midi());
|
||||
|
||||
for (size_t n = 0; n < limit; ++n) {
|
||||
if (n < n_midi) {
|
||||
_visible_peak_power[n] = 0;
|
||||
} else {
|
||||
_visible_peak_power[n] = -INFINITY;
|
||||
for (uint32_t i = in.n_total(); i < current_meters.n_total(); ++i) {
|
||||
if (i < _peak_signal.size()) {
|
||||
_peak_signal[i] = 0.0f;
|
||||
}
|
||||
}
|
||||
for (uint32_t i = in.n_audio(); i < current_meters.n_audio(); ++i) {
|
||||
if (i >= _kmeter.size()) continue;
|
||||
_kmeter[i]->reset();
|
||||
_iec1meter[i]->reset();
|
||||
_iec2meter[i]->reset();
|
||||
_vumeter[i]->reset();
|
||||
}
|
||||
|
||||
reset();
|
||||
current_meters = in;
|
||||
reset_max();
|
||||
|
||||
ConfigurationChanged (in, in); /* EMIT SIGNAL */
|
||||
|
@ -3152,9 +3152,6 @@ Route::set_meter_point (MeterPoint p, bool force)
|
||||
*/
|
||||
}
|
||||
|
||||
_meter->reset();
|
||||
_meter->reset_max();
|
||||
|
||||
meter_change (); /* EMIT SIGNAL */
|
||||
|
||||
bool const meter_visibly_changed = (_meter->display_to_user() != meter_was_visible_to_user);
|
||||
|
@ -436,7 +436,8 @@ Track::no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
|
||||
}
|
||||
|
||||
if (no_meter) {
|
||||
_meter->reset();
|
||||
BufferSet& bufs (_session.get_silent_buffers (n_process_buffers()));
|
||||
_meter->run (bufs, 0, 0, nframes, true);
|
||||
_input->process_input (boost::shared_ptr<Processor>(), start_frame, end_frame, nframes);
|
||||
} else {
|
||||
_input->process_input (_meter, start_frame, end_frame, nframes);
|
||||
|
Loading…
Reference in New Issue
Block a user