smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 08:36:32 +01:00
Code Issues Projects Releases Wiki Activity

Add API to allow buffer offsets when applying gain

Browse source
This commit is contained in:
Robin Gareus 2017-11-10 22:52:10 +01:00
parent 93e32af9f4
commit e6f2d77605
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libs/ardour/amp.cc
View file

@ -280,7 +280,7 @@ Amp::declick (BufferSet& bufs, samplecnt_t nframes, int dir)
gain_t gain_t
Amp::apply_gain (AudioBuffer& buf, samplecnt_t sample_rate, samplecnt_t nframes, gain_t initial, gain_t target) Amp::apply_gain (AudioBuffer& buf, samplecnt_t sample_rate, samplecnt_t nframes, gain_t initial, gain_t target, sampleoffset_t offset)
{ {
/* Apply a (potentially) declicked gain to the contents of @a buf /* Apply a (potentially) declicked gain to the contents of @a buf
* -- used by MonitorProcessor::run() * -- used by MonitorProcessor::run()
@ -292,11 +292,11 @@ Amp::apply_gain (AudioBuffer& buf, samplecnt_t sample_rate, samplecnt_t nframes,
// if we don't need to declick, defer to apply_simple_gain // if we don't need to declick, defer to apply_simple_gain
if (initial == target) { if (initial == target) {
apply_simple_gain (buf, nframes, target); apply_simple_gain (buf, nframes, target, offset);
return target; return target;
} }
Sample* const buffer = buf.data(); Sample* const buffer = buf.data (offset);
const gain_t a = 156.825f / (gain_t)sample_rate; // 25 Hz LPF, see [other] Amp::apply_gain() above for details const gain_t a = 156.825f / (gain_t)sample_rate; // 25 Hz LPF, see [other] Amp::apply_gain() above for details
gain_t lpf = initial; gain_t lpf = initial;
@ -355,12 +355,12 @@ Amp::apply_simple_gain (BufferSet& bufs, samplecnt_t nframes, gain_t target, boo
} }
void void
Amp::apply_simple_gain (AudioBuffer& buf, samplecnt_t nframes, gain_t target) Amp::apply_simple_gain (AudioBuffer& buf, samplecnt_t nframes, gain_t target, sampleoffset_t offset)
{ {
if (fabsf (target) < GAIN_COEFF_SMALL) { if (fabsf (target) < GAIN_COEFF_SMALL) {
memset (buf.data(), 0, sizeof (Sample) * nframes); memset (buf.data (offset), 0, sizeof (Sample) * nframes);
} else if (target != GAIN_COEFF_UNITY) { } else if (target != GAIN_COEFF_UNITY) {
apply_gain_to_buffer (buf.data(), nframes, target); apply_gain_to_buffer (buf.data(offset), nframes, target);
} }
} }

4
libs/ardour/ardour/amp.h
View file

@ -59,8 +59,8 @@ public:
static gain_t apply_gain (BufferSet& bufs, samplecnt_t sample_rate, samplecnt_t nframes, gain_t initial, gain_t target, bool midi_amp = true); static gain_t apply_gain (BufferSet& bufs, samplecnt_t sample_rate, samplecnt_t nframes, gain_t initial, gain_t target, bool midi_amp = true);
static void apply_simple_gain(BufferSet& bufs, samplecnt_t nframes, gain_t target, bool midi_amp = true); static void apply_simple_gain(BufferSet& bufs, samplecnt_t nframes, gain_t target, bool midi_amp = true);
static gain_t apply_gain (AudioBuffer& buf, samplecnt_t sample_rate, samplecnt_t nframes, gain_t initial, gain_t target); static gain_t apply_gain (AudioBuffer& buf, samplecnt_t sample_rate, samplecnt_t nframes, gain_t initial, gain_t target, sampleoffset_t offset = 0);
static void apply_simple_gain(AudioBuffer& buf, samplecnt_t nframes, gain_t target); static void apply_simple_gain (AudioBuffer& buf, samplecnt_t nframes, gain_t target, sampleoffset_t offset = 0);
static void declick (BufferSet& bufs, samplecnt_t nframes, int dir); static void declick (BufferSet& bufs, samplecnt_t nframes, int dir);
static void update_meters(); static void update_meters();