X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=blobdiff_plain;f=libs%2Fardour%2Famp.cc;h=d86362aa0d37d19198d8a8c840441c8145d133fe;hp=523b538359e097d0417821f7be6ede8a962ccccc;hb=c8c6bca6587450ff64303dbc994a4cd28d6ce7aa;hpb=30d95bbb8c007bf4db96dff86eea9eff6c5eeab1 diff --git a/libs/ardour/amp.cc b/libs/ardour/amp.cc index 523b538359..d86362aa0d 100644 --- a/libs/ardour/amp.cc +++ b/libs/ardour/amp.cc @@ -26,36 +26,31 @@ #include "ardour/amp.h" #include "ardour/audio_buffer.h" #include "ardour/buffer_set.h" +#include "ardour/gain_control.h" #include "ardour/midi_buffer.h" #include "ardour/rc_configuration.h" #include "ardour/session.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace PBD; -using std::min; -Amp::Amp (Session& s) +// used for low-pass filter denormal protection +#define GAIN_COEFF_TINY (1e-10) // -200dB + +Amp::Amp (Session& s, const std::string& name, boost::shared_ptr gc, bool control_midi_also) : Processor(s, "Amp") , _apply_gain(true) , _apply_gain_automation(false) - , _current_gain(1.0) + , _current_gain(GAIN_COEFF_ZERO) , _current_automation_frame (INT64_MAX) + , _gain_control (gc) , _gain_automation_buffer(0) + , _midi_amp (control_midi_also) { - Evoral::Parameter p (GainAutomation); - boost::shared_ptr gl (new AutomationList (p)); - _gain_control = boost::shared_ptr (new GainControl (X_("gaincontrol"), s, this, p, gl)); - _gain_control->set_flags (Controllable::GainLike); - - add_control(_gain_control); -} - -std::string -Amp::display_name() const -{ - return _("Fader"); + set_display_name (name); + add_control (_gain_control); } bool @@ -76,7 +71,7 @@ Amp::configure_io (ChanCount in, ChanCount out) } void -Amp::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_frame*/, pframes_t nframes, bool) +Amp::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_frame*/, double /*speed*/, pframes_t nframes, bool) { if (!_active && !_pending_active) { return; @@ -89,8 +84,22 @@ Amp::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_frame*/, gain_t* gab = _gain_automation_buffer; assert (gab); - const float a = 62.78 / _session.nominal_frame_rate(); // 10 Hz LPF - float lpf = _current_gain; + if (_midi_amp) { + for (BufferSet::midi_iterator i = bufs.midi_begin(); i != bufs.midi_end(); ++i) { + MidiBuffer& mb (*i); + for (MidiBuffer::iterator m = mb.begin(); m != mb.end(); ++m) { + Evoral::MIDIEvent ev = *m; + if (ev.is_note_on()) { + assert(ev.time() >= 0 && ev.time() < nframes); + ev.scale_velocity (fabsf (gab[ev.time()])); + } + } + } + } + + + const double a = 156.825 / _session.nominal_frame_rate(); // 25 Hz LPF; see Amp::apply_gain for details + double lpf = _current_gain; for (BufferSet::audio_iterator i = bufs.audio_begin(); i != bufs.audio_end(); ++i) { Sample* const sp = i->data(); @@ -101,33 +110,35 @@ Amp::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_frame*/, } } - if (lpf < 1e-10) { - _current_gain = 0; + if (fabs (lpf) < GAIN_COEFF_TINY) { + _current_gain = GAIN_COEFF_ZERO; } else { _current_gain = lpf; } } else { /* manual (scalar) gain */ - gain_t const dg = _gain_control->user_double(); + gain_t const dg = _gain_control->get_value(); if (_current_gain != dg) { - _current_gain = Amp::apply_gain (bufs, _session.nominal_frame_rate(), nframes, _current_gain, dg); + _current_gain = Amp::apply_gain (bufs, _session.nominal_frame_rate(), nframes, _current_gain, dg, _midi_amp); - } else if (_current_gain != 1.0f) { + } else if (_current_gain != GAIN_COEFF_UNITY) { - /* gain has not changed, but its non-unity - */ + /* gain has not changed, but its non-unity */ - for (BufferSet::midi_iterator i = bufs.midi_begin(); i != bufs.midi_end(); ++i) { + if (_midi_amp) { + /* don't Trim midi velocity -- only relevant for Midi on Audio tracks */ + for (BufferSet::midi_iterator i = bufs.midi_begin(); i != bufs.midi_end(); ++i) { - MidiBuffer& mb (*i); - - for (MidiBuffer::iterator m = mb.begin(); m != mb.end(); ++m) { - Evoral::MIDIEvent ev = *m; - if (ev.is_note_on()) { - ev.scale_velocity (_current_gain); + MidiBuffer& mb (*i); + + for (MidiBuffer::iterator m = mb.begin(); m != mb.end(); ++m) { + Evoral::MIDIEvent ev = *m; + if (ev.is_note_on()) { + ev.scale_velocity (fabsf (_current_gain)); + } } } } @@ -143,7 +154,7 @@ Amp::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_frame*/, } gain_t -Amp::apply_gain (BufferSet& bufs, framecnt_t sample_rate, framecnt_t nframes, gain_t initial, gain_t target) +Amp::apply_gain (BufferSet& bufs, framecnt_t sample_rate, framecnt_t nframes, gain_t initial, gain_t target, bool midi_amp) { /** Apply a (potentially) declicked gain to the buffers of @a bufs */ gain_t rv = target; @@ -159,25 +170,28 @@ Amp::apply_gain (BufferSet& bufs, framecnt_t sample_rate, framecnt_t nframes, ga } /* MIDI Gain */ - for (BufferSet::midi_iterator i = bufs.midi_begin(); i != bufs.midi_end(); ++i) { - - gain_t delta; - if (target < initial) { - /* fade out: remove more and more of delta from initial */ - delta = -(initial - target); - } else { - /* fade in: add more and more of delta from initial */ - delta = target - initial; - } + if (midi_amp) { + /* don't Trim midi velocity -- only relevant for Midi on Audio tracks */ + for (BufferSet::midi_iterator i = bufs.midi_begin(); i != bufs.midi_end(); ++i) { - MidiBuffer& mb (*i); + gain_t delta; + if (target < initial) { + /* fade out: remove more and more of delta from initial */ + delta = -(initial - target); + } else { + /* fade in: add more and more of delta from initial */ + delta = target - initial; + } - for (MidiBuffer::iterator m = mb.begin(); m != mb.end(); ++m) { - Evoral::MIDIEvent ev = *m; + MidiBuffer& mb (*i); - if (ev.is_note_on()) { - const gain_t scale = delta * (ev.time()/(double) nframes); - ev.scale_velocity (initial+scale); + for (MidiBuffer::iterator m = mb.begin(); m != mb.end(); ++m) { + Evoral::MIDIEvent ev = *m; + + if (ev.is_note_on()) { + const gain_t scale = delta * (ev.time()/(double) nframes); + ev.scale_velocity (fabsf (initial+scale)); + } } } } @@ -187,11 +201,11 @@ Amp::apply_gain (BufferSet& bufs, framecnt_t sample_rate, framecnt_t nframes, ga /* Low pass filter coefficient: 1.0 - e^(-2.0 * π * f / 48000) f in Hz. * for f << SR, approx a ~= 6.2 * f / SR; */ - const float a = 62.78 / sample_rate; // 10 Hz LPF + const double a = 156.825 / sample_rate; // 25 Hz LPF for (BufferSet::audio_iterator i = bufs.audio_begin(); i != bufs.audio_end(); ++i) { Sample* const buffer = i->data(); - float lpf = initial; + double lpf = initial; for (pframes_t nx = 0; nx < nframes; ++nx) { buffer[nx] *= lpf; @@ -201,9 +215,8 @@ Amp::apply_gain (BufferSet& bufs, framecnt_t sample_rate, framecnt_t nframes, ga rv = lpf; } } - // 1e-10 ~ 200dB, prevent denormals. - if (rv < 1e-10) return 0; - if (fabsf(rv - 1.0) < 1e-10) return 1.0; + if (fabsf (rv - target) < GAIN_COEFF_TINY) return target; + if (fabsf (rv) < GAIN_COEFF_TINY) return GAIN_COEFF_ZERO; return rv; } @@ -221,11 +234,11 @@ Amp::declick (BufferSet& bufs, framecnt_t nframes, int dir) if (dir < 0) { /* fade out: remove more and more of delta from initial */ delta = -1.0; - initial = 1.0; + initial = GAIN_COEFF_UNITY; } else { /* fade in: add more and more of delta from initial */ delta = 1.0; - initial = 0.0; + initial = GAIN_COEFF_ZERO; } /* Audio Gain */ @@ -267,31 +280,34 @@ Amp::apply_gain (AudioBuffer& buf, framecnt_t sample_rate, framecnt_t nframes, g } Sample* const buffer = buf.data(); - const float a = 62.78 / sample_rate; // 10 Hz LPF, see [other] Amp::apply_gain() above, + const double a = 156.825 / sample_rate; // 25 Hz LPF, see [other] Amp::apply_gain() above for details - float lpf = initial; + double lpf = initial; for (pframes_t nx = 0; nx < nframes; ++nx) { buffer[nx] *= lpf; lpf += a * (target - lpf); } - if (lpf < 1e-10) return 0; - if (fabsf(lpf - 1.0) < 1e-10) return 1.0; + if (fabs (lpf - target) < GAIN_COEFF_TINY) return target; + if (fabs (lpf) < GAIN_COEFF_TINY) return GAIN_COEFF_ZERO; return lpf; } void -Amp::apply_simple_gain (BufferSet& bufs, framecnt_t nframes, gain_t target) +Amp::apply_simple_gain (BufferSet& bufs, framecnt_t nframes, gain_t target, bool midi_amp) { - if (target == 0.0) { + if (fabsf (target) < GAIN_COEFF_SMALL) { - for (BufferSet::midi_iterator i = bufs.midi_begin(); i != bufs.midi_end(); ++i) { - MidiBuffer& mb (*i); + if (midi_amp) { + /* don't Trim midi velocity -- only relevant for Midi on Audio tracks */ + for (BufferSet::midi_iterator i = bufs.midi_begin(); i != bufs.midi_end(); ++i) { + MidiBuffer& mb (*i); - for (MidiBuffer::iterator m = mb.begin(); m != mb.end(); ++m) { - Evoral::MIDIEvent ev = *m; - if (ev.is_note_on()) { - ev.set_velocity (0); + for (MidiBuffer::iterator m = mb.begin(); m != mb.end(); ++m) { + Evoral::MIDIEvent ev = *m; + if (ev.is_note_on()) { + ev.set_velocity (0); + } } } } @@ -300,15 +316,18 @@ Amp::apply_simple_gain (BufferSet& bufs, framecnt_t nframes, gain_t target) memset (i->data(), 0, sizeof (Sample) * nframes); } - } else if (target != 1.0) { + } else if (target != GAIN_COEFF_UNITY) { - for (BufferSet::midi_iterator i = bufs.midi_begin(); i != bufs.midi_end(); ++i) { - MidiBuffer& mb (*i); + if (midi_amp) { + /* don't Trim midi velocity -- only relevant for Midi on Audio tracks */ + for (BufferSet::midi_iterator i = bufs.midi_begin(); i != bufs.midi_end(); ++i) { + MidiBuffer& mb (*i); - for (MidiBuffer::iterator m = mb.begin(); m != mb.end(); ++m) { - Evoral::MIDIEvent ev = *m; - if (ev.is_note_on()) { - ev.scale_velocity (target); + for (MidiBuffer::iterator m = mb.begin(); m != mb.end(); ++m) { + Evoral::MIDIEvent ev = *m; + if (ev.is_note_on()) { + ev.scale_velocity (fabsf (target)); + } } } } @@ -322,37 +341,19 @@ Amp::apply_simple_gain (BufferSet& bufs, framecnt_t nframes, gain_t target) void Amp::apply_simple_gain (AudioBuffer& buf, framecnt_t nframes, gain_t target) { - if (target == 0.0) { + if (fabsf (target) < GAIN_COEFF_SMALL) { memset (buf.data(), 0, sizeof (Sample) * nframes); - } else if (target != 1.0) { + } else if (target != GAIN_COEFF_UNITY) { apply_gain_to_buffer (buf.data(), nframes, target); } } -void -Amp::inc_gain (gain_t factor, void *src) -{ - float desired_gain = _gain_control->user_double(); - - if (desired_gain == 0.0f) { - set_gain (0.000001f + (0.000001f * factor), src); - } else { - set_gain (desired_gain + (desired_gain * factor), src); - } -} - -void -Amp::set_gain (gain_t val, void *) -{ - _gain_control->set_value (val); -} - XMLNode& Amp::state (bool full_state) { XMLNode& node (Processor::state (full_state)); - node.add_property("type", "amp"); - node.add_child_nocopy (_gain_control->get_state()); + node.add_property("type", _gain_control->parameter().type() == GainAutomation ? "amp" : "trim"); + node.add_child_nocopy (_gain_control->get_state()); return node; } @@ -371,44 +372,6 @@ Amp::set_state (const XMLNode& node, int version) return 0; } -void -Amp::GainControl::set_value (double val) -{ - AutomationControl::set_value (min (val, (double) Config->get_max_gain())); - _amp->session().set_dirty (); -} - -double -Amp::GainControl::internal_to_interface (double v) const -{ - return gain_to_slider_position (v); -} - -double -Amp::GainControl::interface_to_internal (double v) const -{ - return slider_position_to_gain (v); -} - -double -Amp::GainControl::internal_to_user (double v) const -{ - return accurate_coefficient_to_dB (v); -} - -double -Amp::GainControl::user_to_internal (double u) const -{ - return dB_to_coefficient (u); -} - -std::string -Amp::GainControl::get_user_string () const -{ - char theBuf[32]; sprintf( theBuf, _("%3.1f dB"), accurate_coefficient_to_dB (get_value())); - return std::string(theBuf); -} - /** Write gain automation for this cycle into the buffer previously passed in to * set_gain_automation_buffer (if we are in automation playback mode and the * transport is rolling). @@ -425,7 +388,7 @@ Amp::setup_gain_automation (framepos_t start_frame, framepos_t end_frame, framec assert (_gain_automation_buffer); _apply_gain_automation = _gain_control->list()->curve().rt_safe_get_vector ( start_frame, end_frame, _gain_automation_buffer, nframes); - if (start_frame != _current_automation_frame) { + if (start_frame != _current_automation_frame && _session.bounce_processing ()) { _current_gain = _gain_automation_buffer[0]; } _current_automation_frame = end_frame; @@ -442,7 +405,7 @@ Amp::visible() const } std::string -Amp::value_as_string (boost::shared_ptr ac) const +Amp::value_as_string (boost::shared_ptr ac) const { if (ac == _gain_control) { char buffer[32];