summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour/interpolation.h
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2009-10-16 19:53:25 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2009-10-16 19:53:25 +0000
commit69be1aa7bf84f9440c5b5757bd59193f7ff0d60d (patch)
tree1163a993fee1ed6c1ee539af8d7f772f816b6e5a /libs/ardour/ardour/interpolation.h
parent4650d86312e7c191d208eefb03c299bfc1b4c031 (diff)
fix conceptually broken cubic interpolator that failed to handle the i=0 case, and don't rely on inlining for speed there
git-svn-id: svn://localhost/ardour2/branches/3.0@5792 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/interpolation.h')
-rw-r--r--libs/ardour/ardour/interpolation.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/libs/ardour/ardour/interpolation.h b/libs/ardour/ardour/interpolation.h
index 2b777ac840..21a47cfcdc 100644
--- a/libs/ardour/ardour/interpolation.h
+++ b/libs/ardour/ardour/interpolation.h
@@ -39,23 +39,11 @@ class Interpolation {
};
class LinearInterpolation : public Interpolation {
- protected:
-
public:
nframes_t interpolate (int channel, nframes_t nframes, Sample* input, Sample* output);
};
class CubicInterpolation : public Interpolation {
- protected:
- // shamelessly ripped from Steve Harris' swh-plugins (ladspa-util.h)
- static inline float cube_interp(const float fr, const float inm1, const float
- in, const float inp1, const float inp2)
- {
- return in + 0.5f * fr * (inp1 - inm1 +
- fr * (4.0f * inp1 + 2.0f * inm1 - 5.0f * in - inp2 +
- fr * (3.0f * (in - inp1) - inm1 + inp2)));
- }
-
public:
nframes_t interpolate (int channel, nframes_t nframes, Sample* input, Sample* output);
};