X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Famp.cc;h=f60240fd57c128dc6ca97a74364eecbb90b56912;hb=25a774806820542fe10f530bc51254acfc528ff5;hp=a739b59088c160c74ce320640f265cb04dd7cdbd;hpb=1e728e728a79d9b272cc18bc1c46f0c3c8831bf8;p=ardour.git diff --git a/libs/ardour/amp.cc b/libs/ardour/amp.cc index a739b59088..f60240fd57 100644 --- a/libs/ardour/amp.cc +++ b/libs/ardour/amp.cc @@ -26,23 +26,31 @@ #include "ardour/amp.h" #include "ardour/audio_buffer.h" #include "ardour/buffer_set.h" -#include "ardour/configuration.h" -#include "ardour/io.h" #include "ardour/midi_buffer.h" #include "ardour/session.h" #include "i18n.h" using namespace ARDOUR; +using namespace PBD; +using std::min; + +/* gain range of -inf to +6dB, default 0dB */ +const float Amp::max_gain_coefficient = 1.99526231f; Amp::Amp (Session& s) : Processor(s, "Amp") , _apply_gain(true) , _apply_gain_automation(false) , _current_gain(1.0) + , _gain_automation_buffer(0) { - boost::shared_ptr gl(new AutomationList(Evoral::Parameter(GainAutomation))); - _gain_control = boost::shared_ptr( new GainControl(X_("gaincontrol"), s, this, Evoral::Parameter(GainAutomation), gl )); + Evoral::Parameter p (GainAutomation); + p.set_range (0, max_gain_coefficient, 1, false); + 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); } @@ -70,7 +78,7 @@ Amp::configure_io (ChanCount in, ChanCount out) } void -Amp::run (BufferSet& bufs, sframes_t /*start_frame*/, sframes_t /*end_frame*/, nframes_t nframes, bool) +Amp::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_frame*/, pframes_t nframes, bool) { if (!_active && !_pending_active) { return; @@ -80,20 +88,21 @@ Amp::run (BufferSet& bufs, sframes_t /*start_frame*/, sframes_t /*end_frame*/, n if (_apply_gain_automation) { - gain_t* gab = _session.gain_automation_buffer (); + gain_t* gab = _gain_automation_buffer; + assert (gab); for (BufferSet::audio_iterator i = bufs.audio_begin(); i != bufs.audio_end(); ++i) { Sample* const sp = i->data(); - for (nframes_t nx = 0; nx < nframes; ++nx) { + for (pframes_t nx = 0; nx < nframes; ++nx) { sp[nx] *= gab[nx]; } } - + _current_gain = gab[nframes-1]; } else { /* manual (scalar) gain */ - gain_t const dg = _gain_control->user_float(); + gain_t const dg = _gain_control->user_double(); if (_current_gain != dg) { @@ -108,7 +117,7 @@ Amp::run (BufferSet& bufs, sframes_t /*start_frame*/, sframes_t /*end_frame*/, n 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()) { @@ -128,7 +137,7 @@ Amp::run (BufferSet& bufs, sframes_t /*start_frame*/, sframes_t /*end_frame*/, n } void -Amp::apply_gain (BufferSet& bufs, nframes_t nframes, gain_t initial, gain_t target) +Amp::apply_gain (BufferSet& bufs, framecnt_t nframes, gain_t initial, gain_t target) { /** Apply a (potentially) declicked gain to the buffers of @a bufs */ @@ -143,7 +152,7 @@ Amp::apply_gain (BufferSet& bufs, nframes_t nframes, gain_t initial, gain_t targ return; } - const nframes_t declick = std::min ((nframes_t)128, nframes); + const framecnt_t declick = std::min ((framecnt_t) 128, nframes); gain_t delta; double fractional_shift = -1.0/declick; double fractional_pos; @@ -160,14 +169,13 @@ Amp::apply_gain (BufferSet& bufs, nframes_t nframes, gain_t initial, gain_t targ 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()) { - gain_t scale = delta * (ev.time()/(double) nframes); + const gain_t scale = delta * (ev.time()/(double) nframes); ev.scale_velocity (initial+scale); } } @@ -180,7 +188,7 @@ Amp::apply_gain (BufferSet& bufs, nframes_t nframes, gain_t initial, gain_t targ fractional_pos = 1.0; - for (nframes_t nx = 0; nx < declick; ++nx) { + for (pframes_t nx = 0; nx < declick; ++nx) { buffer[nx] *= (initial + (delta * (0.5 + 0.5 * cos (M_PI * fractional_pos)))); fractional_pos += fractional_shift; } @@ -199,7 +207,60 @@ Amp::apply_gain (BufferSet& bufs, nframes_t nframes, gain_t initial, gain_t targ } void -Amp::apply_gain (AudioBuffer& buf, nframes_t nframes, gain_t initial, gain_t target) +Amp::declick (BufferSet& bufs, framecnt_t nframes, int dir) +{ + /* Almost exactly like ::apply_gain() but skips MIDI buffers and has fixed initial+target + values. + */ + + if (nframes == 0 || bufs.count().n_total() == 0) { + return; + } + + const framecnt_t declick = std::min ((framecnt_t) 128, nframes); + gain_t delta, initial, target; + double fractional_shift = -1.0/(declick-1); + double fractional_pos; + + if (dir < 0) { + /* fade out: remove more and more of delta from initial */ + delta = -1.0; + initial = 1.0; + target = 0.0; + } else { + /* fade in: add more and more of delta from initial */ + delta = 1.0; + initial = 0.0; + target = 1.0; + } + + /* Audio Gain */ + + for (BufferSet::audio_iterator i = bufs.audio_begin(); i != bufs.audio_end(); ++i) { + Sample* const buffer = i->data(); + + fractional_pos = 1.0; + + for (pframes_t nx = 0; nx < declick; ++nx) { + buffer[nx] *= (initial + (delta * (0.5 + 0.5 * cos (M_PI * fractional_pos)))); + fractional_pos += fractional_shift; + } + + /* now ensure the rest of the buffer has the target value applied, if necessary. */ + + if (declick != nframes) { + + if (target == 0.0) { + memset (&buffer[declick], 0, sizeof (Sample) * (nframes - declick)); + } else if (target != 1.0) { + apply_gain_to_buffer (&buffer[declick], nframes - declick, target); + } + } + } +} + +void +Amp::apply_gain (AudioBuffer& buf, framecnt_t nframes, gain_t initial, gain_t target) { /** Apply a (potentially) declicked gain to the contents of @a buf */ @@ -214,7 +275,7 @@ Amp::apply_gain (AudioBuffer& buf, nframes_t nframes, gain_t initial, gain_t tar return; } - const nframes_t declick = std::min ((nframes_t)128, nframes); + const framecnt_t declick = std::min ((framecnt_t) 128, nframes); gain_t delta; double fractional_shift = -1.0/declick; double fractional_pos; @@ -229,18 +290,18 @@ Amp::apply_gain (AudioBuffer& buf, nframes_t nframes, gain_t initial, gain_t tar Sample* const buffer = buf.data(); - + fractional_pos = 1.0; - - for (nframes_t nx = 0; nx < declick; ++nx) { + + for (pframes_t nx = 0; nx < declick; ++nx) { buffer[nx] *= (initial + (delta * (0.5 + 0.5 * cos (M_PI * fractional_pos)))); fractional_pos += fractional_shift; } - + /* now ensure the rest of the buffer has the target value applied, if necessary. */ - + if (declick != nframes) { - + if (target == 0.0) { memset (&buffer[declick], 0, sizeof (Sample) * (nframes - declick)); } else if (target != 1.0) { @@ -250,7 +311,7 @@ Amp::apply_gain (AudioBuffer& buf, nframes_t nframes, gain_t initial, gain_t tar } void -Amp::apply_simple_gain (BufferSet& bufs, nframes_t nframes, gain_t target) +Amp::apply_simple_gain (BufferSet& bufs, framecnt_t nframes, gain_t target) { if (target == 0.0) { @@ -289,7 +350,7 @@ Amp::apply_simple_gain (BufferSet& bufs, nframes_t nframes, gain_t target) } void -Amp::apply_simple_gain (AudioBuffer& buf, nframes_t nframes, gain_t target) +Amp::apply_simple_gain (AudioBuffer& buf, framecnt_t nframes, gain_t target) { if (target == 0.0) { memset (buf.data(), 0, sizeof (Sample) * nframes); @@ -301,7 +362,7 @@ Amp::apply_simple_gain (AudioBuffer& buf, nframes_t nframes, gain_t target) void Amp::inc_gain (gain_t factor, void *src) { - float desired_gain = _gain_control->user_float(); + float desired_gain = _gain_control->user_double(); if (desired_gain == 0.0f) { set_gain (0.000001f + (0.000001f * factor), src); @@ -313,12 +374,7 @@ Amp::inc_gain (gain_t factor, void *src) void Amp::set_gain (gain_t val, void *src) { - // max gain at about +6dB (10.0 ^ ( 6 dB * 0.05)) - if (val > 1.99526231f) { - val = 1.99526231f; - } - - //cerr << "set desired gain to " << val << " when curgain = " << _gain_control->get_value () << endl; + val = min (val, max_gain_coefficient); if (src != _gain_control.get()) { _gain_control->set_value (val); @@ -327,7 +383,7 @@ Amp::set_gain (gain_t val, void *src) return; } - _gain_control->set_float(val, false); + _gain_control->set_double (val); _session.set_dirty(); } @@ -336,10 +392,7 @@ Amp::state (bool full_state) { XMLNode& node (Processor::state (full_state)); node.add_property("type", "amp"); - - char buf[32]; - snprintf (buf, sizeof (buf), "%2.12f", _gain_control->get_value()); - node.add_property("gain", buf); + node.add_child_nocopy (_gain_control->get_state()); return node; } @@ -347,48 +400,60 @@ Amp::state (bool full_state) int Amp::set_state (const XMLNode& node, int version) { - const XMLProperty* prop; + XMLNode* gain_node; Processor::set_state (node, version); - prop = node.property ("gain"); - if (prop) { - gain_t val; - - if (sscanf (prop->value().c_str(), "%f", &val) == 1) { - _gain_control->set_value (val); - } - } + if ((gain_node = node.child (Controllable::xml_node_name.c_str())) != 0) { + _gain_control->set_state (*gain_node, version); + } return 0; } void -Amp::GainControl::set_value (float val) +Amp::GainControl::set_value (double val) { - // max gain at about +6dB (10.0 ^ ( 6 dB * 0.05)) - if (val > 1.99526231f) - val = 1.99526231f; + if (val > max_gain_coefficient) { + val = max_gain_coefficient; + } _amp->set_gain (val, this); AutomationControl::set_value(val); } -float -Amp::GainControl::get_value (void) const +double +Amp::GainControl::internal_to_interface (double v) const { - return AutomationControl::get_value(); + 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); +} + +/** 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). + */ void -Amp::setup_gain_automation (sframes_t start_frame, sframes_t end_frame, nframes_t nframes) +Amp::setup_gain_automation (framepos_t start_frame, framepos_t end_frame, framecnt_t nframes) { - Glib::Mutex::Lock am (control_lock(), Glib::TRY_LOCK); + Glib::Threads::Mutex::Lock am (control_lock(), Glib::Threads::TRY_LOCK); if (am.locked() && _session.transport_rolling() && _gain_control->automation_playback()) { + assert (_gain_automation_buffer); _apply_gain_automation = _gain_control->list()->curve().rt_safe_get_vector ( - start_frame, end_frame, _session.gain_automation_buffer(), nframes); + start_frame, end_frame, _gain_automation_buffer, nframes); } else { _apply_gain_automation = false; } @@ -399,3 +464,26 @@ Amp::visible() const { return true; } + +std::string +Amp::value_as_string (boost::shared_ptr ac) const +{ + if (ac == _gain_control) { + char buffer[32]; + snprintf (buffer, sizeof (buffer), "%.2fdB", ac->internal_to_user (ac->get_value ())); + return buffer; + } + + return Automatable::value_as_string (ac); +} + +/** Sets up the buffer that setup_gain_automation and ::run will use for + * gain automationc curves. Must be called before setup_gain_automation, + * and must be called with process lock held. + */ + +void +Amp::set_gain_automation_buffer (gain_t* g) +{ + _gain_automation_buffer = g; +}