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

Remove all use of nframes_t.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8166 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-12-03 22:26:29 +00:00
parent 74b4a3c77b
commit 73192bc1a7
280 changed files with 1615 additions and 1628 deletions
Download patch file Download diff file Expand all files Collapse all files

18
libs/ardour/interpolation.cc
View file

@ -6,11 +6,11 @@
using namespace ARDOUR;
nframes_t
LinearInterpolation::interpolate (int channel, nframes_t nframes, Sample *input, Sample *output)
framecnt_t
LinearInterpolation::interpolate (int channel, framecnt_t nframes, Sample *input, Sample *output)
{
// index in the input buffers
nframes_t i = 0;
framecnt_t i = 0;
double acceleration;
double distance = 0.0;
@ -22,7 +22,7 @@ LinearInterpolation::interpolate (int channel, nframes_t nframes, Sample *input,
}
distance = phase[channel];
for (nframes_t outsample = 0; outsample < nframes; ++outsample) {
for (framecnt_t outsample = 0; outsample < nframes; ++outsample) {
i = floor(distance);
Sample fractional_phase_part = distance - i;
if (fractional_phase_part >= 1.0) {
@ -45,11 +45,11 @@ LinearInterpolation::interpolate (int channel, nframes_t nframes, Sample *input,
return i;
}
nframes_t
CubicInterpolation::interpolate (int channel, nframes_t nframes, Sample *input, Sample *output)
framecnt_t
CubicInterpolation::interpolate (int channel, framecnt_t nframes, Sample *input, Sample *output)
{
// index in the input buffers
nframes_t i = 0;
framecnt_t i = 0;
double acceleration;
double distance = 0.0;
@ -87,7 +87,7 @@ CubicInterpolation::interpolate (int channel, nframes_t nframes, Sample *input,
inm1 = input[i-1];
}
for (nframes_t outsample = 0; outsample < nframes; ++outsample) {
for (framecnt_t outsample = 0; outsample < nframes; ++outsample) {
float f = floor (distance);
float fractional_phase_part = distance - f;
@ -124,7 +124,7 @@ CubicInterpolation::interpolate (int channel, nframes_t nframes, Sample *input,
/* not sure that this is ever utilized - it implies that one of the input/output buffers is missing */
for (nframes_t outsample = 0; outsample < nframes; ++outsample) {
for (framecnt_t outsample = 0; outsample < nframes; ++outsample) {
distance += _speed + acceleration;
}
}