X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Famp.cc;h=b038cde695c847f7adba5374ebd42c6041616b18;hb=bc3e1a212250a67e53e86c972287a275834a967a;hp=36d0c6bf331c08ea68ccb9ede9a8a8bfb8fd7743;hpb=6fa58df7918b3a9fea715bf6c917c144af540f3c;p=ardour.git diff --git a/libs/ardour/amp.cc b/libs/ardour/amp.cc index 36d0c6bf33..b038cde695 100644 --- a/libs/ardour/amp.cc +++ b/libs/ardour/amp.cc @@ -34,6 +34,7 @@ #include "i18n.h" using namespace ARDOUR; +using namespace PBD; Amp::Amp (Session& s) : Processor(s, "Amp") @@ -41,8 +42,11 @@ Amp::Amp (Session& s) , _apply_gain_automation(false) , _current_gain(1.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); + /* gain range of -inf to +6dB, default 0dB */ + p.set_range (0, 1.99526231f, 1, false); + boost::shared_ptr gl (new AutomationList (p)); + _gain_control = boost::shared_ptr (new GainControl (X_("gaincontrol"), s, this, p, gl)); add_control(_gain_control); } @@ -70,7 +74,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; @@ -84,16 +88,16 @@ Amp::run (BufferSet& bufs, sframes_t /*start_frame*/, sframes_t /*end_frame*/, n 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) { @@ -128,7 +132,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 +147,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; @@ -179,7 +183,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; } @@ -198,7 +202,7 @@ Amp::apply_gain (BufferSet& bufs, nframes_t nframes, gain_t initial, gain_t targ } void -Amp::declick (BufferSet& bufs, nframes_t nframes, int dir) +Amp::declick (BufferSet& bufs, framecnt_t nframes, int dir) { /* Almost exactly like ::apply_gain() but skips MIDI buffers and has fixed initial+target values. @@ -208,9 +212,9 @@ Amp::declick (BufferSet& bufs, nframes_t nframes, int dir) return; } - const nframes_t declick = std::min ((nframes_t)128, nframes); + const framecnt_t declick = std::min ((framecnt_t) 128, nframes); gain_t delta, initial, target; - double fractional_shift = -1.0/declick; + double fractional_shift = -1.0/(declick-1); double fractional_pos; if (dir < 0) { @@ -232,7 +236,7 @@ Amp::declick (BufferSet& bufs, nframes_t nframes, int dir) 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; } @@ -242,7 +246,7 @@ Amp::declick (BufferSet& bufs, nframes_t nframes, int dir) if (declick != nframes) { if (target == 0.0) { - memset (&buffer[declick], 0, sizeof (Sample) * (nframes - declick)); + memset (&buffer[declick], 0, sizeof (Sample) * (nframes - declick)); } else if (target != 1.0) { apply_gain_to_buffer (&buffer[declick], nframes - declick, target); } @@ -251,7 +255,7 @@ Amp::declick (BufferSet& bufs, nframes_t nframes, int dir) } void -Amp::apply_gain (AudioBuffer& buf, nframes_t nframes, gain_t initial, gain_t target) +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 */ @@ -266,7 +270,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; @@ -281,18 +285,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) { @@ -302,7 +306,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) { @@ -341,7 +345,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); @@ -353,7 +357,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); @@ -370,8 +374,6 @@ Amp::set_gain (gain_t val, void *src) val = 1.99526231f; } - //cerr << "set desired gain to " << val << " when curgain = " << _gain_control->get_value () << endl; - if (src != _gain_control.get()) { _gain_control->set_value (val); // bit twisty, this will come back and call us again @@ -379,7 +381,7 @@ Amp::set_gain (gain_t val, void *src) return; } - _gain_control->set_float(val, false); + _gain_control->set_double(val, false); _session.set_dirty(); } @@ -388,10 +390,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; } @@ -399,42 +398,50 @@ 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 > 1.99526231) { + val = 1.99526231; + } _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 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 AutomationControl::get_value(); + return accurate_coefficient_to_dB (v); } 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);