using namespace ARDOUR;
-boost::signals2::signal<void()> Metering::Meter;
-Glib::StaticMutex Metering::m_meter_signal_lock;
-
-boost::signals2::connection
-Metering::connect (boost::function<void()> f)
-{
- // SignalProcessor::Meter is emitted from another thread so the
- // Meter signal must be protected.
- Glib::Mutex::Lock guard (m_meter_signal_lock);
- return Meter.connect (f);
-}
-
-void
-Metering::disconnect (boost::signals2::connection& c)
-{
- Glib::Mutex::Lock guard (m_meter_signal_lock);
- c.disconnect ();
-}
-
-/**
- Update the meters.
-
- The meter signal lock is taken to prevent modification of the
- Meter signal while updating the meters, taking the meter signal
- lock prior to taking the io_lock ensures that all IO will remain
- valid while metering.
-*/
-void
-Metering::update_meters()
-{
- Glib::Mutex::Lock guard (m_meter_signal_lock);
- Meter(); /* EMIT SIGNAL */
-}
-
-PeakMeter::PeakMeter (Session& s, const XMLNode& node)
- : Processor (s, node)
-{
- current_meters = 0;
-}
+PBD::Signal0<void> Metering::Meter;
/** Get peaks from @a bufs
* Input acceptance is lenient - the first n buffers from @a bufs will
* be set to 0.
*/
void
-PeakMeter::run (BufferSet& bufs, sframes_t /*start_frame*/, sframes_t /*end_frame*/, nframes_t nframes, bool)
+PeakMeter::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_frame*/, nframes_t nframes, bool)
{
if (!_active && !_pending_active) {
return;
}
}
}
- _peak_power[n] = val;
+ _peak_power[n] = max (val, _peak_power[n]);
}
// Meter audio in to the rest of the peaks
return false;
}
- current_meters = in.n_total ();
+ current_meters = in;
+
+ reset_max_channels (in);
return Processor::configure_io (in, out);
}
void
PeakMeter::reflect_inputs (const ChanCount& in)
{
- current_meters = in.n_total ();
+ current_meters = in;
}
void
assert(_visible_peak_power.size() == _peak_power.size());
- const size_t limit = min (_peak_power.size(), (size_t) current_meters);
+ const size_t limit = min (_peak_power.size(), (size_t) current_meters.n_total ());
for (size_t n = 0; n < limit; ++n) {