ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

NO-OP: use reference instead of iterator

Browse Source
This commit is contained in:
Robin Gareus 2021-06-08 19:21:12 +02:00
parent 23e3b6f6a8
commit 445d5a75d0
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libs/ardour/port_manager.cc
View File

@ -1772,9 +1772,10 @@ PortManager::run_input_meters (pframes_t n_samples, samplecnt_t rate)
for (AudioInputPorts::iterator p = aip->begin(); p != aip->end(); ++p) { for (AudioInputPorts::iterator p = aip->begin(); p != aip->end(); ++p) {
assert (!port_is_mine (p->first)); assert (!port_is_mine (p->first));
AudioInputPort& ai (p->second);
if (reset) { if (reset) {
p->second.meter->reset (); ai.meter->reset ();
} }
PortEngine::PortHandle ph = _backend->get_port_by_name (p->first); PortEngine::PortHandle ph = _backend->get_port_by_name (p->first);
@ -1785,24 +1786,24 @@ PortManager::run_input_meters (pframes_t n_samples, samplecnt_t rate)
Sample* buf = (Sample*) _backend->get_buffer (ph, n_samples); Sample* buf = (Sample*) _backend->get_buffer (ph, n_samples);
if (!buf) { if (!buf) {
/* can this happen? */ /* can this happen? */
p->second.meter->level = 0; ai.meter->level = 0;
p->second.scope->silence (n_samples); ai.scope->silence (n_samples);
continue; continue;
} }
p->second.scope->write (buf, n_samples); ai.scope->write (buf, n_samples);
/* falloff */ /* falloff */
if (p->second.meter->level > 1e-10) { if (ai.meter->level > 1e-10) {
p->second.meter->level *= falloff; ai.meter->level *= falloff;
} else { } else {
p->second.meter->level = 0; ai.meter->level = 0;
} }
float level = p->second.meter->level; float level = ai.meter->level;
level = compute_peak (buf, n_samples, reset ? 0 : level); level = compute_peak (buf, n_samples, reset ? 0 : level);
p->second.meter->level = std::min (level, 100.f); // cut off at +40dBFS for falloff. ai.meter->level = std::min (level, 100.f); // cut off at +40dBFS for falloff.
p->second.meter->peak = std::max (p->second.meter->peak, level); ai.meter->peak = std::max (ai.meter->peak, level);
} }
/* MIDI */ /* MIDI */
@ -1815,12 +1816,14 @@ PortManager::run_input_meters (pframes_t n_samples, samplecnt_t rate)
continue; continue;
} }
MIDIInputPort& mi (p->second);
for (size_t i = 0; i < 17; ++i) { for (size_t i = 0; i < 17; ++i) {
/* falloff */ /* falloff */
if (p->second.meter->chn_active[i] > 1e-10) { if (mi.meter->chn_active[i] > 1e-10) {
p->second.meter->chn_active[i] *= falloff; mi.meter->chn_active[i] *= falloff;
} else { } else {
p->second.meter->chn_active[i] = 0; mi.meter->chn_active[i] = 0;
} }
} }
@ -1837,12 +1840,12 @@ PortManager::run_input_meters (pframes_t n_samples, samplecnt_t rate)
continue; continue;
} }
if ((buf[0] & 0xf0) == 0xf0) { if ((buf[0] & 0xf0) == 0xf0) {
p->second.meter->chn_active[16] = 1.0; mi.meter->chn_active[16] = 1.0;
} else { } else {
int chn = (buf[0] & 0x0f); int chn = (buf[0] & 0x0f);
p->second.meter->chn_active[chn] = 1.0; mi.meter->chn_active[chn] = 1.0;
} }
p->second.monitor->write (buf, size); mi.monitor->write (buf, size);
} }
} }
} }