smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-14 02:26:39 +01:00
Code Issues Projects Releases Wiki Activity

Fix thinko in 9581cb26 - scratch-buffer can't be used recursively.

Browse source
This commit is contained in:
Robin Gareus 2017-06-11 01:57:28 +02:00
parent 8b8f47430a
commit 02b087c552
2 changed files with 20 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libs/ardour/gain_control.cc
View file

@ -105,5 +105,11 @@ GainControl::inc_gain (gain_t factor)
bool bool
GainControl::get_masters_curve_locked (framepos_t start, framepos_t end, float* vec, framecnt_t veclen) const GainControl::get_masters_curve_locked (framepos_t start, framepos_t end, float* vec, framecnt_t veclen) const
{ {
if (_masters.empty()) {
return list()->curve().rt_safe_get_vector (start, end, vec, veclen);
}
for (framecnt_t i = 0; i < veclen; ++i) {
vec[i] = 1.f;
}
return SlavableAutomationControl::masters_curve_multiply (start, end, vec, veclen); return SlavableAutomationControl::masters_curve_multiply (start, end, vec, veclen);
} }

43
libs/ardour/slavable_automation_control.cc
View file

@ -27,6 +27,7 @@
#include "evoral/Curve.hpp" #include "evoral/Curve.hpp"
#include "ardour/audioengine.h" #include "ardour/audioengine.h"
#include "ardour/runtime_functions.h"
#include "ardour/slavable_automation_control.h" #include "ardour/slavable_automation_control.h"
#include "ardour/session.h" #include "ardour/session.h"
@ -127,40 +128,24 @@ SlavableAutomationControl::get_masters_curve_locked (framepos_t, framepos_t, flo
bool bool
SlavableAutomationControl::masters_curve_multiply (framepos_t start, framepos_t end, float* vec, framecnt_t veclen) const SlavableAutomationControl::masters_curve_multiply (framepos_t start, framepos_t end, float* vec, framecnt_t veclen) const
{ {
bool rv = list()->curve().rt_safe_get_vector (start, end, vec, veclen); gain_t* scratch = _session.scratch_automation_buffer ();
bool rv = list()->curve().rt_safe_get_vector (start, end, scratch, veclen);
if (rv) {
for (framecnt_t i = 0; i < veclen; ++i) {
vec[i] *= scratch[i];
}
} else {
apply_gain_to_buffer (vec, veclen, Control::get_double ());
}
if (_masters.empty()) { if (_masters.empty()) {
return rv; return rv;
} }
gain_t* scratch = _session.scratch_automation_buffer ();
for (Masters::const_iterator mr = _masters.begin(); mr != _masters.end(); ++mr) {
boost::shared_ptr<AutomationControl> ac (mr->second.master());
bool got_curve;
for (Masters::const_iterator mr = _masters.begin(); mr != _masters.end(); ++mr) {
boost::shared_ptr<SlavableAutomationControl> sc boost::shared_ptr<SlavableAutomationControl> sc
= boost::dynamic_pointer_cast<SlavableAutomationControl>(ac); = boost::dynamic_pointer_cast<SlavableAutomationControl>(mr->second.master());
if (sc) { assert (sc);
got_curve = sc->get_masters_curve_locked (start, end, scratch, veclen); rv |= sc->masters_curve_multiply (start, end, vec, veclen);
} else {
got_curve = ac->list()->curve().rt_safe_get_vector (start, end, scratch, veclen);
}
if (got_curve) {
// TODO use SSE/AVX methods, e.g. ARDOUR::apply_gain_to_buffer, mix_buffers_no_gain
// which works as long as automation _types_ gain_t == ARDOUR::Sample type == float
if (!rv) {
// TODO optimize this, in case rv is false, direcly use "vec" above.
rv = true;
memcpy (vec, scratch, sizeof (float) * veclen);
} else {
for (framecnt_t i = 0; i < veclen; ++i) {
vec[i] *= scratch[i];
}
}
} else if (rv) {
const float v = get_masters_value ();
for (framecnt_t i = 0; i < veclen; ++i) {
vec[i] *= v;
}
}
} }
return rv; return rv;
} }