X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Famp.cc;h=230b9f0d6b13ab7daa2ed893cb0aa17d21da101f;hb=75ede0dd6bda0136aef612b0e427ae25b208d0d0;hp=35b567688c0b43fac41297034010bc460338f382;hpb=325671e20afa56f5c796d14ce9bb76146a232f0b;p=ardour.git diff --git a/libs/ardour/amp.cc b/libs/ardour/amp.cc index 35b567688c..230b9f0d6b 100644 --- a/libs/ardour/amp.cc +++ b/libs/ardour/amp.cc @@ -29,19 +29,18 @@ #include "ardour/configuration.h" #include "ardour/io.h" #include "ardour/midi_buffer.h" -#include "ardour/mute_master.h" #include "ardour/session.h" #include "i18n.h" using namespace ARDOUR; +using namespace PBD; -Amp::Amp(Session& s, boost::shared_ptr mm) +Amp::Amp (Session& s) : Processor(s, "Amp") , _apply_gain(true) , _apply_gain_automation(false) , _current_gain(1.0) - , _mute_master (mm) { boost::shared_ptr gl(new AutomationList(Evoral::Parameter(GainAutomation))); _gain_control = boost::shared_ptr( new GainControl(X_("gaincontrol"), s, this, Evoral::Parameter(GainAutomation), gl )); @@ -72,77 +71,30 @@ 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) { - gain_t mute_gain; - if (!_active && !_pending_active) { return; } - if (_mute_master) { - mute_gain = _mute_master->mute_gain_at (MuteMaster::PreFader); - } else { - mute_gain = 1.0; - } - if (_apply_gain) { if (_apply_gain_automation) { gain_t* gab = _session.gain_automation_buffer (); - if (mute_gain == 0.0) { - - /* absolute mute */ - - if (_current_gain == 0.0) { - - /* already silent */ - - for (BufferSet::audio_iterator i = bufs.audio_begin(); i != bufs.audio_end(); ++i) { - i->clear (); - } - } else { - - /* cut to silence */ - - Amp::apply_gain (bufs, nframes, _current_gain, 0.0); - _current_gain = 0.0; - } - - - } else if (mute_gain != 1.0) { - - /* mute dimming */ - - 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) { - sp[nx] *= gab[nx] * mute_gain; - } - } - - _current_gain = gab[nframes-1] * mute_gain; - - } else { - - /* no mute */ - - 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) { - sp[nx] *= gab[nx]; - } + for (BufferSet::audio_iterator i = bufs.audio_begin(); i != bufs.audio_end(); ++i) { + Sample* const sp = i->data(); + for (pframes_t nx = 0; nx < nframes; ++nx) { + sp[nx] *= gab[nx]; } - - _current_gain = gab[nframes-1]; } - + + _current_gain = gab[nframes-1]; } else { /* manual (scalar) gain */ - gain_t dg = _gain_control->user_float() * mute_gain; + gain_t const dg = _gain_control->user_double(); if (_current_gain != dg) { @@ -177,7 +129,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 */ @@ -192,7 +144,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; @@ -209,19 +161,70 @@ 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()/nframes); - std::cerr << "scale by " << scale << " for " << ev.time() << " of " << nframes << std::endl; - ev.scale_velocity (scale); + gain_t scale = delta * (ev.time()/(double) nframes); + ev.scale_velocity (initial+scale); + } + } + } + + /* 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::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; + 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 */ @@ -230,7 +233,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; } @@ -249,7 +252,7 @@ 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::apply_gain (AudioBuffer& buf, framecnt_t nframes, gain_t initial, gain_t target) { /** Apply a (potentially) declicked gain to the contents of @a buf */ @@ -264,7 +267,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; @@ -282,7 +285,7 @@ Amp::apply_gain (AudioBuffer& buf, nframes_t nframes, gain_t initial, gain_t tar 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; } @@ -300,7 +303,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) { @@ -339,7 +342,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); @@ -351,7 +354,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); @@ -377,7 +380,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(); } @@ -386,10 +389,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; } @@ -397,42 +397,38 @@ 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) + if (val > 1.99526231f) { val = 1.99526231f; + } _amp->set_gain (val, this); AutomationControl::set_value(val); } -float +double Amp::GainControl::get_value (void) const { return AutomationControl::get_value(); } 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);