X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmeter.cc;h=98c46067c7dfcfb6a5b67de50966ebfc44162937;hb=56469c195640b561119852fd6d27a4b56e5af7e2;hp=af6b5a0a361f7390de0fab36a282bcbe94fe049c;hpb=ecaf107ed3dd2bb3443a92fc3dd9cf566d3439e3;p=ardour.git diff --git a/libs/ardour/meter.cc b/libs/ardour/meter.cc index af6b5a0a36..98c46067c7 100644 --- a/libs/ardour/meter.cc +++ b/libs/ardour/meter.cc @@ -1,34 +1,37 @@ /* - 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 -#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" -namespace ARDOUR { +using namespace std; +using namespace ARDOUR; + +PBD::Signal0 Metering::Meter; /** Get peaks from @a bufs * Input acceptance is lenient - the first n buffers from @a bufs will @@ -36,54 +39,55 @@ 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, bool) { + 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; - uint32_t meterable = std::min(bufs.count().n_total(), (uint32_t)_peak_power.size()); - uint32_t limit = std::min (meterable, (uint32_t)bufs.count().n_midi()); - - // Meter what we have (midi) - for ( ; n < limit; ++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 Evoral::MIDIEvent ev(*i, false); + + // 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; - } - - limit = std::min (meterable, bufs.count().n_audio()); - // Meter what we have (audio) - for ( ; n < limit; ++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; } void PeakMeter::reset () { for (size_t i = 0; i < _peak_power.size(); ++i) { - _peak_power[i] = 0; + _peak_power[i] = 0.0f; } } @@ -95,15 +99,37 @@ 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; } - uint32_t limit = 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; +} + +void +PeakMeter::reset_max_channels (const ChanCount& chn) +{ + uint32_t limit = chn.n_total(); while (_peak_power.size() > limit) { _peak_power.pop_back(); @@ -120,41 +146,43 @@ PeakMeter::configure_io (ChanCount in, ChanCount out) assert(_peak_power.size() == limit); assert(_visible_peak_power.size() == limit); assert(_max_peak_power.size() == limit); - - return Processor::configure_io (in, 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(); + const size_t limit = min (_peak_power.size(), (size_t) current_meters.n_total ()); 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 { @@ -165,4 +193,12 @@ PeakMeter::meter () } } -} // namespace ARDOUR +XMLNode& +PeakMeter::state (bool full_state) +{ + XMLNode& node (Processor::state (full_state)); + node.add_property("type", "meter"); + return node; +} + +