X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmeter.cc;h=a5e82c3bf3411131dd47d21903bbd371e79071ed;hb=07be98b3410ac70b3c4451592fb88def678611ef;hp=aedfd17be865201fa1340f17c59089591478c9d2;hpb=68e943265edf04e63a8e8b8f62bab20f99d9c637;p=ardour.git diff --git a/libs/ardour/meter.cc b/libs/ardour/meter.cc index aedfd17be8..a5e82c3bf3 100644 --- a/libs/ardour/meter.cc +++ b/libs/ardour/meter.cc @@ -1,31 +1,69 @@ /* - Copyright (C) 2006 Paul Davis - + Copyright (C) 2006 Paul Davis + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include "ardour/meter.h" #include #include -#include -#include -#include -#include +#include "ardour/buffer_set.h" +#include "ardour/peak.h" +#include "ardour/dB.h" +#include "ardour/session.h" +#include "ardour/midi_buffer.h" +#include "ardour/audio_buffer.h" +#include "ardour/runtime_functions.h" + +using namespace std; + +using namespace ARDOUR; + +sigc::signal Metering::Meter; +Glib::StaticMutex Metering::m_meter_signal_lock; -namespace ARDOUR { +sigc::connection +Metering::connect (sigc::slot the_slot) +{ + // 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 (the_slot); +} + +void +Metering::disconnect (sigc::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 */ +} /** Get peaks from @a bufs * Input acceptance is lenient - the first n buffers from @a bufs will @@ -33,53 +71,60 @@ namespace ARDOUR { * be set to 0. */ void -PeakMeter::run_in_place (BufferSet& bufs, nframes_t start_frame, nframes_t end_frame, nframes_t nframes, nframes_t offset) +PeakMeter::run (BufferSet& bufs, sframes_t /*start_frame*/, sframes_t /*end_frame*/, nframes_t nframes) { - size_t meterable = std::min((size_t)bufs.count().n_total(), _peak_power.size()); - - size_t n = 0; - - // Meter what we have (midi) - for ( ; n < meterable && n < bufs.count().n_midi(); ++n) { - - float val = 0; - - // GUI needs a better MIDI meter, not much information can be - // expressed through peaks alone - for (MidiBuffer::iterator i = bufs.get_midi(n).begin(); i != bufs.get_midi(n).end(); ++i) { - const MIDI::Event& ev = *i; + if (!_active && !_pending_active) { + 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()); + + uint32_t n = 0; + + // Meter MIDI in to the first n_midi peaks + for (uint32_t i = 0; i < n_midi; ++i, ++n) { + float val = 0.0f; + for (MidiBuffer::iterator e = bufs.get_midi(i).begin(); e != bufs.get_midi(i).end(); ++e) { + const Evoral::MIDIEvent ev(*e, false); if (ev.is_note_on()) { const float this_vel = log(ev.buffer()[2] / 127.0 * (M_E*M_E-M_E) + M_E) - 1.0; - //printf("V %d -> %f\n", (int)((Byte)ev.buffer[2]), this_vel); - if (this_vel > val) + if (this_vel > val) { val = this_vel; + } } else { val += 1.0 / bufs.get_midi(n).capacity(); - if (val > 1.0) + if (val > 1.0) { val = 1.0; + } } } - _peak_power[n] = val; - } - - // Meter what we have (audio) - for ( ; n < meterable && n < bufs.count().n_audio(); ++n) { - _peak_power[n] = compute_peak (bufs.get_audio(n).data(nframes, offset), nframes, _peak_power[n]); + + // Meter audio in to the rest of the peaks + for (uint32_t i = 0; i < n_audio; ++i, ++n) { + _peak_power[n] = compute_peak (bufs.get_audio(i).data(), nframes, _peak_power[n]); } // Zero any excess peaks - for (size_t n = meterable; n < _peak_power.size(); ++n) { - _peak_power[n] = 0; + for (uint32_t i = n; i < _peak_power.size(); ++i) { + _peak_power[i] = 0.0f; } + + _active = _pending_active; +} + +PeakMeter::PeakMeter (Session& s, const XMLNode& node) + : Processor (s, node) +{ } void PeakMeter::reset () { for (size_t i = 0; i < _peak_power.size(); ++i) { - _peak_power[i] = 0; + _peak_power[i] = 0.0f; } } @@ -91,11 +136,17 @@ PeakMeter::reset_max () } } +bool +PeakMeter::can_support_io_configuration (const ChanCount& in, ChanCount& out) const +{ + out = in; + return true; +} + bool PeakMeter::configure_io (ChanCount in, ChanCount out) { - /* we're transparent no matter what. fight the power. */ - if (out != in) { + if (out != in) { // always 1:1 return false; } @@ -121,36 +172,40 @@ PeakMeter::configure_io (ChanCount in, ChanCount out) } /** To be driven by the Meter signal from IO. - * Caller MUST hold io_lock! + * Caller MUST hold its own processor_lock to prevent reconfiguration + * of meter size during this call. */ + void PeakMeter::meter () { + if (!_active) { + return; + } + assert(_visible_peak_power.size() == _peak_power.size()); const size_t limit = _peak_power.size(); for (size_t n = 0; n < limit; ++n) { - /* XXX we should use atomic exchange here */ - /* grab peak since last read */ - float new_peak = _peak_power[n]; - _peak_power[n] = 0; - + float new_peak = _peak_power[n]; /* XXX we should use atomic exchange from here ... */ + _peak_power[n] = 0; /* ... to here */ + /* compute new visible value using falloff */ if (new_peak > 0.0) { - new_peak = coefficient_to_dB (new_peak); + new_peak = fast_coefficient_to_dB (new_peak); } else { new_peak = minus_infinity(); } - + /* update max peak */ - + _max_peak_power[n] = std::max (new_peak, _max_peak_power[n]); - + if (Config->get_meter_falloff() == 0.0f || new_peak > _visible_peak_power[n]) { _visible_peak_power[n] = new_peak; } else { @@ -161,4 +216,17 @@ PeakMeter::meter () } } -} // namespace ARDOUR +XMLNode& +PeakMeter::state (bool full_state) +{ + XMLNode& node (Processor::state (full_state)); + node.add_property("type", "meter"); + return node; +} + + +bool +PeakMeter::visible() const +{ + return true; +}