ardour/livetrax
13
0
Fork 0
Code

NO-OP: whitespace

Browse Source
This commit is contained in:
Robin Gareus 2020-04-07 04:02:52 +02:00
parent b5ca7d352a
commit e95d33502f
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 154 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
libs/ardour/ardour/meter.h
View File

@ -23,14 +23,16 @@
#define __ardour_meter_h__ #define __ardour_meter_h__
#include <vector> #include <vector>
#include "ardour/libardour_visibility.h"
#include "ardour/types.h"
#include "ardour/processor.h"
#include "pbd/fastlog.h" #include "pbd/fastlog.h"
#include "ardour/kmeterdsp.h" #include "ardour/libardour_visibility.h"
#include "ardour/processor.h"
#include "ardour/types.h"
#include "ardour/iec1ppmdsp.h" #include "ardour/iec1ppmdsp.h"
#include "ardour/iec2ppmdsp.h" #include "ardour/iec2ppmdsp.h"
#include "ardour/kmeterdsp.h"
#include "ardour/vumeterdsp.h" #include "ardour/vumeterdsp.h"
namespace ARDOUR { namespace ARDOUR {
@ -41,15 +43,16 @@ class Session;
/** Meters peaks on the input and stores them for access. /** Meters peaks on the input and stores them for access.
*/ */
class LIBARDOUR_API PeakMeter : public Processor { class LIBARDOUR_API PeakMeter : public Processor
{
public: public:
PeakMeter(Session& s, const std::string& name); PeakMeter (Session& s, const std::string& name);
~PeakMeter(); ~PeakMeter ();
void reset (); void reset ();
void reset_max (); void reset_max ();
std::string display_name() const; std::string display_name () const;
bool can_support_io_configuration (const ChanCount& in, ChanCount& out); bool can_support_io_configuration (const ChanCount& in, ChanCount& out);
bool configure_io (ChanCount in, ChanCount out); bool configure_io (ChanCount in, ChanCount out);
@ -71,18 +74,17 @@ public:
/** Compute peaks */ /** Compute peaks */
void run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_sample, double speed, pframes_t nframes, bool); void run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_sample, double speed, pframes_t nframes, bool);
void activate () { } void activate () {}
void deactivate () { } void deactivate () {}
ChanCount input_streams () const { return current_meters; } ChanCount input_streams () const { return current_meters; }
ChanCount output_streams () const { return current_meters; } ChanCount output_streams () const { return current_meters; }
float meter_level (uint32_t n, MeterType type); float meter_level (uint32_t n, MeterType type);
void set_meter_type (MeterType t); void set_meter_type (MeterType t);
MeterType meter_type () const { return _meter_type; } MeterType meter_type () const { return _meter_type; }
PBD::Signal1<void, MeterType> MeterTypeChanged; PBD::Signal1<void, MeterType> MeterTypeChanged;
protected: protected:
@ -101,15 +103,15 @@ private:
volatile gint _reset_max; volatile gint _reset_max;
uint32_t _bufcnt; uint32_t _bufcnt;
std::vector<float> _peak_buffer; // internal, integrate std::vector<float> _peak_buffer; // internal, integrate
std::vector<float> _peak_power; // includes accurate falloff, hence dB std::vector<float> _peak_power; // includes accurate falloff, hence dB
std::vector<float> _max_peak_signal; // dB calculation is done on demand std::vector<float> _max_peak_signal; // dB calculation is done on demand
float _combined_peak; // Mackie surfaces expect the highest peak of all track channels float _combined_peak; // Mackie surfaces expect the highest peak of all track channels
std::vector<Kmeterdsp *> _kmeter; std::vector<Kmeterdsp*> _kmeter;
std::vector<Iec1ppmdsp *> _iec1meter; std::vector<Iec1ppmdsp*> _iec1meter;
std::vector<Iec2ppmdsp *> _iec2meter; std::vector<Iec2ppmdsp*> _iec2meter;
std::vector<Vumeterdsp *> _vumeter; std::vector<Vumeterdsp*> _vumeter;
MeterType _meter_type; MeterType _meter_type;
}; };

260
libs/ardour/meter.cc
View File

@ -31,9 +31,9 @@
#include "ardour/dB.h" #include "ardour/dB.h"
#include "ardour/meter.h" #include "ardour/meter.h"
#include "ardour/midi_buffer.h" #include "ardour/midi_buffer.h"
#include "ardour/session.h"
#include "ardour/rc_configuration.h" #include "ardour/rc_configuration.h"
#include "ardour/runtime_functions.h" #include "ardour/runtime_functions.h"
#include "ardour/session.h"
#include "pbd/i18n.h" #include "pbd/i18n.h"
@ -44,39 +44,40 @@ using namespace ARDOUR;
PeakMeter::PeakMeter (Session& s, const std::string& name) PeakMeter::PeakMeter (Session& s, const std::string& name)
: Processor (s, string_compose ("meter-%1", name)) : Processor (s, string_compose ("meter-%1", name))
{ {
Kmeterdsp::init(s.nominal_sample_rate()); Kmeterdsp::init (s.nominal_sample_rate ());
Iec1ppmdsp::init(s.nominal_sample_rate()); Iec1ppmdsp::init (s.nominal_sample_rate ());
Iec2ppmdsp::init(s.nominal_sample_rate()); Iec2ppmdsp::init (s.nominal_sample_rate ());
Vumeterdsp::init(s.nominal_sample_rate()); Vumeterdsp::init (s.nominal_sample_rate ());
_pending_active = true; _pending_active = true;
_meter_type = MeterPeak; _meter_type = MeterPeak;
_reset_dpm = 1; _reset_dpm = 1;
_reset_max = 1; _reset_max = 1;
_bufcnt = 0; _bufcnt = 0;
_combined_peak = 0; _combined_peak = 0;
} }
PeakMeter::~PeakMeter () PeakMeter::~PeakMeter ()
{ {
while (_kmeter.size() > 0) { while (_kmeter.size () > 0) {
delete (_kmeter.back()); delete _kmeter.back ();
delete (_iec1meter.back()); delete _iec1meter.back ();
delete (_iec2meter.back()); delete _iec2meter.back ();
delete (_vumeter.back()); delete _vumeter.back ();
_kmeter.pop_back(); _kmeter.pop_back ();
_iec1meter.pop_back(); _iec1meter.pop_back ();
_iec2meter.pop_back(); _iec2meter.pop_back ();
_vumeter.pop_back(); _vumeter.pop_back ();
} }
while (_peak_power.size() > 0) { while (_peak_power.size () > 0) {
_peak_buffer.pop_back(); _peak_buffer.pop_back ();
_peak_power.pop_back(); _peak_power.pop_back ();
_max_peak_signal.pop_back(); _max_peak_signal.pop_back ();
} }
} }
std::string std::string
PeakMeter::display_name() const PeakMeter::display_name () const
{ {
return _("Meter"); return _("Meter");
} }
@ -101,13 +102,14 @@ PeakMeter::run (BufferSet& bufs, samplepos_t /*start_sample*/, samplepos_t /*end
_combined_peak = 0; _combined_peak = 0;
const uint32_t n_audio = min (current_meters.n_audio(), bufs.count().n_audio()); 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()); const uint32_t n_midi = min (current_meters.n_midi (), bufs.count ().n_midi ());
uint32_t n = 0; uint32_t n = 0;
const float falloff_dB = Config->get_meter_falloff() * nframes / _session.nominal_sample_rate(); const uint32_t zoh = _session.nominal_sample_rate () * .021;
const uint32_t zoh = _session.nominal_sample_rate() * .021; const float falloff_dB = Config->get_meter_falloff () * nframes / _session.nominal_sample_rate ();
_bufcnt += nframes; _bufcnt += nframes;
/* Meter MIDI */ /* Meter MIDI */
@ -116,12 +118,12 @@ PeakMeter::run (BufferSet& bufs, samplepos_t /*start_sample*/, samplepos_t /*end
if (reset_dpm) { if (reset_dpm) {
_peak_power[n] = 0; _peak_power[n] = 0;
} }
const MidiBuffer& buf (bufs.get_midi(i)); const MidiBuffer& buf (bufs.get_midi (i));
for (MidiBuffer::const_iterator e = buf.begin(); e != buf.end(); ++e) { for (MidiBuffer::const_iterator e = buf.begin (); e != buf.end (); ++e) {
const Evoral::Event<samplepos_t> ev(*e, false); const Evoral::Event<samplepos_t> ev (*e, false);
if (ev.is_note_on()) { if (ev.is_note_on ()) {
const float this_vel = ev.buffer()[2] / 127.0; const float this_vel = ev.buffer ()[2] / 127.0;
if (this_vel > val) { if (this_vel > val) {
val = this_vel; val = this_vel;
} }
@ -131,7 +133,7 @@ PeakMeter::run (BufferSet& bufs, samplepos_t /*start_sample*/, samplepos_t /*end
} }
} }
} else { } else {
val += 1.0 / bufs.get_midi(n).capacity(); val += 1.0 / bufs.get_midi (n).capacity ();
if (val > 1.0) { if (val > 1.0) {
val = 1.0; val = 1.0;
} }
@ -143,19 +145,19 @@ PeakMeter::run (BufferSet& bufs, samplepos_t /*start_sample*/, samplepos_t /*end
/* empirical algorithm WRT to audio falloff times */ /* empirical algorithm WRT to audio falloff times */
_peak_power[n] -= sqrtf (_peak_power[n]) * falloff_dB * 0.045f; _peak_power[n] -= sqrtf (_peak_power[n]) * falloff_dB * 0.045f;
} }
_peak_power[n] = max(_peak_power[n], val); _peak_power[n] = max (_peak_power[n], val);
_max_peak_signal[n] = 0; _max_peak_signal[n] = 0;
} }
/* Audio Meters */ /* Audio Meters */
for (uint32_t i = 0; i < n_audio; ++i, ++n) { for (uint32_t i = 0; i < n_audio; ++i, ++n) {
if (bufs.get_audio(i).silent()) { if (bufs.get_audio (i).silent ()) {
_peak_buffer[n] = 0; _peak_buffer[n] = 0;
} else { } else {
_peak_buffer[n] = compute_peak (bufs.get_audio(i).data(), nframes, _peak_buffer[n]); _peak_buffer[n] = compute_peak (bufs.get_audio (i).data (), nframes, _peak_buffer[n]);
_peak_buffer[n] = std::min (_peak_buffer[n], 100.f); // cut off at +40dBFS for falloff. _peak_buffer[n] = std::min (_peak_buffer[n], 100.f); // cut off at +40dBFS for falloff.
_max_peak_signal[n] = std::max(_peak_buffer[n], _max_peak_signal[n]); _max_peak_signal[n] = std::max (_peak_buffer[n], _max_peak_signal[n]);
_combined_peak = std::max(_peak_buffer[n], _combined_peak); _combined_peak = std::max (_peak_buffer[n], _combined_peak);
} }
if (reset_max) { if (reset_max) {
@ -164,15 +166,15 @@ PeakMeter::run (BufferSet& bufs, samplepos_t /*start_sample*/, samplepos_t /*end
if (reset_dpm) { if (reset_dpm) {
_peak_buffer[n] = 0; _peak_buffer[n] = 0;
_peak_power[n] = -std::numeric_limits<float>::infinity(); _peak_power[n] = -std::numeric_limits<float>::infinity ();
} else { } else {
/* falloff */ /* falloff */
if (_peak_power[n] > -318.8f) { if (_peak_power[n] > -318.8f) {
_peak_power[n] -= falloff_dB; _peak_power[n] -= falloff_dB;
} else { } else {
_peak_power[n] = -std::numeric_limits<float>::infinity(); _peak_power[n] = -std::numeric_limits<float>::infinity ();
} }
_peak_power[n] = max(_peak_power[n], accurate_coefficient_to_dB(_peak_buffer[n])); _peak_power[n] = max (_peak_power[n], accurate_coefficient_to_dB (_peak_buffer[n]));
/* integration buffer, retain peaks > 49Hz */ /* integration buffer, retain peaks > 49Hz */
if (_bufcnt > zoh) { if (_bufcnt > zoh) {
_peak_buffer[n] = 0; _peak_buffer[n] = 0;
@ -180,22 +182,22 @@ PeakMeter::run (BufferSet& bufs, samplepos_t /*start_sample*/, samplepos_t /*end
} }
if (_meter_type & (MeterKrms | MeterK20 | MeterK14 | MeterK12)) { if (_meter_type & (MeterKrms | MeterK20 | MeterK14 | MeterK12)) {
_kmeter[i]->process(bufs.get_audio(i).data(), nframes); _kmeter[i]->process (bufs.get_audio (i).data (), nframes);
} }
if (_meter_type & (MeterIEC1DIN | MeterIEC1NOR)) { if (_meter_type & (MeterIEC1DIN | MeterIEC1NOR)) {
_iec1meter[i]->process(bufs.get_audio(i).data(), nframes); _iec1meter[i]->process (bufs.get_audio (i).data (), nframes);
} }
if (_meter_type & (MeterIEC2BBC | MeterIEC2EBU)) { if (_meter_type & (MeterIEC2BBC | MeterIEC2EBU)) {
_iec2meter[i]->process(bufs.get_audio(i).data(), nframes); _iec2meter[i]->process (bufs.get_audio (i).data (), nframes);
} }
if (_meter_type & MeterVU) { if (_meter_type & MeterVU) {
_vumeter[i]->process(bufs.get_audio(i).data(), nframes); _vumeter[i]->process (bufs.get_audio (i).data (), nframes);
} }
} }
/* Zero any excess peaks */ /* Zero any excess peaks */
for (uint32_t i = n; i < _peak_power.size(); ++i) { for (uint32_t i = n; i < _peak_power.size (); ++i) {
_peak_power[i] = -std::numeric_limits<float>::infinity(); _peak_power[i] = -std::numeric_limits<float>::infinity ();
_max_peak_signal[n] = 0; _max_peak_signal[n] = 0;
} }
@ -216,22 +218,22 @@ PeakMeter::reset ()
if (_active || _pending_active) { if (_active || _pending_active) {
g_atomic_int_set (&_reset_dpm, 1); g_atomic_int_set (&_reset_dpm, 1);
} else { } else {
for (size_t i = 0; i < _peak_power.size(); ++i) { for (size_t i = 0; i < _peak_power.size (); ++i) {
_peak_power[i] = -std::numeric_limits<float>::infinity(); _peak_power[i] = -std::numeric_limits<float>::infinity ();
_peak_buffer[i] = 0; _peak_buffer[i] = 0;
} }
const uint32_t n_midi = min (current_meters.n_midi(), (uint32_t)_peak_power.size()); const uint32_t n_midi = min (current_meters.n_midi (), (uint32_t)_peak_power.size ());
for (size_t i = 0; i < n_midi; ++i) { for (size_t i = 0; i < n_midi; ++i) {
_peak_power[i] = 0; _peak_power[i] = 0;
} }
} }
/* these are handled async just fine. */ /* these are handled async just fine. */
for (size_t n = 0; n < _kmeter.size(); ++n) { for (size_t n = 0; n < _kmeter.size (); ++n) {
_kmeter[n]->reset(); _kmeter[n]->reset ();
_iec1meter[n]->reset(); _iec1meter[n]->reset ();
_iec2meter[n]->reset(); _iec2meter[n]->reset ();
_vumeter[n]->reset(); _vumeter[n]->reset ();
} }
} }
@ -242,9 +244,9 @@ PeakMeter::reset_max ()
g_atomic_int_set (&_reset_max, 1); g_atomic_int_set (&_reset_max, 1);
return; return;
} }
for (size_t i = 0; i < _max_peak_signal.size(); ++i) { for (size_t i = 0; i < _max_peak_signal.size (); ++i) {
_max_peak_signal[i] = 0; _max_peak_signal[i] = 0;
_peak_buffer[i] = 0; _peak_buffer[i] = 0;
} }
} }
@ -272,7 +274,7 @@ PeakMeter::configure_io (ChanCount in, ChanCount out)
set_max_channels (in); set_max_channels (in);
if (changed) { if (changed) {
reset_max(); reset_max ();
} }
return Processor::configure_io (in, out); return Processor::configure_io (in, out);
@ -281,66 +283,67 @@ PeakMeter::configure_io (ChanCount in, ChanCount out)
void void
PeakMeter::reflect_inputs (const ChanCount& in) PeakMeter::reflect_inputs (const ChanCount& in)
{ {
reset(); reset ();
current_meters = in; current_meters = in;
reset_max(); reset_max ();
} }
void void
PeakMeter::emit_configuration_changed () { PeakMeter::emit_configuration_changed ()
{
ConfigurationChanged (current_meters, current_meters); /* EMIT SIGNAL */ ConfigurationChanged (current_meters, current_meters); /* EMIT SIGNAL */
} }
void void
PeakMeter::set_max_channels (const ChanCount& chn) PeakMeter::set_max_channels (const ChanCount& chn)
{ {
uint32_t const limit = chn.n_total(); uint32_t const limit = chn.n_total ();
const size_t n_audio = chn.n_audio(); const size_t n_audio = chn.n_audio ();
while (_peak_power.size() > limit) { while (_peak_power.size () > limit) {
_peak_buffer.pop_back(); _peak_buffer.pop_back ();
_peak_power.pop_back(); _peak_power.pop_back ();
_max_peak_signal.pop_back(); _max_peak_signal.pop_back ();
} }
while (_peak_power.size() < limit) { while (_peak_power.size () < limit) {
_peak_buffer.push_back(0); _peak_buffer.push_back (0);
if (_peak_power.size() < current_meters.n_midi()) { if (_peak_power.size () < current_meters.n_midi ()) {
_peak_power.push_back(0); _peak_power.push_back (0);
} else { } else {
_peak_power.push_back(-std::numeric_limits<float>::infinity()); _peak_power.push_back (-std::numeric_limits<float>::infinity ());
} }
_max_peak_signal.push_back(0); _max_peak_signal.push_back (0);
} }
assert(_peak_buffer.size() == limit); assert (_peak_buffer.size () == limit);
assert(_peak_power.size() == limit); assert (_peak_power.size () == limit);
assert(_max_peak_signal.size() == limit); assert (_max_peak_signal.size () == limit);
/* alloc/free other audio-only meter types. */ /* alloc/free other audio-only meter types. */
while (_kmeter.size() > n_audio) { while (_kmeter.size () > n_audio) {
delete (_kmeter.back()); delete _kmeter.back ();
delete (_iec1meter.back()); delete _iec1meter.back ();
delete (_iec2meter.back()); delete _iec2meter.back ();
delete (_vumeter.back()); delete _vumeter.back ();
_kmeter.pop_back(); _kmeter.pop_back ();
_iec1meter.pop_back(); _iec1meter.pop_back ();
_iec2meter.pop_back(); _iec2meter.pop_back ();
_vumeter.pop_back(); _vumeter.pop_back ();
} }
while (_kmeter.size() < n_audio) { while (_kmeter.size () < n_audio) {
_kmeter.push_back(new Kmeterdsp()); _kmeter.push_back (new Kmeterdsp ());
_iec1meter.push_back(new Iec1ppmdsp()); _iec1meter.push_back (new Iec1ppmdsp ());
_iec2meter.push_back(new Iec2ppmdsp()); _iec2meter.push_back (new Iec2ppmdsp ());
_vumeter.push_back(new Vumeterdsp()); _vumeter.push_back (new Vumeterdsp ());
} }
assert(_kmeter.size() == n_audio); assert (_kmeter.size () == n_audio);
assert(_iec1meter.size() == n_audio); assert (_iec1meter.size () == n_audio);
assert(_iec2meter.size() == n_audio); assert (_iec2meter.size () == n_audio);
assert(_vumeter.size() == n_audio); assert (_vumeter.size () == n_audio);
reset(); reset ();
reset_max(); reset_max ();
} }
/** To be driven by the Meter signal from IO. /** To be driven by the Meter signal from IO.
@ -348,10 +351,11 @@ PeakMeter::set_max_channels (const ChanCount& chn)
* of meter size during this call. * of meter size during this call.
*/ */
#define CHECKSIZE(MTR) (n < MTR.size() + n_midi && n >= n_midi) #define CHECKSIZE(MTR) (n < MTR.size () + n_midi && n >= n_midi)
float float
PeakMeter::meter_level(uint32_t n, MeterType type) { PeakMeter::meter_level (uint32_t n, MeterType type)
{
float mcptmp; float mcptmp;
switch (type) { switch (type) {
case MeterKrms: case MeterKrms:
@ -359,58 +363,58 @@ PeakMeter::meter_level(uint32_t n, MeterType type) {
case MeterK14: case MeterK14:
case MeterK12: case MeterK12:
{ {
const uint32_t n_midi = current_meters.n_midi(); const uint32_t n_midi = current_meters.n_midi ();
if (CHECKSIZE(_kmeter)) { if (CHECKSIZE (_kmeter)) {
return accurate_coefficient_to_dB (_kmeter[n - n_midi]->read()); return accurate_coefficient_to_dB (_kmeter[n - n_midi]->read ());
} }
} }
break; break;
case MeterIEC1DIN: case MeterIEC1DIN:
case MeterIEC1NOR: case MeterIEC1NOR:
{ {
const uint32_t n_midi = current_meters.n_midi(); const uint32_t n_midi = current_meters.n_midi ();
if (CHECKSIZE(_iec1meter)) { if (CHECKSIZE (_iec1meter)) {
return accurate_coefficient_to_dB (_iec1meter[n - n_midi]->read()); return accurate_coefficient_to_dB (_iec1meter[n - n_midi]->read ());
} }
} }
break; break;
case MeterIEC2BBC: case MeterIEC2BBC:
case MeterIEC2EBU: case MeterIEC2EBU:
{ {
const uint32_t n_midi = current_meters.n_midi(); const uint32_t n_midi = current_meters.n_midi ();
if (CHECKSIZE(_iec2meter)) { if (CHECKSIZE (_iec2meter)) {
return accurate_coefficient_to_dB (_iec2meter[n - n_midi]->read()); return accurate_coefficient_to_dB (_iec2meter[n - n_midi]->read ());
} }
} }
break; break;
case MeterVU: case MeterVU:
{ {
const uint32_t n_midi = current_meters.n_midi(); const uint32_t n_midi = current_meters.n_midi ();
if (CHECKSIZE(_vumeter)) { if (CHECKSIZE (_vumeter)) {
return accurate_coefficient_to_dB (_vumeter[n - n_midi]->read()); return accurate_coefficient_to_dB (_vumeter[n - n_midi]->read ());
} }
} }
break; break;
case MeterPeak: case MeterPeak:
case MeterPeak0dB: case MeterPeak0dB:
if (n < _peak_power.size()) { if (n < _peak_power.size ()) {
return _peak_power[n]; return _peak_power[n];
} }
break; break;
case MeterMCP: case MeterMCP:
mcptmp = _combined_peak; mcptmp = _combined_peak;
return accurate_coefficient_to_dB(mcptmp); return accurate_coefficient_to_dB (mcptmp);
case MeterMaxSignal: case MeterMaxSignal:
assert(0); assert (0);
break; break;
default: default:
case MeterMaxPeak: case MeterMaxPeak:
if (n < _max_peak_signal.size()) { if (n < _max_peak_signal.size ()) {
return accurate_coefficient_to_dB(_max_peak_signal[n]); return accurate_coefficient_to_dB (_max_peak_signal[n]);
} }
break; break;
} }
return minus_infinity(); return minus_infinity ();
} }
void void
@ -423,27 +427,27 @@ PeakMeter::set_meter_type (MeterType t)
_meter_type = t; _meter_type = t;
if (t & (MeterKrms | MeterK20 | MeterK14 | MeterK12)) { if (t & (MeterKrms | MeterK20 | MeterK14 | MeterK12)) {
const size_t n_audio = current_meters.n_audio(); const size_t n_audio = current_meters.n_audio ();
for (size_t n = 0; n < n_audio; ++n) { for (size_t n = 0; n < n_audio; ++n) {
_kmeter[n]->reset(); _kmeter[n]->reset ();
} }
} }
if (t & (MeterIEC1DIN | MeterIEC1NOR)) { if (t & (MeterIEC1DIN | MeterIEC1NOR)) {
const size_t n_audio = current_meters.n_audio(); const size_t n_audio = current_meters.n_audio ();
for (size_t n = 0; n < n_audio; ++n) { for (size_t n = 0; n < n_audio; ++n) {
_iec1meter[n]->reset(); _iec1meter[n]->reset ();
} }
} }
if (t & (MeterIEC2BBC | MeterIEC2EBU)) { if (t & (MeterIEC2BBC | MeterIEC2EBU)) {
const size_t n_audio = current_meters.n_audio(); const size_t n_audio = current_meters.n_audio ();
for (size_t n = 0; n < n_audio; ++n) { for (size_t n = 0; n < n_audio; ++n) {
_iec2meter[n]->reset(); _iec2meter[n]->reset ();
} }
} }
if (t & MeterVU) { if (t & MeterVU) {
const size_t n_audio = current_meters.n_audio(); const size_t n_audio = current_meters.n_audio ();
for (size_t n = 0; n < n_audio; ++n) { for (size_t n = 0; n < n_audio; ++n) {
_vumeter[n]->reset(); _vumeter[n]->reset ();
} }
} }
@ -454,6 +458,6 @@ XMLNode&
PeakMeter::state () PeakMeter::state ()
{ {
XMLNode& node (Processor::state ()); XMLNode& node (Processor::state ());
node.set_property("type", "meter"); node.set_property ("type", "meter");
return node; return node;
} }